1 files changed, 6 insertions, 4 deletions

diff --git a/src/crepe/manager/Mediator.h b/src/crepe/manager/Mediator.h
index 35ac181..dfb37dc 100644
--- a/src/crepe/manager/Mediator.h
+++ b/src/crepe/manager/Mediator.h
@@ -4,8 +4,8 @@
 
 // TODO: remove these singletons:
 #include "../facade/SDLContext.h"
-#include "EventManager.h"
-#include "api/LoopTimer.h"
+
+#include "SaveManager.h"
 
 namespace crepe {
 
@@ -14,6 +14,8 @@ class SceneManager;
 class SaveManager;
 class ResourceManager;
 
+class LoopTimerManager;
+class EventManager;
 /**
  * Struct to pass references to classes that would otherwise need to be singletons down to
  * other classes within the engine hierarchy. Made to prevent constant changes to subclasses to
@@ -29,11 +31,11 @@ class ResourceManager;
 struct Mediator {
 	OptionalRef<ComponentManager> component_manager;
 	OptionalRef<SceneManager> scene_manager;
+	OptionalRef<EventManager> event_manager;
+	OptionalRef<LoopTimerManager> loop_timer;
 	OptionalRef<SaveManager> save_manager;
-	OptionalRef<EventManager> event_manager = EventManager::get_instance();
 	OptionalRef<ResourceManager> resource_manager;
 	OptionalRef<SDLContext> sdl_context = SDLContext::get_instance();
-	OptionalRef<LoopTimer> timer = LoopTimer::get_instance();
 };
 
 } // namespace crepe