diff --git a/Aeon/Aeon.cpp b/Aeon/Aeon.cpp
index e15e328..eb77cb9 100644
--- a/Aeon/Aeon.cpp
+++ b/Aeon/Aeon.cpp
@@ -13,6 +13,7 @@ using Input::InputController;
 App::App( const AppProperties& props, const DisplayProperties& dispProps )
 	: mDisplay()
 	, mInput(InputController::GetInstance())
+	, mEntityController( )
 {
 	PushThisAsSink( "ENGINE_DISPLAY_CORE" );
 
diff --git a/Aeon/Aeon.hpp b/Aeon/Aeon.hpp
index 39a96a5..52b628d 100644
--- a/Aeon/Aeon.hpp
+++ b/Aeon/Aeon.hpp
@@ -44,10 +44,10 @@ public:
 private:
 	Display mDisplay;
 
-	EC::EntityController& mEntityController;
+	EC::EntityRegistry mEntityController;
 	Input::InputController& mInput;
 
-	// Game layers from z orderxko285132046
+	// Game layers from z order
 	std::vector<GameLayer*> mGameLayers;
 	std::vector<GameLayer*> mTopLayers;
 	std::vector<GameLayer*> mDebugLayers;
diff --git a/Aeon/Entity/ComponentController.hpp b/Aeon/Entity/ComponentController.hpp
index fd9c6a6..aee7e43 100644
--- a/Aeon/Entity/ComponentController.hpp
+++ b/Aeon/Entity/ComponentController.hpp
@@ -1,15 +1,48 @@
 #ifndef AEON_ENTITY_COMPONENTCONTROLLER_H_
 #define AEON_ENTITY_COMPONENTCONTROLLER_H_
 
-#include <Aeon/includes.hpp>
+#include <Aeon/Includes.hpp>
 
 
 namespace EC
 {
 
+struct IComponentArr
+{
+
+};
+
+template <typename TComponent>
+struct ComponentArr : public IComponentArr
+{
+
+    void Destroy();
+};
+
 class ComponentController
 {
-    
+public:
+    ComponentController()
+    {
+
+    }
+    ~ComponentController()
+    {
+
+    }
+
+    template <typename TComponent>
+    void Register()
+    {
+        const char* name = typeid(TComponent).name();
+        std::cout << name << std::endl;
+    }
+
+
+private:
+    std::map<std::string, IComponentArr>
+
+
 };
 
 }
diff --git a/Aeon/Entity/Entity.hpp b/Aeon/Entity/Entity.hpp
index ed1be9e..00707ae 100644
--- a/Aeon/Entity/Entity.hpp
+++ b/Aeon/Entity/Entity.hpp
@@ -6,10 +6,9 @@
 namespace EC
 {
 
-template <typename T>
 struct Entity
 {
-    T id;
+    uint32_t id;
 
     inline bool operator==( const Entity& rhs )
     {
diff --git a/Aeon/Entity/EntityController.cpp b/Aeon/Entity/EntityController.cpp
deleted file mode 100644
index fd40910..0000000
--- a/Aeon/Entity/EntityController.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/Aeon/Entity/EntityController.hpp b/Aeon/Entity/EntityController.hpp
index 0e11192..94005dc 100644
--- a/Aeon/Entity/EntityController.hpp
+++ b/Aeon/Entity/EntityController.hpp
@@ -13,8 +13,14 @@ namespace EC
 class EntityRegistry
 {
 public:
-    EntityRegistry();
-    ~EntityRegistry();
+    EntityRegistry()
+    {
+
+    }
+    ~EntityRegistry()
+    {
+        
+    }
 
     Entity& Create();
     Entity& Copy(const Entity& entity);
@@ -47,7 +53,7 @@ public:
     // std::vector<T&> Sort(std::function<;
 
 private:
-    // std::map<Entity<uint32_t>, std::vector<
+    // std::map<Entity<uint32_t>, std::vector<g
 
 };
     
diff --git a/Game/ExampleGame.cpp b/Game/ExampleGame.cpp
index 91f68f0..89ac89c 100644
--- a/Game/ExampleGame.cpp
+++ b/Game/ExampleGame.cpp
@@ -4,6 +4,8 @@
 #include <Aeon/Core/Events.hpp>
 #include <Aeon/Rendering/ImGui.hpp>
 
+#include <Aeon/Entity/ComponentController.hpp>
+
 class BackgroundLevel : public Core::GameLayer {
 
 };
@@ -104,8 +106,17 @@ public:
 
 };
 
+
+struct GenericComponent
+{
+	int x,y;
+};
+
 int main( int argc, char** argv )
 {
+	EC::ComponentController cController;
+
+	cController.Register<GenericComponent>();
     ExampleGame game;
 
     return 0;