diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h
new file mode 100644
index 00000000..9520d2a6
--- /dev/null
+++ b/include/Engine/Editor/EditorSystem.h
@@ -0,0 +1,11 @@
+#include "../Core/System.h"
+
+class EditorSystem : public ImpureSystem
+{
+public:
+    EditorSystem(EventBroker* eventBroker)
+        : ImpureSystem(eventBroker)
+    { }
+
+    virtual void Update(World* world, double dt) override;
+};
\ No newline at end of file
diff --git a/include/Game/Game.h b/include/Game/Game.h
index 57941e55..7933c8a1 100644
--- a/include/Game/Game.h
+++ b/include/Game/Game.h
@@ -17,6 +17,7 @@
 #include "Core/SystemPipeline.h"
 #include "RaptorCopterSystem.h"
 #include "PlayerSystem.h"
+#include "Editor/EditorSystem.h"
 
 class Game
 {
diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt
index 6ff723da..99385d74 100644
--- a/src/Engine/CMakeLists.txt
+++ b/src/Engine/CMakeLists.txt
@@ -60,7 +60,6 @@ file(GLOB SOURCE_FILES_Rendering_Util
     "${INCLUDE_PATH}/Rendering/Util/*.h"
     "Rendering/Util/*.cpp"
 )
-
 source_group(Rendering FILES ${SOURCE_FILES_Rendering})
 source_group(Rendering\\Util FILES ${SOURCE_FILES_Rendering_Util})
 
@@ -70,6 +69,12 @@ file(GLOB SOURCE_FILES_GUI
 )
 source_group(GUI FILES ${SOURCE_FILES_GUI})
 
+file(GLOB SOURCE_FILES_Editor
+	"${INCLUDE_PATH}/Editor/*.h"
+	"Editor/*.cpp"
+)
+source_group(Editor FILES ${SOURCE_FILES_Editor})
+
 set(SOURCE_FILES
     ${SOURCE_FILES_Core}
     ${SOURCE_FILES_Core_Util}
@@ -81,6 +86,7 @@ set(SOURCE_FILES
 	${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui.cpp
 	${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_draw.cpp
 	${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_demo.cpp
+	${SOURCE_FILES_Editor}
 )
 
 set(LIBRARIES
diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
new file mode 100644
index 00000000..c1e359af
--- /dev/null
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -0,0 +1,6 @@
+#include "Editor/EditorSystem.h"
+
+void EditorSystem::Update(World* world, double dt)
+{
+
+}
diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp
index 71fa92a5..e463cb07 100644
--- a/src/Game/Game.cpp
+++ b/src/Game/Game.cpp
@@ -52,8 +52,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline = new SystemPipeline(m_EventBroker);
     m_SystemPipeline->AddSystem<RaptorCopterSystem>();
     m_SystemPipeline->AddSystem<PlayerSystem>();
-
-
+    m_SystemPipeline->AddSystem<EditorSystem>();
 
     m_LastTime = glfwGetTime();