diff --git a/NothinFancy/NothinFancy.vcxproj b/NothinFancy/NothinFancy.vcxproj
index 1f2e6db..4df5745 100644
--- a/NothinFancy/NothinFancy.vcxproj
+++ b/NothinFancy/NothinFancy.vcxproj
@@ -192,11 +192,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\Application.cpp" />
+    <ClCompile Include="src\Gamestates\Gamestate.cpp" />
     <ClCompile Include="src\Utility.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\include\Application.h" />
     <ClInclude Include="src\include\Config.h" />
+    <ClInclude Include="src\include\Gamestate.h" />
     <ClInclude Include="src\include\NothinFancy.h" />
     <ClInclude Include="src\include\Utility.h" />
   </ItemGroup>
diff --git a/NothinFancy/NothinFancy.vcxproj.filters b/NothinFancy/NothinFancy.vcxproj.filters
index 1bb77cc..310cf2d 100644
--- a/NothinFancy/NothinFancy.vcxproj.filters
+++ b/NothinFancy/NothinFancy.vcxproj.filters
@@ -21,6 +21,9 @@
     <ClCompile Include="src\Utility.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\Gamestates\Gamestate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\include\Config.h">
@@ -35,5 +38,8 @@
     <ClInclude Include="src\include\Application.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\include\Gamestate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/NothinFancy/src/Application.cpp b/NothinFancy/src/Application.cpp
index b6a7d2b..65f19b4 100644
--- a/NothinFancy/src/Application.cpp
+++ b/NothinFancy/src/Application.cpp
@@ -5,10 +5,6 @@
 #include "GL\wglew.h"
 #endif
 
-extern "C" {
-	_declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
-}
-
 namespace nf {
 	DEBUGINIT;
 
diff --git a/NothinFancy/src/Gamestates/Gamestate.cpp b/NothinFancy/src/Gamestates/Gamestate.cpp
new file mode 100644
index 0000000..bc3d378
--- /dev/null
+++ b/NothinFancy/src/Gamestates/Gamestate.cpp
@@ -0,0 +1,7 @@
+#include "Gamestate.h"
+
+namespace nf {
+	Gamestate::Gamestate() {
+
+	}
+}
\ No newline at end of file
diff --git a/NothinFancy/src/Utility.cpp b/NothinFancy/src/Utility.cpp
index f98b7bd..3d440cb 100644
--- a/NothinFancy/src/Utility.cpp
+++ b/NothinFancy/src/Utility.cpp
@@ -47,4 +47,9 @@ namespace nf {
 		MultiByteToWideChar(CP_ACP, NULL, in, -1, out, length);
 		return out;
 	}
+}
+
+//Nvidia Optimius support
+extern "C" {
+	_declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
 }
\ No newline at end of file
diff --git a/NothinFancy/src/include/Gamestate.h b/NothinFancy/src/include/Gamestate.h
new file mode 100644
index 0000000..1407b06
--- /dev/null
+++ b/NothinFancy/src/include/Gamestate.h
@@ -0,0 +1,13 @@
+#pragma once
+
+namespace nf {
+	class Gamestate {
+	public:
+		Gamestate();
+
+		virtual void onEnter();
+		virtual void onExit();
+	private:
+		//Resource stuff
+	};
+}
\ No newline at end of file