diff --git a/Win32/Unuk/LibUnuk/LibUnuk.vcproj b/Win32/Unuk/LibUnuk/LibUnuk.vcproj
index 197f76f..f4944ab 100644
--- a/Win32/Unuk/LibUnuk/LibUnuk.vcproj
+++ b/Win32/Unuk/LibUnuk/LibUnuk.vcproj
@@ -148,18 +148,6 @@
 		<Filter
 			Name="Engine"
 			>
-			<File
-				RelativePath="..\..\..\src\libUnuk\Engine\AStar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libUnuk\Engine\AStar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libUnuk\Engine\AStarBase.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\libUnuk\Engine\Character.cpp"
 				>
@@ -204,6 +192,10 @@
 				RelativePath="..\..\..\src\libUnuk\Engine\ParticleEmitter.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\libUnuk\Engine\Pathfinding.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\libUnuk\Engine\WorldManager.cpp"
 				>
@@ -392,6 +384,14 @@
 				RelativePath="..\..\..\src\libUnuk\Ui\MainMenu.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\libUnuk\UI\SavegameMenu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\libUnuk\UI\SavegameMenu.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\libUnuk\Ui\Text.cpp"
 				>
diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp
index 958bfc6..a2129d5 100644
--- a/src/Unuk/Game.cpp
+++ b/src/Unuk/Game.cpp
@@ -254,6 +254,9 @@ void Game::Render(void) {
 void Game::NewSavegame(const string savegameIDArg) {
   string saveFilename = "../Save/" + savegameIDArg;
 
+  _map.New();
+  _map.Save(_saveGameID);
+
 	TiXmlDocument doc;
 
 	TiXmlDeclaration* decl = new TiXmlDeclaration("1.0", "", "");
@@ -266,7 +269,7 @@ void Game::NewSavegame(const string savegameIDArg) {
   
   int spawnX;
   int spawnY;
-  _map.FindSpawnPoint(spawnX, spawnY, _player->GetWidth(), _player->GetHeight());
+  _map.FindSpawnPoint(spawnX, spawnY, 40, 45);
   
   _player->SetXY(spawnX, spawnY);
   
@@ -316,12 +319,6 @@ void Game::NewSavegame(const string savegameIDArg) {
 	doc.LinkEndChild(saveElement);
 
 	doc.SaveFile(saveFilename.c_str());
-  
-  stringstream mapPath;
-  mapPath << "Data/Media/Maps/" << _saveGameID;
-  
-  _map.New();
-  _map.Save(_saveGameID);
 }
 
 void Game::LoadSavegame(const string savegameIDArg) {
diff --git a/src/libUnuk/LevelGen/LevelGen.cpp b/src/libUnuk/LevelGen/LevelGen.cpp
index b5c2f10..8e5afa2 100644
--- a/src/libUnuk/LevelGen/LevelGen.cpp
+++ b/src/libUnuk/LevelGen/LevelGen.cpp
@@ -163,7 +163,7 @@ void LevelGen::Save(const string& filename){
       TiXmlElement* tileElem = new TiXmlElement("tile");
       
       TiXmlElement* tileTextureElem = new TiXmlElement("tileTexture");
-      TiXmlText* tileTextureText = new TiXmlText(_tile[x][y].GetTileTextureName());
+      TiXmlText* tileTextureText = new TiXmlText(_tile[x][y].GetTileTextureName().c_str());
       tileTextureElem->LinkEndChild(tileTextureText);
       
       TiXmlElement* solidTileElem = new TiXmlElement("solidTile");
@@ -173,7 +173,7 @@ void LevelGen::Save(const string& filename){
       string entityTextureName = _tile[x][y].GetEntityTextureName();
       
       TiXmlElement* entityTextureElem = new TiXmlElement("entityTexture");
-      TiXmlText* entityTextureText = new TiXmlText(entityTextureName.empty() ? "null" : entityTextureName);
+      TiXmlText* entityTextureText = new TiXmlText(entityTextureName.empty() ? "null" : entityTextureName.c_str());
       entityTextureElem->LinkEndChild(entityTextureText);
       
       TiXmlElement* solidEntityElem = new TiXmlElement("solidEntity");
@@ -184,7 +184,7 @@ void LevelGen::Save(const string& filename){
       zLevelStr << _tile[x][y].GetZLevel();
       
       TiXmlElement* zLevelElem = new TiXmlElement("zLevel");
-      TiXmlText* zLevelText = new TiXmlText(zLevelStr.str());
+      TiXmlText* zLevelText = new TiXmlText(zLevelStr.str().c_str());
       zLevelElem->LinkEndChild(zLevelText);
       
       tileElem->LinkEndChild(tileTextureElem);
@@ -203,7 +203,7 @@ void LevelGen::Save(const string& filename){
 	string fullMapPath = "../Data/Media/Maps/" + filename;
   
   doc.LinkEndChild(rootElem);
-  doc.SaveFile(fullMapPath);
+  doc.SaveFile(fullMapPath.c_str());
 }
 
 void LevelGen::Update(void) {
@@ -344,34 +344,33 @@ void LevelGen::FindSpawnPoint(int& xArg, int& yArg, int objWidth, int objHeight)
     npcRect.w = npc->GetWidth();
     npcRect.h = npc->GetHeight();
     
-    if(CheckCollisionRect(npcRect, objRect))
-      goto findNext;
+    if(CheckCollisionRect(npcRect, objRect)) {
+      FindSpawnPoint(xArg, yArg, objWidth, objHeight);
+      return;
+    }
   }
   
-  for(int x = 0; x < BOUNDARIES_X; x++) {
-    for(int y = 0; y < BOUNDARIES_Y; y++) {
-      if(_tile[x][y].GetTileSolidity()) {
-        goto findNext; 
+  for(int i = 0; i < BOUNDARIES_X; i++) {
+    for(int j = 0; j < BOUNDARIES_Y; j++) {
+      if(_tile[i][j].GetTileSolidity()) {
+        FindSpawnPoint(xArg, yArg, objWidth, objHeight);
+        return;
       }
       
-      if(_tile[x][y].GetEntitySolitity()) {
+      if(_tile[i][j].GetEntitySolitity()) {
         SDL_Rect entityRect;
-        entityRect.x = _tile[x][y].GetEntityX();
-        entityRect.y = _tile[x][y].GetEntityY();
-        entityRect.w = _tile[x][y].GetEntityWidth();
-        entityRect.h = _tile[x][y].GetEntityHeight(); 
+        entityRect.x = _tile[i][j].GetEntityX();
+        entityRect.y = _tile[i][j].GetEntityY();
+        entityRect.w = _tile[i][j].GetEntityWidth();
+        entityRect.h = _tile[i][j].GetEntityHeight(); 
         
         if(CheckCollisionRect(entityRect, objRect)) {
-          goto findNext;
+          FindSpawnPoint(xArg, yArg, objWidth, objHeight);
+          return;
         }
       }
     }
   }
-  
-  return;
-
-findNext:
-	FindSpawnPoint(xArg, yArg, objWidth, objHeight);
 }
 
 void LevelGen::GenerateEnemies(void) {