diff --git a/.gitignore b/.gitignore
index dd9fa6f..ce042ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -381,8 +381,6 @@ Makefile
 
 *.o
 
-*.a
-
 *.d
 
 *.ninja*
diff --git a/Editor/Build-Editor.lua b/Editor/Build-Editor.lua
index 496cd9a..4e48d67 100644
--- a/Editor/Build-Editor.lua
+++ b/Editor/Build-Editor.lua
@@ -3,6 +3,7 @@ project "Editor"
 	cppdialect "C++17"
 	systemversion "latest"
 	targetname "Editor"
+	links {"Engine-Core"}
 
 	files 
 	{
@@ -11,12 +12,6 @@ project "Editor"
 		"include/**.hpp",
 	}
 
-	filter "not action:vs*"
-		libdirs
-		{
-			corelibdir
-		}
-
 	--visual studio--
 	filter "action:vs*"
 		targetdir (vs_bindir)
@@ -30,11 +25,6 @@ project "Editor"
 			vs_imguidir
 		}
 
-		libdirs
-		{
-			vs_corelibdir
-		}
-
 	--not visual studio on windows--
   filter {"not action:vs*", "system:windows"}
     targetdir (bindir)
@@ -52,7 +42,7 @@ project "Editor"
 	filter{"system:windows"}
 	  defines "SFML_STATIC"
 		defines "PLATFORM_WINDOWS"
-		staticruntime "off"
+		staticruntime "on"
 
 	filter {"system:windows", "configurations:debug"}
 		defines{"_DEBUG", "_CONSOLE"}
@@ -60,7 +50,7 @@ project "Editor"
 	filter {"system:windows", "configurations:release"}
 		defines{"NDEBUG"}
 
-  --linux specific settings
+  --linux specific settings--
 	filter {"system:linux"}
 		targetdir (bindir)
 		objdir (intdir)
@@ -81,15 +71,13 @@ project "Editor"
 			"sfml-system",
 			"OpenGL",
 		}
-
     
-  --config settings
+  --config settings--
   filter "configurations:debug"
     defines {"LOG_ENABLE", "GAME_DEBUG"}
 		symbols "on"
 		runtime "Debug"
 		kind "ConsoleApp"
-		links "Core-d:static"
 
   filter "configurations:release"
     defines {"GAME_RELEASE"}
@@ -98,6 +86,4 @@ project "Editor"
 		symbols "off"
 		runtime "Release"
 		kind "WindowedApp"
-		entrypoint "mainCRTStartup"
-		links "Core:static"
 	
\ No newline at end of file
diff --git a/Engine-Core/Build-Core.lua b/Engine-Core/Build-Core.lua
index c238aab..14f0d6a 100644
--- a/Engine-Core/Build-Core.lua
+++ b/Engine-Core/Build-Core.lua
@@ -28,12 +28,7 @@ project "Engine-Core"
 			vs_imguidir
 		}
 
-	filter {"action:vs*", "configurations:debug"}
-		libdirs {vs_libdebug_dir}
-
-	filter {"action:vs*", "configurations:release"}
-		libdirs {vs_librelease_dir}
-
+		libdirs {vs_sfmldir .."/lib"}
 
 	--not visual studio --
   filter {"not action:vs*", "system:windows"}
@@ -46,35 +41,30 @@ project "Engine-Core"
 			sfmldir .. "/include",
       imguidir 
     }
-		
-		--sfml lib files for windows--
-  filter {"not action:vs*", "system:windows", "configurations:debug"}
-    libdirs {libdebug_dir}
 
-  filter {"not action:vs*", "system:windows", "configurations:release"}
-    libdirs {librelease_dir}
+		libdirs {sfmldir .."/lib"}
 
 	--windows specific settings--
 	filter{"system:windows"}
 	  defines "SFML_STATIC"
 		defines "PLATFORM_WINDOWS"
