diff --git a/Escape-the-Dawn/System.h b/Escape-the-Dawn/System.h
index f747476..3ad42db 100644
--- a/Escape-the-Dawn/System.h
+++ b/Escape-the-Dawn/System.h
@@ -2,6 +2,7 @@
 #define System_h__
 
 #include "Entity.h"
+#include "Component.h"
 
 class World;
 
@@ -16,6 +17,9 @@ public:
 	// Called once for every entity in the world every tick
 	virtual void Update(double dt, EntityID entity, EntityID parent) { }
 
+	// Called when a component is created
+	virtual void OnComponentCreated(std::string type, std::	shared_ptr<Component> component);
+
 protected:
 	World* m_World;
 };
diff --git a/Escape-the-Dawn/World.h b/Escape-the-Dawn/World.h
index 874cee4..6d6b2a5 100644
--- a/Escape-the-Dawn/World.h
+++ b/Escape-the-Dawn/World.h
@@ -44,8 +44,12 @@ public:
 			return nullptr;
 		}
 
+		component->Entity = entity;
 		m_ComponentsOfType[componentType].push_back(component);
 		m_EntityComponents[entity][componentType] = component;
+		for (auto system : m_Systems) {
+			system->OnComponentCreated(componentType, component);
+		}
 		return component;
 	}