diff --git a/Blueprint-Values.txt b/Blueprint-Values.txt
index f63eec49..9e0ce9ff 100644
--- a/Blueprint-Values.txt
+++ b/Blueprint-Values.txt
@@ -8,7 +8,7 @@ doubleWithUnit			:66.6px
 
 list of any single value:
 vector<string>			:["Hello","How are you?","fine"]
-vector<bool>				:[true, false,   0, 1]
+vector<bool>			:[true, false,   0, 1]
 vector<int>				:[100,200,400,800]
 vector<intWithUnit>		:[50px,100px,200px]
 vector<double>			:[33.3,66.6,100.5]
diff --git a/kgEngine-2.0/TileMapGame/ChunkSystem.cpp b/kgEngine-2.0/TileMapGame/ChunkSystem.cpp
index 603bcaed..b9aa70c1 100644
--- a/kgEngine-2.0/TileMapGame/ChunkSystem.cpp
+++ b/kgEngine-2.0/TileMapGame/ChunkSystem.cpp
@@ -170,6 +170,12 @@ namespace kg
 		// its a bug -.-
 	}
 
+	void ChunkSystem::saveOpenSavegame( Engine& engine, World& world, SaveManager& saveManager )
+	{
+		saveAllLoadedChunks( engine, world, saveManager );
+		saveManager.saveSystems( world );
+	}
+
 	bool ChunkSystem::ensureChunkLoaded( Engine& engine, World& world, SaveManager& saveManager, const sf::Vector2i& chunkPosition )
 	{
 		if( !m_loadedChunks[chunkPosition.x][chunkPosition.y] )
diff --git a/kgEngine-2.0/TileMapGame/ChunkSystem.h b/kgEngine-2.0/TileMapGame/ChunkSystem.h
index c8570209..b0f7118e 100644
--- a/kgEngine-2.0/TileMapGame/ChunkSystem.h
+++ b/kgEngine-2.0/TileMapGame/ChunkSystem.h
@@ -82,6 +82,7 @@ namespace kg
 		/*std::list<std::shared_ptr<Entity>> getEntitiesInChunk( const sf::Vector2i& from,
 															   const sf::Vector2i& to )const;*/
 
+		void saveOpenSavegame( Engine& engine, World& world, SaveManager& saveManager );
 		void saveAllLoadedChunks( Engine& engine, World& world, SaveManager& saveManager );
 
 		// returns the position in chunks for the position of an entity
diff --git a/kgEngine-2.0/TileMapGame/DefaultGameState.cpp b/kgEngine-2.0/TileMapGame/DefaultGameState.cpp
new file mode 100644
index 00000000..d5494eee
--- /dev/null
+++ b/kgEngine-2.0/TileMapGame/DefaultGameState.cpp
@@ -0,0 +1,72 @@
+#include "DefaultGameState.h"
+using namespace std;
+using namespace sf;
+
+namespace kg
+{
+
+	void DefaultGameState::onInit()
+	{
+		return;
+	}
+
+	void DefaultGameState::registerGui( tgui::Gui& gui )
+	{
+		return;
+	}
+
+	void DefaultGameState::registerInputCallbacks( InputManager& inputManager )
+	{
+		Action escapePress( Keyboard::Escape, Action::PressOnce );
+
+		Action eventClose( Event::Closed );
+
+		inputManager.setAction( id::Input::SHUT_DOWN,
+								escapePress || eventClose,
+								bind( &DefaultGameState::shutDown, this ) );
+	}
+
+	void DefaultGameState::onUpdate( GameStateManager& gameStateManager )
+	{
+		if( !m_singleplayerGameStateLaunched )
+		{
+			gameStateManager.push( std::make_shared<SingleplayerGameState>() );
+			m_singleplayerGameStateLaunched = true;
+		}
+	}
+
+	void DefaultGameState::removeInputCallbacks( InputManager& inputManager )
+	{
+		inputManager.removeAction( id::Input::SHUT_DOWN );
+	}
+
+	void DefaultGameState::removeGui( tgui::Gui& gui )
+	{
+		return;
+	}
+
+	void DefaultGameState::onDestroy()
+	{
+		throw exception( "DefaultGameState should never be destroyed" );
+	}
+
+
+	const Plugin::Name& DefaultGameState::getPluginName() const
+	{
+		return PLUGIN_NAME;
+	}
+
+	Plugin::Id DefaultGameState::getPluginId() const
+	{
+		return id::DEFAULT_GAMESTATE_ID;
+	}
+
+	const std::string DefaultGameState::PLUGIN_NAME = "Default GameState";
+
+	void DefaultGameState::shutDown()
+	{
+		r_world->getSystem<ChunkSystem>()->saveOpenSavegame( *r_engine, *r_world, *r_saveManager );
+		r_engine->shouldTerminate = true;
+	}
+
+}
diff --git a/kgEngine-2.0/TileMapGame/DefaultGameState.h b/kgEngine-2.0/TileMapGame/DefaultGameState.h
new file mode 100644
index 00000000..8d071c41
--- /dev/null
+++ b/kgEngine-2.0/TileMapGame/DefaultGameState.h
@@ -0,0 +1,39 @@
+#pragma once
+#include "stdafx.h"
+#include "ChunkSystem.h"
+#include "SingleplayerGameState.h"
+
+namespace kg
+{
+	class DefaultGameState : public GameState
+	{
+		bool m_singleplayerGameStateLaunched = false;
+
+	public:
+		virtual void onInit() override;
+
+		virtual void registerGui( tgui::Gui& gui ) override;
+
+		virtual void registerInputCallbacks( InputManager& inputManager ) override;
+
+		virtual void onUpdate( GameStateManager& gameStateManager ) override;
+
+		virtual void removeInputCallbacks( InputManager& inputManager ) override;
+
+		virtual void removeGui( tgui::Gui& gui ) override;
+
+		virtual void onDestroy() override;
+
+
+		virtual const Plugin::Name& getPluginName() const override;
+
+		virtual Plugin::Id getPluginId() const override;
+
+
+		static const std::string PLUGIN_NAME;
+
+		//Input Callbacks
+	private:
+		void shutDown();
+	};
+}
diff --git a/kgEngine-2.0/TileMapGame/GameController.cpp b/kgEngine-2.0/TileMapGame/GameController.cpp
deleted file mode 100644
index c325a91d..00000000
--- a/kgEngine-2.0/TileMapGame/GameController.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-#include "GameController.h"
-using namespace std;
-using namespace sf;
-using namespace tgui;
-using Action = thor::Action;
-
-namespace kg
-{
-	void GameController::m_onSavegameOpened( Engine& engine )
-	{
-		m_cameraZoomFactor = 1;
-	}
-
-	void GameController::init( Engine& engine, World& world, SaveManager& saveManager, std::shared_ptr<ConfigFile>& configFile )
-	{
-		r_engine = &engine;
-		r_world = &world;
-		r_saveManager = &saveManager;
-		r_graphicsSystem = world.getSystem<GraphicsSystem>();
-
-		m_connectToSignal( saveManager.s_savegameOpened, &GameController::m_onSavegameOpened );
-		registerInputCallbacks( engine.inputManager );
-
-		saveManager.openSavegame( engine, world, "MyFirstSavegameEver" );
-
-		auto button = make_shared<Button>();
-		button->setText( "Button" );
-		engine.inputManager.gui.add( button );
-
-		return;
-	}
-
-	void GameController::sfmlEvent( Engine& engine, World& world, SaveManager& saveManager, const sf::Event& sfEvent )
-	{
-		if( sfEvent.type == Event::Closed )
-			shutDown();
-		return;
-	}
-
-	void GameController::update( Engine& engine, World& world, SaveManager& saveManager, const sf::Time& frameTime )
-	{
-		lastFrameTimeInMilliseconds = frameTime.asMilliseconds();
-
-		if( !engine.isPaused )
-		{
-
-		}
-
-		return;
-	}
-
-	double GameController::getUpdateImportance() const
-	{
-		return ( double )id::SystemUpdateImportance::GAME_CONTROLLER;
-	}
-
-	const std::string& GameController::getPluginName() const
-	{
-		return PLUGIN_NAME;
-	}
-
-	Plugin::Id GameController::getPluginId() const
-	{
-		return ( int )id::SystemPluginId::GAME_CONTROLLER;
-	}
-
-	const size_t& GameController::getRTTI_hash() const
-	{
-		return type_hash;
-	}
-
-	std::shared_ptr<Entity> GameController::m_getValidCamera()
-	{
-		if( m_camera.expired() )
-			m_camera = r_graphicsSystem->getCamera( 0 );
-		return m_camera.lock();
-	}
-
-	void GameController::saveOpenSavegame( Engine& engine, World& world, SaveManager& saveManager )
-	{
-		world.getSystem<ChunkSystem>()->saveAllLoadedChunks( engine, world, saveManager );
-		saveManager.saveSystems( world );
-	}
-
-	void GameController::movePlayer( sf::Vector2i distance )
-	{
-		auto camera = m_getValidCamera();
-
-		camera->getComponent<Transformation>()->move( distance );
-	}
-
-	const std::string GameController::PLUGIN_NAME = "GameControllerSystem";
-
-	const size_t GameController::type_hash = getRuntimeTypeInfo<GameController>();
-
-
-	void GameController::registerInputCallbacks( InputManager& inputManager )
-	{
-		// Keys
-		Action shift( Keyboard::LShift, Action::Hold );
-		Action control( Keyboard::LControl, Action::Hold );
-
-		Action w( Keyboard::W, Action::Hold );
-		Action a( Keyboard::A, Action::Hold );
-		Action s( Keyboard::S, Action::Hold );
-		Action d( Keyboard::D, Action::Hold );
-
-		Action add( Keyboard::Add, Action::Hold );
-		Action subtract( Keyboard::Subtract, Action::Hold );
-
-		Action escapePress( Keyboard::Escape, Action::PressOnce );
-		Action f5Press( Keyboard::F5, Action::PressOnce );
-
-
-		// Events
-		Action eventClose( Event::Closed );
-
-
-		// Set the actions and register callbacks
-		inputManager.setAction( id::Input::SHUT_DOWN,
-								escapePress || eventClose,
-								bind( &GameController::shutDown, this ) );
-		inputManager.setAction( id::Input::RELOAD_SAVE, f5Press,
-								bind( &GameController::reloadSave, this ) );
-
-		inputManager.setAction( id::Input::MOVE_UP, w && !shift && !control,
-								bind( &GameController::moveUp, this ) );
-		inputManager.setAction( id::Input::MOVE_DOWN, s && !shift && !control,
-								bind( &GameController::moveDown, this ) );
-		inputManager.setAction( id::Input::MOVE_LEFT, a && !shift && !control,
-								bind( &GameController::moveLeft, this ) );
-		inputManager.setAction( id::Input::MOVE_RIGHT, d && !shift && !control,
-								bind( &GameController::moveRight, this ) );
-
-		inputManager.setAction( id::Input::MOVE_UP_FAST, w && shift && !control,
-								bind( &GameController::moveUpFast, this ) );
-		inputManager.setAction( id::Input::MOVE_DOWN_FAST, s && shift && !control,
-								bind( &GameController::moveDownFast, this ) );
-		inputManager.setAction( id::Input::MOVE_LEFT_FAST, a && shift && !control,
-								bind( &GameController::moveLeftFast, this ) );
-		inputManager.setAction( id::Input::MOVE_RIGHT_FAST, d && shift && !control,
-								bind( &GameController::moveRightFast, this ) );
-
-		inputManager.setAction( id::Input::MOVE_UP_SLOW, w && !shift && control,
-								bind( &GameController::moveUpSlow, this ) );
-		inputManager.setAction( id::Input::MOVE_DOWN_SLOW, s && !shift && control,
-								bind( &GameController::moveDownSlow, this ) );
-		inputManager.setAction( id::Input::MOVE_LEFT_SLOW, a && !shift && control,
-								bind( &GameController::moveLeftSlow, this ) );
-		inputManager.setAction( id::Input::MOVE_RIGHT_SLOW, d && !shift && control,
-								bind( &GameController::moveRightSlow, this ) );
-
-		inputManager.setAction( id::Input::ZOOM_IN, add,
-								bind( &GameController::zoomIn, this ) );
-		inputManager.setAction( id::Input::ZOOM_OUT, subtract,
-								bind( &GameController::zoomOut, this ) );
-
-	}
-
-	void GameController::shutDown()
-	{
-		saveOpenSavegame( *r_engine, *r_world, *r_saveManager );
-		r_engine->shouldTerminate = true;
-	}
-
-	void GameController::reloadSave()
-	{
-		saveOpenSavegame( *r_engine, *r_world, *r_saveManager );
-		r_saveManager->openSavegame( *r_engine, *r_world, "MyFirstSavegameEver" );
-	}
-
-	void GameController::pause()
-	{
-		r_engine->isPaused = !r_engine->isPaused;
-	}
-
-	void GameController::moveUp()
-	{
-		sf::Vector2i cameraMovement( 0, -10.0 / 16.0 * lastFrameTimeInMilliseconds );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveDown()
-	{
-		sf::Vector2i cameraMovement( 0, 10.0 / 16.0 * lastFrameTimeInMilliseconds );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveLeft()
-	{
-		sf::Vector2i cameraMovement( -10.0 / 16.0 * lastFrameTimeInMilliseconds, 0 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveRight()
-	{
-		sf::Vector2i cameraMovement( 10.0 / 16.0 * lastFrameTimeInMilliseconds, 0 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveUpFast()
-	{
-		sf::Vector2i cameraMovement( 0, -10.0 / 16.0 * lastFrameTimeInMilliseconds * 4 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveDownFast()
-	{
-		sf::Vector2i cameraMovement( 0, 10.0 / 16.0 * lastFrameTimeInMilliseconds * 4 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveLeftFast()
-	{
-		sf::Vector2i cameraMovement( -10.0 / 16.0 * lastFrameTimeInMilliseconds * 4, 0 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveRightFast()
-	{
-		sf::Vector2i cameraMovement( 10.0 / 16.0 * lastFrameTimeInMilliseconds * 4, 0 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveUpSlow()
-	{
-		sf::Vector2i cameraMovement( 0, -10.0 / 16.0 * lastFrameTimeInMilliseconds / 2 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveDownSlow()
-	{
-		sf::Vector2i cameraMovement( 0, 10.0 / 16.0 * lastFrameTimeInMilliseconds / 2 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveLeftSlow()
-	{
-		sf::Vector2i cameraMovement( -10.0 / 16.0 * lastFrameTimeInMilliseconds / 2, 0 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::moveRightSlow()
-	{
-		sf::Vector2i cameraMovement( 10.0 / 16.0 * lastFrameTimeInMilliseconds / 2, 0 );
-		movePlayer( cameraMovement );
-	}
-
-	void GameController::zoomIn()
-	{
-		auto camera = m_getValidCamera();
-
-		m_cameraZoomFactor -= 0.01*lastFrameTimeInMilliseconds;
-
-		if( m_cameraZoomFactor < 0 )
-			m_cameraZoomFactor = 0;
-		camera->getComponent<Camera>()->setZoomFactor( m_cameraZoomFactor );
-	}
-
-	void GameController::zoomOut()
-	{
-		auto camera = m_getValidCamera();
-
-		m_cameraZoomFactor += 0.01*lastFrameTimeInMilliseconds;
-
-		if( m_cameraZoomFactor < 0 )
-			m_cameraZoomFactor = 0;
-		camera->getComponent<Camera>()->setZoomFactor( m_cameraZoomFactor );
-	}
-
-}
diff --git a/kgEngine-2.0/TileMapGame/GameController.h b/kgEngine-2.0/TileMapGame/GameController.h
deleted file mode 100644
index ed9e6ed3..00000000
--- a/kgEngine-2.0/TileMapGame/GameController.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-#include "stdafx.h"
-#include "ChunkSystem.h"
-#include "GraphicsSystem.h"
-
-namespace kg
-{
-	class GameController : public System, public CallbackReciever
-	{
-	private:
-		Engine* r_engine;
-		World* r_world;
-		SaveManager* r_saveManager;
-		GraphicsSystem* r_graphicsSystem;
-
-		std::weak_ptr<Entity> m_camera;
-		float m_cameraZoomFactor = 1;
-		std::shared_ptr<Entity> m_getValidCamera();
-
-		sf::Int32 lastFrameTimeInMilliseconds = 0;
-
-		void saveOpenSavegame( Engine& engine, World& world, SaveManager& saveManager );
-
-		void movePlayer( sf::Vector2i distance );
-
-		void m_onSavegameOpened( Engine& engine );
-
-	public:
-		virtual void init( Engine& engine, World& world, SaveManager& saveManager, std::shared_ptr<ConfigFile>& configFile );
-
-		virtual void sfmlEvent( Engine& engine, World& world, SaveManager& saveManager, const sf::Event& sfEvent );
-
-		virtual void update( Engine& engine, World& world, SaveManager& saveManager, const sf::Time& frameTime );
-
-		virtual double getUpdateImportance() const;
-
-		virtual const Plugin::Name& getPluginName() const;
-
-		virtual Plugin::Id getPluginId()const;
-
-		virtual const size_t& getRTTI_hash() const override;
-
-		static const std::string PLUGIN_NAME;
-
-		static const size_t type_hash;
-
-		//Input Callbacks
-	private:
-		void registerInputCallbacks( InputManager& inputManager );
-
-		void shutDown();
-		void reloadSave();
-
-		void pause();
-
-		void moveUp();
-		void moveDown();
-		void moveLeft();
-		void moveRight();
-		void moveUpFast();
-		void moveDownFast();
-		void moveLeftFast();
-		void moveRightFast();
-		void moveUpSlow();
-		void moveDownSlow();
-		void moveLeftSlow();
-		void moveRightSlow();
-
-		void zoomIn();
-		void zoomOut();
-
-
-	};
-}
diff --git a/kgEngine-2.0/TileMapGame/GraphicsSystem.cpp b/kgEngine-2.0/TileMapGame/GraphicsSystem.cpp
index 2d82eb01..a294c571 100644
--- a/kgEngine-2.0/TileMapGame/GraphicsSystem.cpp
+++ b/kgEngine-2.0/TileMapGame/GraphicsSystem.cpp
@@ -87,11 +87,6 @@ namespace kg
 
 	void GraphicsSystem::update( Engine& engine, World& world, SaveManager& saveManager, const sf::Time& frameTime )
 	{
-		if( m_shouldInitCameras )
-		{
-			m_initCameras( engine, world );
-			m_shouldInitCameras = false;
-		}
 
 		m_drawableEntityMutex.lock();
 		m_addedEntitiesCopy.insert( end( m_addedEntitiesCopy ), begin( m_addedEntities ), end( m_addedEntities ) );
@@ -149,9 +144,9 @@ namespace kg
 			m_removedEntities.push_back( entity );
 	}
 
-	void GraphicsSystem::m_onSavegameOpened( Engine& engine )
+	void GraphicsSystem::m_onSavegameOpened( Engine& engine, World& world )
 	{
-		m_shouldInitCameras = true;
+		m_initCameras( engine, world );
 	}
 
 	void GraphicsSystem::m_onSavegameClosed()
diff --git a/kgEngine-2.0/TileMapGame/GraphicsSystem.h b/kgEngine-2.0/TileMapGame/GraphicsSystem.h
index 43bb79f9..888a3bb8 100644
--- a/kgEngine-2.0/TileMapGame/GraphicsSystem.h
+++ b/kgEngine-2.0/TileMapGame/GraphicsSystem.h
@@ -48,7 +48,6 @@ namespace kg
 		sf::RenderWindow* r_renderWindow;
 		tgui::Gui* r_gui;
 
-		bool m_shouldInitCameras = true;
 		void m_initCameras( Engine& engine, World& world );
 
 		EntityManager::EntityContainer m_addedEntities;
@@ -56,7 +55,7 @@ namespace kg
 		void m_onEntityAddedToWorld( const std::shared_ptr<Entity>& entity );
 		void m_onEntityRemovedFromWorld( const std::shared_ptr<Entity>& entity );
 
-		void m_onSavegameOpened( Engine& engine );
+		void m_onSavegameOpened( Engine& engine, World& world );
 		void m_onSavegameClosed();
 
 		void m_launchDrawingThread( sf::RenderWindow& renderWindow );
diff --git a/kgEngine-2.0/TileMapGame/SingleplayerGameState.cpp b/kgEngine-2.0/TileMapGame/SingleplayerGameState.cpp
new file mode 100644
index 00000000..f5a5472e
--- /dev/null
+++ b/kgEngine-2.0/TileMapGame/SingleplayerGameState.cpp
@@ -0,0 +1,257 @@
+#include "SingleplayerGameState.h"
+using namespace std;
+using namespace sf;
+using namespace tgui;
+
+namespace kg
+{
+
+	std::shared_ptr<Entity> SingleplayerGameState::m_getValidCamera()
+	{
+		if( m_camera.expired() )
+			m_camera = r_graphicsSystem->getCamera( 0 );
+		return m_camera.lock();
+	}
+
+	void SingleplayerGameState::movePlayer( sf::Vector2i distance )
+	{
+		auto camera = m_getValidCamera();
+
+		camera->getComponent<Transformation>()->move( distance );
+	}
+
+	void SingleplayerGameState::m_onSavegameOpened( Engine& engine, World& world )
+	{
+		m_cameraZoomFactor = 1;
+	}
+
+	void SingleplayerGameState::onInit()
+	{
+		r_graphicsSystem = r_world->getSystem<GraphicsSystem>();
+
+		m_connectToSignal( r_saveManager->s_savegameOpened, &SingleplayerGameState::m_onSavegameOpened );
+
+		r_saveManager->openSavegame( *r_engine, *r_world, "MyFirstSavegameEver" );
+	}
+
+	void SingleplayerGameState::registerGui( tgui::Gui& gui )
+	{
+		return;
+	}
+
+	void SingleplayerGameState::registerInputCallbacks( InputManager& inputManager )
+	{
+		// Keys
+		Action shift( Keyboard::LShift, Action::Hold );
+		Action control( Keyboard::LControl, Action::Hold );
+
+		Action w( Keyboard::W, Action::Hold );
+		Action a( Keyboard::A, Action::Hold );
+		Action s( Keyboard::S, Action::Hold );
+		Action d( Keyboard::D, Action::Hold );
+
+		Action add( Keyboard::Add, Action::Hold );
+		Action subtract( Keyboard::Subtract, Action::Hold );
+
+		Action escapePress( Keyboard::Escape, Action::PressOnce );
+		Action f5Press( Keyboard::F5, Action::PressOnce );
+
+
+		// Events
+		Action eventClose( Event::Closed );
+
+
+		// Set the actions and register callbacks
+		inputManager.setAction( id::Input::RELOAD_SAVE, f5Press,
+								bind( &SingleplayerGameState::reloadSave, this ) );
+
+		inputManager.setAction( id::Input::MOVE_UP, w && !shift && !control,
+								bind( &SingleplayerGameState::moveUp, this ) );
+		inputManager.setAction( id::Input::MOVE_DOWN, s && !shift && !control,
+								bind( &SingleplayerGameState::moveDown, this ) );
+		inputManager.setAction( id::Input::MOVE_LEFT, a && !shift && !control,
+								bind( &SingleplayerGameState::moveLeft, this ) );
+		inputManager.setAction( id::Input::MOVE_RIGHT, d && !shift && !control,
+								bind( &SingleplayerGameState::moveRight, this ) );
+
+		inputManager.setAction( id::Input::MOVE_UP_FAST, w && shift && !control,
+								bind( &SingleplayerGameState::moveUpFast, this ) );
+		inputManager.setAction( id::Input::MOVE_DOWN_FAST, s && shift && !control,
+								bind( &SingleplayerGameState::moveDownFast, this ) );
+		inputManager.setAction( id::Input::MOVE_LEFT_FAST, a && shift && !control,
+								bind( &SingleplayerGameState::moveLeftFast, this ) );
+		inputManager.setAction( id::Input::MOVE_RIGHT_FAST, d && shift && !control,
+								bind( &SingleplayerGameState::moveRightFast, this ) );
+
+		inputManager.setAction( id::Input::MOVE_UP_SLOW, w && !shift && control,
+								bind( &SingleplayerGameState::moveUpSlow, this ) );
+		inputManager.setAction( id::Input::MOVE_DOWN_SLOW, s && !shift && control,
+								bind( &SingleplayerGameState::moveDownSlow, this ) );
+		inputManager.setAction( id::Input::MOVE_LEFT_SLOW, a && !shift && control,
+								bind( &SingleplayerGameState::moveLeftSlow, this ) );
+		inputManager.setAction( id::Input::MOVE_RIGHT_SLOW, d && !shift && control,
+								bind( &SingleplayerGameState::moveRightSlow, this ) );
+
+		inputManager.setAction( id::Input::ZOOM_IN, add,
+								bind( &SingleplayerGameState::zoomIn, this ) );
+		inputManager.setAction( id::Input::ZOOM_OUT, subtract,
+								bind( &SingleplayerGameState::zoomOut, this ) );
+	}
+
+	void SingleplayerGameState::onUpdate( GameStateManager& gameStateManager )
+	{
+		return;
+	}
+
+	void SingleplayerGameState::removeInputCallbacks( InputManager& inputManager )
+	{
+		inputManager.removeAction( id::Input::RELOAD_SAVE );
+
+		inputManager.removeAction( id::Input::MOVE_UP );
+		inputManager.removeAction( id::Input::MOVE_DOWN );
+		inputManager.removeAction( id::Input::MOVE_LEFT );
+		inputManager.removeAction( id::Input::MOVE_RIGHT );
+
+		inputManager.removeAction( id::Input::MOVE_UP_FAST );
+		inputManager.removeAction( id::Input::MOVE_DOWN_FAST );
+		inputManager.removeAction( id::Input::MOVE_LEFT_FAST );
+		inputManager.removeAction( id::Input::MOVE_RIGHT_FAST );
+
+		inputManager.removeAction( id::Input::MOVE_UP_SLOW );
+		inputManager.removeAction( id::Input::MOVE_DOWN_SLOW );
+		inputManager.removeAction( id::Input::MOVE_LEFT_SLOW );
+		inputManager.removeAction( id::Input::MOVE_RIGHT_SLOW );
+
+		inputManager.removeAction( id::Input::ZOOM_IN );
+		inputManager.removeAction( id::Input::ZOOM_OUT );
+	}
+
+	void SingleplayerGameState::removeGui( tgui::Gui& gui )
+	{
+		return;
+	}
+
+	void SingleplayerGameState::onDestroy()
+	{
+		return;
+	}
+
+
+	const Plugin::Name& SingleplayerGameState::getPluginName() const
+	{
+		return PLUGIN_NAME;
+	}
+
+	Plugin::Id SingleplayerGameState::getPluginId() const
+	{
+		return id::GameStatePluginId::SINGLEPLAYER;
+	}
+
+	void SingleplayerGameState::reloadSave()
+	{
+		r_world->getSystem<ChunkSystem>()->saveOpenSavegame( *r_engine, *r_world, *r_saveManager );
+		r_saveManager->openSavegame( *r_engine, *r_world, "MyFirstSavegameEver" );
+	}
+
+	void SingleplayerGameState::pause()
+	{
+		r_engine->isPaused = !r_engine->isPaused;
+	}
+
+	void SingleplayerGameState::moveUp()
+	{
+		sf::Vector2i cameraMovement( 0, -10.0 / 16.0 * frameTime.asMilliseconds() );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveDown()
+	{
+		sf::Vector2i cameraMovement( 0, 10.0 / 16.0 * frameTime.asMilliseconds() );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveLeft()
+	{
+		sf::Vector2i cameraMovement( -10.0 / 16.0 * frameTime.asMilliseconds(), 0 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveRight()
+	{
+		sf::Vector2i cameraMovement( 10.0 / 16.0 * frameTime.asMilliseconds(), 0 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveUpFast()
+	{
+		sf::Vector2i cameraMovement( 0, -10.0 / 16.0 * frameTime.asMilliseconds() * 4 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveDownFast()
+	{
+		sf::Vector2i cameraMovement( 0, 10.0 / 16.0 * frameTime.asMilliseconds() * 4 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveLeftFast()
+	{
+		sf::Vector2i cameraMovement( -10.0 / 16.0 * frameTime.asMilliseconds() * 4, 0 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveRightFast()
+	{
+		sf::Vector2i cameraMovement( 10.0 / 16.0 * frameTime.asMilliseconds() * 4, 0 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveUpSlow()
+	{
+		sf::Vector2i cameraMovement( 0, -10.0 / 16.0 * frameTime.asMilliseconds() / 2 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveDownSlow()
+	{
+		sf::Vector2i cameraMovement( 0, 10.0 / 16.0 * frameTime.asMilliseconds() / 2 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveLeftSlow()
+	{
+		sf::Vector2i cameraMovement( -10.0 / 16.0 * frameTime.asMilliseconds() / 2, 0 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::moveRightSlow()
+	{
+		sf::Vector2i cameraMovement( 10.0 / 16.0 * frameTime.asMilliseconds() / 2, 0 );
+		movePlayer( cameraMovement );
+	}
+
+	void SingleplayerGameState::zoomIn()
+	{
+		auto camera = m_getValidCamera();
+
+		m_cameraZoomFactor -= 0.01*frameTime.asMilliseconds();
+
+		if( m_cameraZoomFactor < 0 )
+			m_cameraZoomFactor = 0;
+		camera->getComponent<Camera>()->setZoomFactor( m_cameraZoomFactor );
+	}
+
+	void SingleplayerGameState::zoomOut()
+	{
+		auto camera = m_getValidCamera();
+
+		m_cameraZoomFactor += 0.01*frameTime.asMilliseconds();
+
+		if( m_cameraZoomFactor < 0 )
+			m_cameraZoomFactor = 0;
+		camera->getComponent<Camera>()->setZoomFactor( m_cameraZoomFactor );
+	}
+
+	const std::string SingleplayerGameState::PLUGIN_NAME = "Singleplayer GameState";
+
+}
diff --git a/kgEngine-2.0/TileMapGame/SingleplayerGameState.h b/kgEngine-2.0/TileMapGame/SingleplayerGameState.h
new file mode 100644
index 00000000..c9d87827
--- /dev/null
+++ b/kgEngine-2.0/TileMapGame/SingleplayerGameState.h
@@ -0,0 +1,67 @@
+#pragma once
+#include "stdafx.h"
+#include "ChunkSystem.h"
+#include "GraphicsSystem.h"
+
+namespace kg
+{
+	class SingleplayerGameState : public GameState
+	{
+		GraphicsSystem* r_graphicsSystem;
+
+		std::weak_ptr<Entity> m_camera;
+		float m_cameraZoomFactor = 1;
+		std::shared_ptr<Entity> m_getValidCamera();
+
+		void movePlayer( sf::Vector2i distance );
+
+		void m_onSavegameOpened( Engine& engine, World& world );
+
+	public:
+		virtual void onInit() override;
+
+		virtual void registerGui( tgui::Gui& gui ) override;
+
+		virtual void registerInputCallbacks( InputManager& inputManager ) override;
+
+		virtual void onUpdate( GameStateManager& gameStateManager ) override;
+
+		virtual void removeInputCallbacks( InputManager& inputManager ) override;
+
+		virtual void removeGui( tgui::Gui& gui ) override;
+
+		virtual void onDestroy() override;
+
+
+		virtual const Plugin::Name& getPluginName() const override;
+
+		virtual Plugin::Id getPluginId() const override;
+
+
+		static const std::string PLUGIN_NAME;
+
+
+		//Input Callbacks
+	private:
+		void reloadSave();
+
+		void pause();
+
+		void moveUp();
+		void moveDown();
+		void moveLeft();
+		void moveRight();
+		void moveUpFast();
+		void moveDownFast();
+		void moveLeftFast();
+		void moveRightFast();
+		void moveUpSlow();
+		void moveDownSlow();
+		void moveLeftSlow();
+		void moveRightSlow();
+
+		void zoomIn();
+		void zoomOut();
+
+	};
+}
diff --git a/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj b/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj
index 336af4ca..c2a8c604 100644
--- a/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj
+++ b/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj
@@ -91,11 +91,12 @@
     <ClCompile Include="AnimationSystem.cpp" />
     <ClCompile Include="ChunkGenerator.cpp" />
     <ClCompile Include="ChunkSystem.cpp" />
+    <ClCompile Include="DefaultGameState.cpp" />
     <ClCompile Include="GraphicsSystem.cpp" />
     <ClCompile Include="Camera.cpp" />
     <ClCompile Include="connect.cpp" />
-    <ClCompile Include="GameController.cpp" />
     <ClCompile Include="Graphics.cpp" />
+    <ClCompile Include="SingleplayerGameState.cpp" />
     <ClCompile Include="SpriteBatch.cpp" />
     <ClCompile Include="Transformation.cpp" />
   </ItemGroup>
@@ -105,11 +106,12 @@
     <ClInclude Include="ChunkGenerator.h" />
     <ClInclude Include="ChunkSystem.h" />
     <ClInclude Include="constants.h" />
+    <ClInclude Include="DefaultGameState.h" />
     <ClInclude Include="GraphicsSystem.h" />
+    <ClInclude Include="SingleplayerGameState.h" />
     <ClInclude Include="SpriteBatch.h" />
     <ClInclude Include="Transformation.h" />
     <ClInclude Include="Camera.h" />
-    <ClInclude Include="GameController.h" />
     <ClInclude Include="Graphics.h" />
     <ClInclude Include="id.h" />
     <ClInclude Include="stdafx.h" />
diff --git a/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj.filters b/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj.filters
index 1721ff2e..2686928d 100644
--- a/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj.filters
+++ b/kgEngine-2.0/TileMapGame/TileMapGame.vcxproj.filters
@@ -18,6 +18,9 @@
     <Filter Include="Headerdateien\Other">
       <UniqueIdentifier>{7e7edd7b-5036-41fa-b73e-4272ad3170f9}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Headerdateien\GameStates">
+      <UniqueIdentifier>{9de7af51-7d36-4f85-abf0-f97ad439180f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="connect.cpp">
@@ -29,9 +32,6 @@
     <ClCompile Include="Camera.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="GameController.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="ChunkSystem.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -53,6 +53,12 @@
     <ClCompile Include="AnimationComponent.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="DefaultGameState.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="SingleplayerGameState.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="id.h">
@@ -67,9 +73,6 @@
     <ClInclude Include="Camera.h">
       <Filter>Headerdateien\Components</Filter>
     </ClInclude>
-    <ClInclude Include="GameController.h">
-      <Filter>Headerdateien\Systems</Filter>
-    </ClInclude>
     <ClInclude Include="ChunkSystem.h">
       <Filter>Headerdateien\Systems</Filter>
     </ClInclude>
@@ -94,5 +97,11 @@
     <ClInclude Include="AnimationComponent.h">
       <Filter>Headerdateien\Components</Filter>
     </ClInclude>
+    <ClInclude Include="DefaultGameState.h">
+      <Filter>Headerdateien\GameStates</Filter>
+    </ClInclude>
+    <ClInclude Include="SingleplayerGameState.h">
+      <Filter>Headerdateien\GameStates</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/kgEngine-2.0/TileMapGame/connect.cpp b/kgEngine-2.0/TileMapGame/connect.cpp
index 6d20c702..7ff7268e 100644
--- a/kgEngine-2.0/TileMapGame/connect.cpp
+++ b/kgEngine-2.0/TileMapGame/connect.cpp
@@ -4,10 +4,11 @@
 #include "Transformation.h"
 #include "AnimationComponent.h"
 
-#include "GameController.h"
 #include "ChunkSystem.h"
 #include "GraphicsSystem.h"
 
+#include "DefaultGameState.h"
+
 using namespace std;
 using namespace kg;
 
@@ -39,10 +40,6 @@ extern "C"
 		//Camera not registered as a plugin. A camera entity is created in the GraphicsSystem
 
 		//Systems
-		pluginManager.addPluginFactory(
-			std::make_shared<PluginFactory<System, GameController>>(
-				( int )id::SystemPluginId::GAME_CONTROLLER,
-				GameController::PLUGIN_NAME ) );
 		pluginManager.addPluginFactory(
 			std::make_shared<PluginFactory<System, ChunkSystem>>(
 				( int )id::SystemPluginId::CHUNK_SYSTEM,
@@ -60,7 +57,13 @@ extern "C"
 				( int )id::SystemPluginId::ANIMATION_SYSTEM,
 				AnimationSystem::PLUGIN_NAME ) );
 
+		//GameStates
+		pluginManager.addPluginFactory(
+			std::make_shared<PluginFactory<GameState, DefaultGameState>>(
+				( int )id::DEFAULT_GAMESTATE_ID,
+				DefaultGameState::PLUGIN_NAME ) );
 
+		//AnimationHandlers
 		pluginManager.addPluginFactory(
 			std::make_shared<PluginFactory<AnimationHandler, EasyAnimationHandler>>(
 				( int )id::SpecialPluginId::ANIMATION_HANDLER_EASY,
diff --git a/kgEngine-2.0/TileMapGame/id.h b/kgEngine-2.0/TileMapGame/id.h
index 84c97461..ce9e1396 100644
--- a/kgEngine-2.0/TileMapGame/id.h
+++ b/kgEngine-2.0/TileMapGame/id.h
@@ -14,7 +14,6 @@ namespace kg
 				CHUNK_SYSTEM,
 				CHUNK_GENERATOR,
 				GRAPHICS_SYSTEM,
-				GAME_CONTROLLER,
 
 				LAST_ELEMENT
 			};
@@ -36,12 +35,25 @@ namespace kg
 			};
 		}
 
-		namespace SpecialPluginId
+		namespace GameStatePluginId
 		{
 			enum
 			{
 				FIRST_ELEMENT = ComponentPluginId::LAST_ELEMENT,
 
+				//Default is 0 (defined in 'id_internal.h')
+				SINGLEPLAYER,
+
+				LAST_ELEMENT
+			};
+		}
+
+		namespace SpecialPluginId
+		{
+			enum
+			{
+				FIRST_ELEMENT = GameStatePluginId::LAST_ELEMENT,
+
 				ANIMATION_HANDLER_EASY,
 
 				LAST_ELEMENT
@@ -60,7 +72,6 @@ namespace kg
 				CHUNK_GENERATOR,
 				CHUNK_SYSTEM,
 				GRAPHICS_SYSTEM,
-				GAME_CONTROLLER,
 
 				LAST_ELEMENT
 			};
@@ -88,9 +99,11 @@ namespace kg
 			{
 				FIRST_ELEMENT,
 
+				//DefaultGameState
 				SHUT_DOWN,
-				RELOAD_SAVE,
 
+				//SingleplayerGameState
+				RELOAD_SAVE,
 				MOVE_UP,
 				MOVE_DOWN,
 				MOVE_LEFT,
@@ -103,7 +116,6 @@ namespace kg
 				MOVE_DOWN_SLOW,
 				MOVE_LEFT_SLOW,
 				MOVE_RIGHT_SLOW,
-
 				ZOOM_IN,
 				ZOOM_OUT,
 
diff --git a/kgEngine-2.0/kgEngine-2.0/Config/ChunkSystem.ini b/kgEngine-2.0/kgEngine-2.0/Config/ChunkSystem.ini
index 9f3ee364..f9c0df5c 100644
--- a/kgEngine-2.0/kgEngine-2.0/Config/ChunkSystem.ini
+++ b/kgEngine-2.0/kgEngine-2.0/Config/ChunkSystem.ini
@@ -1,2 +1,2 @@
 iChunkLoadCountPerFrame: 1
-iChunkLoadRadiusAroundCamera: 10
+iChunkLoadRadiusAroundCamera: 3
diff --git a/kgEngine-2.0/kgEngine-2.0/Config/GameControllerSystem.ini b/kgEngine-2.0/kgEngine-2.0/Config/GameControllerSystem.ini
deleted file mode 100644
index e69de29b..00000000
diff --git a/kgEngine-2.0/kgEngine-2.0/Core.cpp b/kgEngine-2.0/kgEngine-2.0/Core.cpp
index 6cbe6fca..9c8de4f4 100644
--- a/kgEngine-2.0/kgEngine-2.0/Core.cpp
+++ b/kgEngine-2.0/kgEngine-2.0/Core.cpp
@@ -7,6 +7,11 @@ using namespace sys;
 
 namespace kg
 {
+
+	Core::Core()
+		:m_gameStateManager( m_engine, m_world, m_saveManager )
+	{ }
+
 	void Core::init()
 	{
 		loadPackages();
@@ -17,6 +22,7 @@ namespace kg
 
 		//init systems
 		m_world.initSystemsByImportance( m_engine, m_world, m_saveManager );
+		m_gameStateManager.init();
 	}
 
 	bool Core::shouldTerminate() const
@@ -34,6 +40,7 @@ namespace kg
 		}
 		if( m_engine.isPaused )
 			frameTime = sf::seconds( 0 );
+		m_gameStateManager.forwardFrameTime( frameTime );
 
 		Event event;
 		m_engine.inputManager.clearEvents();
@@ -43,9 +50,10 @@ namespace kg
 			m_engine.inputManager.forwardSfmlEvent( event );
 		}
 
-		if( !m_engine.isPaused )//if engine is not paused, update entities
+		if( !m_engine.isPaused )//if game is not paused, update entities
 			m_world.updateEntities( m_engine, m_world, frameTime );
 		m_world.updateAllSystemsByImportance( m_engine, m_world, m_saveManager, frameTime );
+		m_gameStateManager.onUpdate();
 		m_engine.inputManager.triggerCallbacks( m_engine.renderWindow );
 		m_world.removeEntitiesOnRemoveList();
 	}
diff --git a/kgEngine-2.0/kgEngine-2.0/Core.h b/kgEngine-2.0/kgEngine-2.0/Core.h
index 10a092d8..c642ae83 100644
--- a/kgEngine-2.0/kgEngine-2.0/Core.h
+++ b/kgEngine-2.0/kgEngine-2.0/Core.h
@@ -3,6 +3,7 @@
 #include "World.h"
 #include "Engine.h"
 #include "SaveManager.h"
+#include "GameStateManager.h"
 
 namespace kg
 {
@@ -15,12 +16,15 @@ namespace kg
 		Engine m_engine;
 		SaveManager m_saveManager;
 		World m_world;
+		GameStateManager m_gameStateManager;
 
 		sf::Clock m_frameTimeClock;
 
 		void loadPackages();
 
 	public:
+		Core();
+
 		void init();
 
 		void update();
diff --git a/kgEngine-2.0/kgEngine-2.0/GameState.cpp b/kgEngine-2.0/kgEngine-2.0/GameState.cpp
new file mode 100644
index 00000000..207d091d
--- /dev/null
+++ b/kgEngine-2.0/kgEngine-2.0/GameState.cpp
@@ -0,0 +1,20 @@
+#include "GameState.h"
+using namespace std;
+using namespace sf;
+
+namespace kg
+{
+	
+	void GameState::initReferences( Engine& engine, World& world, SaveManager& saveManager )
+	{
+		r_engine = &engine;
+		r_world = &world;
+		r_saveManager = &saveManager;
+	}
+
+	void GameState::updateFrameTime( const sf::Time& frameTime )
+	{
+		this->frameTime = frameTime;
+	}
+
+}
diff --git a/kgEngine-2.0/kgEngine-2.0/GameState.h b/kgEngine-2.0/kgEngine-2.0/GameState.h
new file mode 100644
index 00000000..1bdb6d3a
--- /dev/null
+++ b/kgEngine-2.0/kgEngine-2.0/GameState.h
@@ -0,0 +1,37 @@
+#pragma once
+#include "stdafx.h"
+#include "Plugin.h"
+#include "Engine.h"
+#include "World.h"
+#include "SaveManager.h"
+
+namespace kg
+{
+	class GameStateManager;
+	using Action = thor::Action;
+
+	class DLL_EXPORT GameState : public Plugin, public CallbackReciever, public sf::NonCopyable
+	{
+	protected:
+		Engine* r_engine;
+		World* r_world;
+		SaveManager* r_saveManager;
+
+		sf::Time frameTime;
+
+	public:
+
+		void initReferences( Engine& engine, World& world, SaveManager& saveManager );
+		void updateFrameTime( const sf::Time& frameTime );
+
+		virtual void onInit() = 0;
+		virtual void registerGui( tgui::Gui& gui ) = 0;
+		virtual void registerInputCallbacks( InputManager& inputManager ) = 0;
+
+		virtual void onUpdate( GameStateManager& gameStateManager ) = 0;
+
+		virtual void removeInputCallbacks( InputManager& inputManager ) = 0;
+		virtual void removeGui( tgui::Gui& gui ) = 0;
+		virtual void onDestroy() = 0;
+	};
+}
diff --git a/kgEngine-2.0/kgEngine-2.0/GameStateManager.cpp b/kgEngine-2.0/kgEngine-2.0/GameStateManager.cpp
new file mode 100644
index 00000000..1f75206b
--- /dev/null
+++ b/kgEngine-2.0/kgEngine-2.0/GameStateManager.cpp
@@ -0,0 +1,68 @@
+#include "GameStateManager.h"
+using namespace std;
+using namespace sf;
+
+namespace kg
+{
+	
+	GameStateManager::GameStateManager( Engine& engine, World& world, SaveManager& saveManager )
+		: engine(engine),
+		world(world),
+		saveManager(saveManager)
+	{
+
+	}
+
+	void GameStateManager::init()
+	{
+		auto defaultGameState = engine.pluginManager.createPlugin<GameState>( id::DEFAULT_GAMESTATE_ID );
+
+		push( defaultGameState );
+	}
+
+	void GameStateManager::forwardFrameTime( const sf::Time& frameTime )
+	{
+		for( auto& el : m_gameStateStack )
+			el->updateFrameTime( frameTime );
+	}
+
+	void GameStateManager::push( const std::shared_ptr<GameState>& gameState )
+	{
+		gameState->initReferences( engine, world, saveManager );
+
+		gameState->onInit();
+		gameState->registerGui( engine.inputManager.gui );
+		gameState->registerInputCallbacks( engine.inputManager );
+
+		m_gameStateStack.push_back( gameState );
+	}
+
+	void GameStateManager::pop()
+	{
+		auto& gameState = m_gameStateStack.back();
+
+		gameState->removeInputCallbacks( engine.inputManager );
+		gameState->removeGui( engine.inputManager.gui );
+		gameState->onDestroy();
+
+		m_gameStateStack.pop_back();
+	}
+
+	const std::shared_ptr<GameState>& GameStateManager::top() const
+	{
+		return m_gameStateStack.back();
+	}
+
+	void GameStateManager::onUpdate()
+	{
+		vector<weak_ptr<GameState>> temp;
+		for( auto& el : m_gameStateStack )
+			temp.push_back( el );
+
+		for( auto& ptr : temp )
+		{
+			if(auto sptr = ptr.lock())
+				sptr->onUpdate( *this );
+		}
+	}
+}
diff --git a/kgEngine-2.0/kgEngine-2.0/GameStateManager.h b/kgEngine-2.0/kgEngine-2.0/GameStateManager.h
new file mode 100644
index 00000000..7e7caffc
--- /dev/null
+++ b/kgEngine-2.0/kgEngine-2.0/GameStateManager.h
@@ -0,0 +1,29 @@
+#pragma once
+#include "GameState.h"
+
+namespace kg
+{
+	class DLL_EXPORT GameStateManager
+	{
+		Engine& engine;
+		World& world;
+		SaveManager& saveManager;
+
+		std::vector<std::shared_ptr<GameState>> m_gameStateStack;
+
+	public:
+		GameStateManager( Engine& engine, World& world, SaveManager& saveManager );
+
+		void init();
+
+		void forwardFrameTime( const sf::Time& frameTime );
+
+		void push( const std::shared_ptr<GameState>& gameState );
+
+		void pop();
+
+		const std::shared_ptr<GameState>& top()const;
+
+		void onUpdate();
+	};
+}
diff --git a/kgEngine-2.0/kgEngine-2.0/InputManager.cpp b/kgEngine-2.0/kgEngine-2.0/InputManager.cpp
index 7564a157..08b0b950 100644
--- a/kgEngine-2.0/kgEngine-2.0/InputManager.cpp
+++ b/kgEngine-2.0/kgEngine-2.0/InputManager.cpp
@@ -1,7 +1,6 @@
 #include "InputManager.h"
 using namespace std;
 using namespace sf;
-using namespace thor;
 
 namespace kg
 {
@@ -12,6 +11,8 @@ namespace kg
 
 	void InputManager::removeAction( const int& actionId )
 	{
+		for( auto& el : m_connectionsByActionId[actionId] )
+			el.disconnect();
 		m_actionMap.removeAction( actionId );
 	}
 
diff --git a/kgEngine-2.0/kgEngine-2.0/InputManager.h b/kgEngine-2.0/kgEngine-2.0/InputManager.h
index 35a42438..204985e5 100644
--- a/kgEngine-2.0/kgEngine-2.0/InputManager.h
+++ b/kgEngine-2.0/kgEngine-2.0/InputManager.h
@@ -8,6 +8,7 @@ namespace kg
 
 		thor::ActionMap<int> m_actionMap;
 		thor::ActionMap<int>::CallbackSystem m_callbackSystem;
+		std::map<int, std::vector<thor::Connection>> m_connectionsByActionId;//saved for disconnecting later
 
 	public:
 		// Has to be initialized manually in GraphicsSystem.
@@ -40,7 +41,8 @@ namespace kg
 	template<class T>
 	void kg::InputManager::connect( const int& actionId, const T& callback )
 	{
-		m_callbackSystem.connect( actionId, callback );
+		auto connection = m_callbackSystem.connect( actionId, callback );
+		m_connectionsByActionId[actionId].push_back( connection );
 	}
 
 }
diff --git a/kgEngine-2.0/kgEngine-2.0/PluginManager.h b/kgEngine-2.0/kgEngine-2.0/PluginManager.h
index 01dc0339..c8f74d4a 100644
--- a/kgEngine-2.0/kgEngine-2.0/PluginManager.h
+++ b/kgEngine-2.0/kgEngine-2.0/PluginManager.h
@@ -89,24 +89,27 @@ namespace kg
 		template<class BasePluginType>
 		std::shared_ptr<BasePluginType> createPlugin( const Plugin::Id& id )const
 		{
-			size_t genericPluginType = typeid(genericPluginType).hash_code();
+			size_t genericPluginType = typeid(BasePluginType).hash_code();
+#ifndef _DEBUG
 			try
 			{
-				auto& plugin = m_pluginsByGenericTypeHash.at( genericPluginType ).first.at( id );
+#endif
+				auto plugin = static_pointer_cast< PluginFactoryInterface<BasePluginType> >(m_pluginsByGenericTypeHash.at( genericPluginType ).first.at( id ));
 				if( plugin == nullptr )
 					throw PluginRequestException( id );
 
 				return std::static_pointer_cast< BasePluginType >(plugin->create());
+#ifndef _DEBUG
 			}
 			catch( const std::exception& )
 			{
 				throw PluginRequestException( id );
 			}
+#endif
 		}
 		template<>
 		std::shared_ptr<Component> createPlugin<Component>( const Plugin::Id& id )const
 		{
-			size_t genericPluginType = typeid(genericPluginType).hash_code();
 			try
 			{
 				auto& plugin = m_componentPluginFactorysById.at( id );
@@ -123,7 +126,6 @@ namespace kg
 		template<>
 		std::shared_ptr<System> createPlugin<System>( const Plugin::Id& id )const
 		{
-			size_t genericPluginType = typeid(genericPluginType).hash_code();
 			try
 			{
 				auto& plugin = m_systemPluginFactorysById.at( id );
@@ -141,14 +143,14 @@ namespace kg
 		template<class BasePluginType>
 		std::shared_ptr<BasePluginType> createPlugin( const Plugin::Name& name )const
 		{
-			size_t genericPluginType = typeid(genericPluginType).hash_code();
+			size_t genericPluginType = typeid(BasePluginType).hash_code();
 			try
 			{
-				auto& plugin = m_pluginsByGenericTypeHash.at( genericPluginType ).second.at( name );
+				auto plugin = static_pointer_cast< PluginFactoryInterface<BasePluginType> >(m_pluginsByGenericTypeHash.at( genericPluginType ).second.at( name ));
 				if( plugin == nullptr )
 					throw PluginRequestException( name );
 
-				return plugin->create();
+				return std::static_pointer_cast< BasePluginType >(plugin->create());
 			}
 			catch( const std::exception& )
 			{
@@ -158,7 +160,6 @@ namespace kg
 		template<>
 		std::shared_ptr<Component> createPlugin<Component>( const Plugin::Name& name )const
 		{
-			size_t genericPluginType = typeid(genericPluginType).hash_code();
 			try
 			{
 				auto& plugin = m_componentPluginFactorysByName.at( name );
@@ -175,7 +176,6 @@ namespace kg
 		template<>
 		std::shared_ptr<System> createPlugin<System>( const Plugin::Name& name )const
 		{
-			size_t genericPluginType = typeid(genericPluginType).hash_code();
 			try
 			{
 				auto& plugin = m_systemPluginFactorysByName.at( name );
@@ -200,7 +200,7 @@ namespace kg
 			auto type_hash = typeid(BasePluginType).hash_code();
 
 			for( const auto& el : m_pluginsByGenericTypeHash[type_hash].first )
-				retVal.push_back( static_pointer_cast<PluginFactoryInterface<BasePluginType>>(el.second) );
+				retVal.push_back( static_pointer_cast< PluginFactoryInterface<BasePluginType> >(el.second) );
 
 			return retVal;
 		};
diff --git a/kgEngine-2.0/kgEngine-2.0/SaveManager.cpp b/kgEngine-2.0/kgEngine-2.0/SaveManager.cpp
index eef6c93b..bbc76104 100644
--- a/kgEngine-2.0/kgEngine-2.0/SaveManager.cpp
+++ b/kgEngine-2.0/kgEngine-2.0/SaveManager.cpp
@@ -56,7 +56,7 @@ namespace kg
 		}
 		globalsFile.close();
 
-		s_savegameOpened( engine );//inform registered systems (even if no save information has been loaded for them!)
+		s_savegameOpened( engine, world );//inform registered systems (even if no save information has been loaded for them!)
 
 		return;
 	}
diff --git a/kgEngine-2.0/kgEngine-2.0/SaveManager.h b/kgEngine-2.0/kgEngine-2.0/SaveManager.h
index 48d9fc11..16bd3afe 100644
--- a/kgEngine-2.0/kgEngine-2.0/SaveManager.h
+++ b/kgEngine-2.0/kgEngine-2.0/SaveManager.h
@@ -10,7 +10,7 @@ namespace kg
 {
 	class DLL_EXPORT SaveManager
 	{
-		std::string m_openSavegameName = "ErrorSavegame";
+		std::string m_openSavegameName = "dev_null";
 
 	public:
 		using SystemSaveInformationMap = std::map < int, SystemSaveInformation > ;
@@ -36,7 +36,7 @@ namespace kg
 		void saveSystems( World& world );
 
 	signals:
-		Signal<Engine&> s_savegameOpened;
+		Signal<Engine&, World&> s_savegameOpened;
 		Signal<> s_savegameClosed;
 		std::map< Plugin::Id, ReturningSignal< std::vector<std::string> > > s_writeSaveInformation;//first: systemId, second: signal
 		std::map< Plugin::Id, Signal<const std::vector<std::string>&> > s_loadSaveInformation;//first: systemId, second: signal
diff --git a/kgEngine-2.0/kgEngine-2.0/id_internal.h b/kgEngine-2.0/kgEngine-2.0/id_internal.h
index c3f441a0..725898e0 100644
--- a/kgEngine-2.0/kgEngine-2.0/id_internal.h
+++ b/kgEngine-2.0/kgEngine-2.0/id_internal.h
@@ -10,5 +10,8 @@ namespace kg
 
 		//UpdateImportance
 		const double SAVE_UPDATE_IMPORTANCE = -1;
+
+		//Default GameState
+		const int DEFAULT_GAMESTATE_ID = 0;
 	}
 }
\ No newline at end of file
diff --git a/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj b/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj
index 1f982cf7..db9425ce 100644
--- a/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj
+++ b/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj
@@ -90,6 +90,8 @@
     <ClCompile Include="Entity.cpp" />
     <ClCompile Include="EntityFactory.cpp" />
     <ClCompile Include="EntityManager.cpp" />
+    <ClCompile Include="GameState.cpp" />
+    <ClCompile Include="GameStateManager.cpp" />
     <ClCompile Include="InputManager.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="PluginManager.cpp" />
@@ -116,6 +118,8 @@
     <ClInclude Include="EntityFactory.h" />
     <ClInclude Include="EntityManager.h" />
     <ClInclude Include="EntityThatHasComponentContainer.h" />
+    <ClInclude Include="GameState.h" />
+    <ClInclude Include="GameStateManager.h" />
     <ClInclude Include="id_internal.h" />
     <ClInclude Include="InputManager.h" />
     <ClInclude Include="PathNotAvailableException.h" />
diff --git a/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj.filters b/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj.filters
index 53b59e7e..eec2cb2f 100644
--- a/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj.filters
+++ b/kgEngine-2.0/kgEngine-2.0/kgEngine-2.0.vcxproj.filters
@@ -77,6 +77,12 @@
     <ClCompile Include="InputManager.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="GameState.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="GameStateManager.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -178,5 +184,11 @@
     <ClInclude Include="InputManager.h">
       <Filter>Headerdateien\Engine</Filter>
     </ClInclude>
+    <ClInclude Include="GameState.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="GameStateManager.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/temp_todo.txt b/temp_todo.txt
deleted file mode 100644
index a799a283..00000000
--- a/temp_todo.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-XXX System::CreateSaveInformation
-XXX Entity::CreateSaveInformation
-XXX System::LoadFromSaveInfotmation
-XXX Entity::LoadFromSaveInformation
-XXX --- GESTRICHEN --- Save/Load AdditionalComponentValues
-XXX Finish SaveSystem
-XXX integrate Saving to existing Systems/Components
-replace int with Id where possible
\ No newline at end of file