-		staticruntime "off"
+		staticruntime "on"
 
 	filter {"system:windows", "configurations:debug"}
 		defines{"_DEBUG", "_CONSOLE"}
 		links 
 		{
+			"sfml-main-d",
 			"sfml-graphics-s-d",
 			"sfml-window-s-d",
 			"opengl32",
 			"gdi32",
-			"freetyped",
+			"freetype",
 			"sfml-audio-s-d",
-			"flacd",
-			"vorbisencd",
-			"vorbisfiled",
-			"vorbisd",
-			"oggd",
+			"flac",
+			"vorbisfile",
+			"vorbis",
+			"ogg",
 			"sfml-system-s-d",
 			"winmm"
 		}
@@ -83,14 +73,15 @@ project "Engine-Core"
 		defines{"NDEBUG"}
 		links 
 		{
+			"sfml-main",
 			"sfml-graphics-s",
 			"sfml-window-s",
 			"opengl32",
 			"gdi32",
 			"freetype",
 			"sfml-audio-s",
+			"openal32",
 			"flac",
-			"vorbisenc",
 			"vorbisfile",
 			"vorbis",
 			"ogg",
@@ -99,7 +90,7 @@ project "Engine-Core"
 		}
 
 
-  --linux specific settings
+  --linux specific settings--
 	filter {"system:linux"}
 		defines "PLATFORM_LINUX"
 		targetdir (corelibdir)
@@ -121,7 +112,7 @@ project "Engine-Core"
 		}
 
     
-  --config settings
+  --config settings--
   filter "configurations:debug"
     defines {"LOG_ENABLE", "CORE_DEBUG"}
 		symbols "on"
diff --git a/Engine-Core/include/Containers/Array.h b/Engine-Core/include/Containers/Array.h
index 9937f21..b69654c 100644
--- a/Engine-Core/include/Containers/Array.h
+++ b/Engine-Core/include/Containers/Array.h
@@ -182,17 +182,13 @@ public:
 			return *this;
 		}
 
-		reference& operator=(const reference& other)
-		{ return *this = bool(other); }
+		reference& operator=(const reference& other) { return *this = bool(other); }
 
-		void flip()
-		{ *m_ptr ^= m_mask; }
+		void flip() { *m_ptr ^= m_mask; }
 
-		void setTrue()
-		{ *m_ptr |= m_mask; }
+		void setTrue() { *m_ptr |= m_mask; }
 
-		void setFalse()
-		{ *m_ptr &= ~m_mask; }
+		void setFalse() { *m_ptr &= ~m_mask; }
 
 	private:
 		data_type* const m_ptr;
@@ -414,7 +410,7 @@ public:
 	void setTrueAt(CapacityType index)
 	{ m_data[index / 8] |= (1 << (index % 8)); }
 
-	void setFalseAt(CapacityType index)
+	void setFalseAt(CapacityType index) 
 	{ m_data[index / 8] &= ~(1 << (index % 8)); }
 
 	iterator begin() { return iterator(m_data, 0); }
diff --git a/Engine-Core/include/Entities/Entity.h b/Engine-Core/include/Entities/Entity.h
index 1807c9f..129f049 100644
--- a/Engine-Core/include/Entities/Entity.h
+++ b/Engine-Core/include/Entities/Entity.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <utility.h>
-
-#include <Entities/Entity.h>
 #include <Entities/Components.h>
 #include <Entities/EntityMemoryPool.h>
 
diff --git a/Engine-Core/include/Entities/EntityManager.h b/Engine-Core/include/Entities/EntityManager.h
index f5ae521..dc2fc56 100644
--- a/Engine-Core/include/Entities/EntityManager.h
+++ b/Engine-Core/include/Entities/EntityManager.h
@@ -18,8 +18,8 @@ public:
 	Entity addEntity(tag_t);
 
 private:
-	index_t m_numEntities[util::TAG_COUNT];
-	index_t m_numEntitiesToAdd[util::TAG_COUNT];
+	index_t m_numEntities[util::TAG_COUNT]{};
+	index_t m_numEntitiesToAdd[util::TAG_COUNT]{};
 	#ifdef CORE_DEBUG
 	index_t m_totalEntities{};
 	#endif
