diff --git a/Aeon/Entity/ComponentController.hpp b/Aeon/Entity/ComponentController.hpp
new file mode 100644
index 0000000..fd9c6a6
--- /dev/null
+++ b/Aeon/Entity/ComponentController.hpp
@@ -0,0 +1,18 @@
+#ifndef AEON_ENTITY_COMPONENTCONTROLLER_H_
+#define AEON_ENTITY_COMPONENTCONTROLLER_H_
+
+#include <Aeon/includes.hpp>
+
+
+namespace EC
+{
+
+class ComponentController
+{
+    
+};
+
+}
+
+
+#endif
diff --git a/Aeon/Entity/EntityController.hpp b/Aeon/Entity/EntityController.hpp
index 006eea0..0e11192 100644
--- a/Aeon/Entity/EntityController.hpp
+++ b/Aeon/Entity/EntityController.hpp
@@ -3,8 +3,7 @@
 
 #include <Aeon/Includes.hpp>
 
-struct Entity;
-struct Component;
+#include <Aeon/Entity/Entity.hpp>
 
 namespace EC
 {
@@ -29,7 +28,7 @@ public:
     template <typename TComponent>
     TComponent& Replace(const Entity& entity);
     
-    // replace inplace
+    // replace in-place
     template <typename TComponent>
     TComponent& Patch(const Entity& entity);
 
@@ -48,7 +47,7 @@ public:
     // std::vector<T&> Sort(std::function<;
 
 private:
-
+    // std::map<Entity<uint32_t>, std::vector<
 
 };