diff --git a/Engine-Core/include/Entities/EntityView.h b/Engine-Core/include/Entities/EntityView.h
index 295407a..c0d3087 100644
--- a/Engine-Core/include/Entities/EntityView.h
+++ b/Engine-Core/include/Entities/EntityView.h
@@ -29,7 +29,7 @@ public:
 		bool operator==(iterator);
 		bool operator!=(iterator);
 	private:
-		index_t m_currentEntity;
+		index_t m_currentEntity{};
 	};
 
 	Entity operator[](index_t) const;
@@ -38,6 +38,6 @@ public:
 	iterator end()   { return iterator(m_start + m_size); }
 
 private:
-	index_t m_start;
-	index_t m_size;
+	index_t m_start{};
+	index_t m_size{};
 };
\ No newline at end of file
diff --git a/Engine-Core/src/Entities/EntityManager.cpp b/Engine-Core/src/Entities/EntityManager.cpp
index 8b9d00e..a9ca3f6 100644
--- a/Engine-Core/src/Entities/EntityManager.cpp
+++ b/Engine-Core/src/Entities/EntityManager.cpp
@@ -12,7 +12,7 @@ int EntityManager::update()
 {
 	for(int i = 0; i < util::TAG_COUNT; i++)
 	{
-		if (m_numEntities[i] + m_numEntitiesToAdd[i] >= util::getTagSize(i)) [[unlikely]]
+		if (m_numEntities[i] + m_numEntitiesToAdd[i] >= util::getTagSize(i))
 		{
 			LOG("Error: Entity Overflow");
 			return ErrorCode::entityOverflow;
diff --git a/Engine-Core/vendor/SFML/lib/FLAC.lib b/Engine-Core/vendor/SFML/lib/FLAC.lib
new file mode 100644
index 0000000..d0c7ecb
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/FLAC.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/FLACd.lib b/Engine-Core/vendor/SFML/lib/FLACd.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/FLACd.lib
rename to Engine-Core/vendor/SFML/lib/FLACd.lib
index 8e6516d..1490cc1 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/FLACd.lib and b/Engine-Core/vendor/SFML/lib/FLACd.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/FLAC.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/FLAC.lib
deleted file mode 100644
index f63b67c..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/FLAC.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/freetype.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/freetype.lib
deleted file mode 100644
index 107bbe0..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/freetype.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/ogg.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/ogg.lib
deleted file mode 100644
index 5a46c20..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/ogg.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-audio-s.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-audio-s.lib
deleted file mode 100644
index 963f8df..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-audio-s.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-graphics-s.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-graphics-s.lib
deleted file mode 100644
index e11de0c..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-graphics-s.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-main.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-main.lib
deleted file mode 100644
index e44d0df..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-main.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-network-s.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-network-s.lib
deleted file mode 100644
index b3c7d4b..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-network-s.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-system-s.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-system-s.lib
deleted file mode 100644
index e3986df..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-system-s.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-window-s.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-window-s.lib
deleted file mode 100644
index c70c562..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/sfml-window-s.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/vorbisfile.lib b/Engine-Core/vendor/SFML/lib/MinSizeRel/vorbisfile.lib
deleted file mode 100644
index c0f1364..0000000
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/vorbisfile.lib and /dev/null differ
diff --git a/Engine-Core/vendor/SFML/lib/freetype.lib b/Engine-Core/vendor/SFML/lib/freetype.lib
new file mode 100644
index 0000000..3bae3fd
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/freetype.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/freetyped.lib b/Engine-Core/vendor/SFML/lib/freetyped.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/freetyped.lib
rename to Engine-Core/vendor/SFML/lib/freetyped.lib
index b460f5e..e9f4fa6 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/freetyped.lib and b/Engine-Core/vendor/SFML/lib/freetyped.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/ogg.lib b/Engine-Core/vendor/SFML/lib/ogg.lib
new file mode 100644
index 0000000..ff00c03
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/ogg.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/oggd.lib b/Engine-Core/vendor/SFML/lib/oggd.lib
similarity index 98%
rename from Engine-Core/vendor/SFML/lib/Debug/oggd.lib
rename to Engine-Core/vendor/SFML/lib/oggd.lib
index 71e4bde..a3105e7 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/oggd.lib and b/Engine-Core/vendor/SFML/lib/oggd.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/sfml-audio-s-d.lib b/Engine-Core/vendor/SFML/lib/sfml-audio-s-d.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/sfml-audio-s-d.lib
rename to Engine-Core/vendor/SFML/lib/sfml-audio-s-d.lib
index 884b539..10ed5fd 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/sfml-audio-s-d.lib and b/Engine-Core/vendor/SFML/lib/sfml-audio-s-d.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/sfml-audio-s.lib b/Engine-Core/vendor/SFML/lib/sfml-audio-s.lib
new file mode 100644
index 0000000..8f81ccd
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/sfml-audio-s.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/sfml-graphics-s-d.lib b/Engine-Core/vendor/SFML/lib/sfml-graphics-s-d.lib
similarity index 97%
rename from Engine-Core/vendor/SFML/lib/Debug/sfml-graphics-s-d.lib
rename to Engine-Core/vendor/SFML/lib/sfml-graphics-s-d.lib
index 844a097..6ee4741 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/sfml-graphics-s-d.lib and b/Engine-Core/vendor/SFML/lib/sfml-graphics-s-d.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/sfml-graphics-s.lib b/Engine-Core/vendor/SFML/lib/sfml-graphics-s.lib
new file mode 100644
index 0000000..019c3a3
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/sfml-graphics-s.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/sfml-main-d.lib b/Engine-Core/vendor/SFML/lib/sfml-main-d.lib
similarity index 96%
rename from Engine-Core/vendor/SFML/lib/Debug/sfml-main-d.lib
rename to Engine-Core/vendor/SFML/lib/sfml-main-d.lib
index 6aae5df..dda5419 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/sfml-main-d.lib and b/Engine-Core/vendor/SFML/lib/sfml-main-d.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/sfml-main.lib b/Engine-Core/vendor/SFML/lib/sfml-main.lib
new file mode 100644
index 0000000..13fe18a
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/sfml-main.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/sfml-network-s-d.lib b/Engine-Core/vendor/SFML/lib/sfml-network-s-d.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/sfml-network-s-d.lib
rename to Engine-Core/vendor/SFML/lib/sfml-network-s-d.lib
index 331fb2e..1318cb4 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/sfml-network-s-d.lib and b/Engine-Core/vendor/SFML/lib/sfml-network-s-d.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/sfml-network-s.lib b/Engine-Core/vendor/SFML/lib/sfml-network-s.lib
new file mode 100644
index 0000000..7fcbd24
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/sfml-network-s.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/sfml-system-s-d.lib b/Engine-Core/vendor/SFML/lib/sfml-system-s-d.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/sfml-system-s-d.lib
rename to Engine-Core/vendor/SFML/lib/sfml-system-s-d.lib
index 211c958..0c65df8 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/sfml-system-s-d.lib and b/Engine-Core/vendor/SFML/lib/sfml-system-s-d.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/sfml-system-s.lib b/Engine-Core/vendor/SFML/lib/sfml-system-s.lib
new file mode 100644
index 0000000..4fd42e2
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/sfml-system-s.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/sfml-window-s-d.lib b/Engine-Core/vendor/SFML/lib/sfml-window-s-d.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/sfml-window-s-d.lib
rename to Engine-Core/vendor/SFML/lib/sfml-window-s-d.lib
index 6bb42ce..9fd01e1 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/sfml-window-s-d.lib and b/Engine-Core/vendor/SFML/lib/sfml-window-s-d.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/sfml-window-s.lib b/Engine-Core/vendor/SFML/lib/sfml-window-s.lib
new file mode 100644
index 0000000..686da10
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/sfml-window-s.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/vorbis.lib b/Engine-Core/vendor/SFML/lib/vorbis.lib
similarity index 67%
rename from Engine-Core/vendor/SFML/lib/MinSizeRel/vorbis.lib
rename to Engine-Core/vendor/SFML/lib/vorbis.lib
index 668c27d..0572bf7 100644
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/vorbis.lib and b/Engine-Core/vendor/SFML/lib/vorbis.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/vorbisd.lib b/Engine-Core/vendor/SFML/lib/vorbisd.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/vorbisd.lib
rename to Engine-Core/vendor/SFML/lib/vorbisd.lib
index 57ef6f8..64874bb 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/vorbisd.lib and b/Engine-Core/vendor/SFML/lib/vorbisd.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/MinSizeRel/vorbisenc.lib b/Engine-Core/vendor/SFML/lib/vorbisenc.lib
similarity index 95%
rename from Engine-Core/vendor/SFML/lib/MinSizeRel/vorbisenc.lib
rename to Engine-Core/vendor/SFML/lib/vorbisenc.lib
index 57f0e36..5e02851 100644
Binary files a/Engine-Core/vendor/SFML/lib/MinSizeRel/vorbisenc.lib and b/Engine-Core/vendor/SFML/lib/vorbisenc.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/vorbisencd.lib b/Engine-Core/vendor/SFML/lib/vorbisencd.lib
similarity index 99%
rename from Engine-Core/vendor/SFML/lib/Debug/vorbisencd.lib
rename to Engine-Core/vendor/SFML/lib/vorbisencd.lib
index a9bdbf7..1794c80 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/vorbisencd.lib and b/Engine-Core/vendor/SFML/lib/vorbisencd.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/vorbisfile.lib b/Engine-Core/vendor/SFML/lib/vorbisfile.lib
new file mode 100644
index 0000000..6ffc75a
Binary files /dev/null and b/Engine-Core/vendor/SFML/lib/vorbisfile.lib differ
diff --git a/Engine-Core/vendor/SFML/lib/Debug/vorbisfiled.lib b/Engine-Core/vendor/SFML/lib/vorbisfiled.lib
similarity index 98%
rename from Engine-Core/vendor/SFML/lib/Debug/vorbisfiled.lib
rename to Engine-Core/vendor/SFML/lib/vorbisfiled.lib
index d9a442e..f5380dc 100644
Binary files a/Engine-Core/vendor/SFML/lib/Debug/vorbisfiled.lib and b/Engine-Core/vendor/SFML/lib/vorbisfiled.lib differ
diff --git a/Game/Build-Game.lua b/Game/Build-Game.lua
index 14a9c42..eb061af 100644
--- a/Game/Build-Game.lua
+++ b/Game/Build-Game.lua
@@ -3,6 +3,7 @@ project "Game"
 	cppdialect "C++17"
 	systemversion "latest"
 	targetname "Game"
+	links {"Engine-Core"}
 
 	files 
 	{
@@ -10,12 +11,6 @@ project "Game"
 		"include/**.h",
 		"include/**.hpp",
 	}
-	
-	filter "not action:vs*"
-		libdirs
-		{
-			corelibdir
-		}
 
 	--visual studio--
 	filter {"action:vs*", "system:windows"}
@@ -30,11 +25,6 @@ project "Game"
 			vs_imguidir
 		}
 
-		libdirs
-		{
-			vs_corelibdir
-		}
-
 	--not visual studio on windows--
   filter {"not action:vs*", "system:windows"}
     targetdir (bindir)
@@ -52,7 +42,7 @@ project "Game"
 	filter{"system:windows"}
 	  defines "SFML_STATIC"
 		defines "PLATFORM_WINDOWS"
-		staticruntime "off"
+		staticruntime "on"
 
 	filter {"system:windows", "configurations:debug"}
 		defines{"_DEBUG", "_CONSOLE"}
@@ -60,7 +50,7 @@ project "Game"
 	filter {"system:windows", "configurations:release"}
 		defines{"NDEBUG"}
 
-  --linux specific settings
+  --linux specific settings--
 	filter {"system:linux"}
 		targetdir (bindir)
 		objdir (intdir)
@@ -82,13 +72,12 @@ project "Game"
 			"OpenGL",
 		}
 
-  --config settings
+  --config settings--
   filter "configurations:debug"
     defines {"LOG_ENABLE", "GAME_DEBUG"}
 		symbols "on"
 		runtime "Debug"
 		kind "ConsoleApp"
-		links "Core-d:static"
 
   filter "configurations:release"
     defines {"GAME_RELEASE"}
@@ -97,5 +86,3 @@ project "Game"
 		symbols "off"
 		runtime "Release"
 		kind "WindowedApp"
-		entrypoint "mainCRTStartup"
-		links "Core:static"
diff --git a/Game/imgui.ini b/Game/imgui.ini
new file mode 100644
index 0000000..75ef72c
--- /dev/null
+++ b/Game/imgui.ini
@@ -0,0 +1,8 @@
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+
+[Window][sdfkjasbdf]
+Pos=60,60
+Size=957,582
+
diff --git a/Game/src/game-main.cpp b/Game/src/game-main.cpp
index 3c9061c..b95f828 100644
--- a/Game/src/game-main.cpp
+++ b/Game/src/game-main.cpp
@@ -1,4 +1,4 @@
-#include "Containers/Array.h"
+
 #define DRAW_SCREEN 1
 
 #include <Containers.h>
@@ -11,13 +11,11 @@
 #include <iostream>
 #include <utility.h>
 
-int main()
+int main(int argc, char* argv[])
 {
 	LOG("\n\n\033[32mTODO: ");
 	LOG("-Implement Draw queue prototype");
 	LOG("-Implement swapback functionality when removing entites");
-	LOG("-Test new Premake config on windows (VS and non VS) and WSL");
-	LOG("-Replace sfml .lib files with ones that dont statically link runtime");
 	LOG("-Implement adding and removing of entities");
 	LOG("-Implement EntityManager::update()");
 	LOG("\033[0m");
@@ -40,7 +38,7 @@ int main()
 		LOG(ent);
 	}
 
-	auto window = sf::RenderWindow(sf::VideoMode({ 1920u, 1080u }), "Fake Mario");
+	auto window = sf::RenderWindow(sf::VideoMode({ 1920u, 1080u }), "2d-platformer");
 	window.setFramerateLimit(60);
 	if (!ImGui::SFML::Init(window))
 		return -1;
diff --git a/premake5.lua b/premake5.lua
index 586e057..803723c 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -9,7 +9,7 @@ workspace "2d-platformer"
 		"release"
 	}
 
-	startproject "Editor"
+	startproject "Game"
 
 output_dir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
 vs_intdir = "$(ProjectDir)intermediate-files/" .. output_dir
@@ -21,10 +21,6 @@ corelibdir = "%{wks.location}/Engine-Core/lib"
 vs_corelibdir = "$(SolutionDir)Engine-Core/lib"
 coreinclude_dir = "%{wks.location}/Engine-Core/include"
 vs_coreinclude_dir = "$(SolutionDir)Engine-Core/include"
-vs_librelease_dir = "$(SolutionDir)Engine-Core/vendor/SFML/lib/MinSizeRel"
-librelease_dir = "%{wks.location}/Engine-Core/vendor/SFML/lib/MinSizeRel"
-vs_libdebug_dir = "$(SolutionDir)Engine-Core/vendor/SFML/lib/Debug"
-libdebug_dir = "%{wks.location}/Engine-Core/vendor/SFML/lib/Debug"
 vs_sfmldir = "$(SolutionDir)Engine-Core/vendor/SFML"
 sfmldir = "%{wks.location}/Engine-Core/vendor/SFML"
 vs_imguidir = "$(SolutionDir)Engine-Core/vendor/imgui"