diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index bc2faab..b5993f2 100644
--- a/Unuk-QT/Makefile
+++ b/Unuk-QT/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: Unuk-QT
-# Generated by qmake (2.01a) (Qt 4.7.3) on: Sat Jan 14 03:32:22 2012
+# Generated by qmake (2.01a) (Qt 4.7.3) on: Sat Jan 14 13:52:16 2012
 # Project:  Unuk-QT.pro
 # Template: app
 # Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
@@ -72,7 +72,9 @@ SOURCES       = ../src/libUnuk/Engine/WorldManager.cpp \
 		../src/Unuk/Player.cpp \
 		../src/Unuk/main.cpp \
 		../src/Unuk/Globals.cpp \
-		../src/Unuk/Game.cpp 
+		../src/Unuk/Game.cpp \
+		../src/libUnuk/LevelGen/LevelGen.cpp \
+		../src/libUnuk/LevelGen/Level.cpp 
 OBJECTS       = WorldManager.o \
 		ParticleEmitter.o \
 		NPC.o \
@@ -102,7 +104,9 @@ OBJECTS       = WorldManager.o \
 		Player.o \
 		main.o \
 		Globals.o \
-		Game.o
+		Game.o \
+		LevelGen.o \
+		Level.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -202,7 +206,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/ParticleEmitter.h ../src/libUnuk/Engine/NPC.h ../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemClass.h ../src/libUnuk/Engine/Collision.h ../src/libUnuk/Engine/Character.h ../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStar.h ../src/libUnuk/Map/MapTile.h ../src/libUnuk/Map/MapEntities.h ../src/libUnuk/Map/MapElement.h ../src/libUnuk/Map/Map.h ../src/libUnuk/Sprite/TextureManager.h ../src/libUnuk/Sprite/Texture.h ../src/libUnuk/Sprite/ImageLoader.h ../src/libUnuk/Sprite/ApplySurface.h ../src/libUnuk/System/Rect.h ../src/libUnuk/System/Input.h ../src/libUnuk/System/FPS.h ../src/libUnuk/System/Debug.h ../src/libUnuk/System/Timer.h ../src/libUnuk/UI/MainMenu.h ../src/libUnuk/UI/IngameMenu.h ../src/libUnuk/UI/Font.h ../src/libUnuk/UI/ButtonToggle.h ../src/libUnuk/UI/ButtonGroup.h ../src/libUnuk/UI/Button.h ../src/libUnuk/UI/Text.h ../src/Unuk/Globals.h ../src/Unuk/Game.h ../src/Unuk/Constants.h ../src/Unuk/Player.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Map/MapEntities.cpp ../src/libUnuk/Map/MapElement.cpp ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/Debug.cpp ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/Button.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Globals.cpp ../src/Unuk/Game.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Engine/WorldManager.h ../src/libUnuk/Engine/ParticleEmitter.h ../src/libUnuk/Engine/NPC.h ../src/libUnuk/Engine/MemManager.h ../src/libUnuk/Engine/MemClass.h ../src/libUnuk/Engine/Collision.h ../src/libUnuk/Engine/Character.h ../src/libUnuk/Engine/AStarBase.h ../src/libUnuk/Engine/AStar.h ../src/libUnuk/Map/MapTile.h ../src/libUnuk/Map/MapEntities.h ../src/libUnuk/Map/MapElement.h ../src/libUnuk/Map/Map.h ../src/libUnuk/Sprite/TextureManager.h ../src/libUnuk/Sprite/Texture.h ../src/libUnuk/Sprite/ImageLoader.h ../src/libUnuk/Sprite/ApplySurface.h ../src/libUnuk/System/Rect.h ../src/libUnuk/System/Input.h ../src/libUnuk/System/FPS.h ../src/libUnuk/System/Debug.h ../src/libUnuk/System/Timer.h ../src/libUnuk/UI/MainMenu.h ../src/libUnuk/UI/IngameMenu.h ../src/libUnuk/UI/Font.h ../src/libUnuk/UI/ButtonToggle.h ../src/libUnuk/UI/ButtonGroup.h ../src/libUnuk/UI/Button.h ../src/libUnuk/UI/Text.h ../src/Unuk/Globals.h ../src/Unuk/Game.h ../src/Unuk/Constants.h ../src/Unuk/Player.h ../src/libUnuk/LevelGen/LevelGen.h ../src/libUnuk/LevelGen/Level.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/ParticleEmitter.cpp ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/MemManager.cpp ../src/libUnuk/Engine/Collision.cpp ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Map/MapEntities.cpp ../src/libUnuk/Map/MapElement.cpp ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Sprite/TextureManager.cpp ../src/libUnuk/Sprite/Texture.cpp ../src/libUnuk/Sprite/ImageLoader.cpp ../src/libUnuk/Sprite/ApplySurface.cpp ../src/libUnuk/System/Timer.cpp ../src/libUnuk/System/Rect.cpp ../src/libUnuk/System/Input.cpp ../src/libUnuk/System/FPS.cpp ../src/libUnuk/System/Debug.cpp ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/Button.cpp ../src/Unuk/Player.cpp ../src/Unuk/main.cpp ../src/Unuk/Globals.cpp ../src/Unuk/Game.cpp ../src/libUnuk/LevelGen/LevelGen.cpp ../src/libUnuk/LevelGen/Level.cpp .tmp/Unuk-QT1.0.0/ && (cd `dirname .tmp/Unuk-QT1.0.0` && $(TAR) Unuk-QT1.0.0.tar Unuk-QT1.0.0 && $(COMPRESS) Unuk-QT1.0.0.tar) && $(MOVE) `dirname .tmp/Unuk-QT1.0.0`/Unuk-QT1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Unuk-QT1.0.0
 
 
 clean:compiler_clean 
@@ -261,6 +265,8 @@ WorldManager.o: ../src/libUnuk/Engine/WorldManager.cpp ../src/libUnuk/Engine/Wor
 		../src/libUnuk/Sprite/TextureManager.h \
 		../src/libUnuk/Map/MapEntities.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o WorldManager.o ../src/libUnuk/Engine/WorldManager.cpp
@@ -289,6 +295,8 @@ NPC.o: ../src/libUnuk/Engine/NPC.cpp ../src/libUnuk/Engine/NPC.h \
 		../src/libUnuk/Map/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/Engine/NPC.cpp
@@ -315,7 +323,9 @@ Character.o: ../src/libUnuk/Engine/Character.cpp ../src/libUnuk/Engine/Character
 		../src/libUnuk/Sprite/TextureManager.h \
 		../src/libUnuk/Map/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/System/Timer.h
+		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Character.o ../src/libUnuk/Engine/Character.cpp
 
 AStar.o: ../src/libUnuk/Engine/AStar.cpp ../src/libUnuk/Engine/AStar.h \
@@ -356,6 +366,8 @@ Map.o: ../src/libUnuk/Map/Map.cpp ../src/libUnuk/Map/Map.h \
 		../src/libUnuk/Engine/MemManager.h \
 		../src/libUnuk/Engine/Collision.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Map.o ../src/libUnuk/Map/Map.cpp
@@ -406,7 +418,8 @@ Debug.o: ../src/libUnuk/System/Debug.cpp ../src/libUnuk/System/Debug.h
 Text.o: ../src/libUnuk/UI/Text.cpp ../src/libUnuk/UI/Text.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Text.o ../src/libUnuk/UI/Text.cpp
 
 MainMenu.o: ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/MainMenu.h \
@@ -414,30 +427,39 @@ MainMenu.o: ../src/libUnuk/UI/MainMenu.cpp ../src/libUnuk/UI/MainMenu.h \
 		../src/libUnuk/System/FPS.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/Sprite/ApplySurface.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/Engine/MemClass.h \
+		../src/libUnuk/Engine/MemManager.h \
 		../src/libUnuk/Map/Map.h \
 		../src/libUnuk/Sprite/ImageLoader.h \
-		../src/libUnuk/System/Debug.h \
-		../src/libUnuk/Sprite/ApplySurface.h \
 		../src/libUnuk/Map/MapTile.h \
 		../src/libUnuk/Map/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
 		../src/libUnuk/Map/MapEntities.h \
-		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/System/Rect.h
+		../src/libUnuk/Engine/WorldManager.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o MainMenu.o ../src/libUnuk/UI/MainMenu.cpp
 
 IngameMenu.o: ../src/libUnuk/UI/IngameMenu.cpp ../src/libUnuk/UI/IngameMenu.h \
 		../src/Unuk/Globals.h \
 		../src/Unuk/Constants.h \
 		../src/libUnuk/UI/ButtonGroup.h \
-		../src/libUnuk/Engine/MemClass.h \
-		../src/libUnuk/Engine/MemManager.h \
-		../src/libUnuk/UI/ButtonToggle.h \
 		../src/libUnuk/UI/Button.h \
 		../src/libUnuk/System/Input.h \
-		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/Engine/MemClass.h \
+		../src/libUnuk/Engine/MemManager.h \
+		../src/libUnuk/UI/ButtonToggle.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o IngameMenu.o ../src/libUnuk/UI/IngameMenu.cpp
 
 Font.o: ../src/libUnuk/UI/Font.cpp ../src/libUnuk/UI/Font.h \
@@ -448,12 +470,22 @@ ButtonToggle.o: ../src/libUnuk/UI/ButtonToggle.cpp ../src/libUnuk/UI/ButtonToggl
 		../src/libUnuk/UI/Button.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/System/Input.h \
-		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonToggle.o ../src/libUnuk/UI/ButtonToggle.cpp
 
 ButtonGroup.o: ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/Unuk/Globals.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/Sprite/ApplySurface.h \
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
 		../src/libUnuk/Engine/MemClass.h \
 		../src/libUnuk/Engine/MemManager.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonGroup.o ../src/libUnuk/UI/ButtonGroup.cpp
@@ -461,9 +493,11 @@ ButtonGroup.o: ../src/libUnuk/UI/ButtonGroup.cpp ../src/libUnuk/UI/ButtonGroup.h
 Button.o: ../src/libUnuk/UI/Button.cpp ../src/libUnuk/UI/Button.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/System/Input.h \
-		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
-		../src/libUnuk/System/Debug.h
+		../src/libUnuk/System/Debug.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Button.o ../src/libUnuk/UI/Button.cpp
 
 Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
@@ -482,30 +516,42 @@ Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
 		../src/libUnuk/Sprite/TextureManager.h \
 		../src/libUnuk/Map/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/System/Timer.h
+		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Player.o ../src/Unuk/Player.cpp
 
-main.o: ../src/Unuk/main.cpp ../src/libUnuk/Engine/NPC.h \
-		../src/libUnuk/Engine/Character.h \
-		../src/Unuk/Globals.h \
+main.o: ../src/Unuk/main.cpp ../src/libUnuk/UI/MainMenu.h \
 		../src/Unuk/Constants.h \
-		../src/libUnuk/Engine/MemClass.h \
-		../src/libUnuk/Engine/MemManager.h \
+		../src/libUnuk/System/FPS.h \
+		../src/Unuk/Globals.h \
+		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/UI/Text.h \
 		../src/libUnuk/Sprite/ApplySurface.h \
 		../src/libUnuk/System/Debug.h \
-		../src/libUnuk/Sprite/ImageLoader.h \
-		../src/libUnuk/Engine/Collision.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/Engine/MemClass.h \
+		../src/libUnuk/Engine/MemManager.h \
 		../src/libUnuk/Map/Map.h \
+		../src/libUnuk/Sprite/ImageLoader.h \
 		../src/libUnuk/Map/MapTile.h \
 		../src/libUnuk/Map/MapElement.h \
 		../src/libUnuk/Sprite/TextureManager.h \
 		../src/libUnuk/Map/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
-		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/Engine/NPC.h \
+		../src/libUnuk/Engine/Character.h \
+		../src/libUnuk/Engine/Collision.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h \
 		../src/Unuk/Game.h \
-		../src/Unuk/Player.h
+		../src/Unuk/Player.h \
+		../src/libUnuk/UI/IngameMenu.h \
+		../src/libUnuk/UI/ButtonToggle.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../src/Unuk/main.cpp
 
 Globals.o: ../src/Unuk/Globals.cpp ../src/Unuk/Globals.h
@@ -529,11 +575,25 @@ Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \
 		../src/libUnuk/Map/MapEntities.h \
 		../src/libUnuk/Engine/WorldManager.h \
 		../src/libUnuk/System/Timer.h \
+		../src/libUnuk/UI/Text.h \
+		../src/libUnuk/UI/Font.h \
+		../src/libUnuk/UI/IngameMenu.h \
+		../src/libUnuk/UI/ButtonGroup.h \
+		../src/libUnuk/UI/Button.h \
+		../src/libUnuk/System/Input.h \
+		../src/libUnuk/System/Rect.h \
+		../src/libUnuk/UI/ButtonToggle.h \
 		../src/libUnuk/Engine/NPC.h \
 		../src/libUnuk/Engine/AStar.h \
 		../src/libUnuk/Engine/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Game.o ../src/Unuk/Game.cpp
 
+LevelGen.o: ../src/libUnuk/LevelGen/LevelGen.cpp ../src/libUnuk/LevelGen/LevelGen.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o LevelGen.o ../src/libUnuk/LevelGen/LevelGen.cpp
+
+Level.o: ../src/libUnuk/LevelGen/Level.cpp ../src/libUnuk/LevelGen/Level.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Level.o ../src/libUnuk/LevelGen/Level.cpp
+
 ####### Install
 
 install:   FORCE
diff --git a/Unuk-QT/Unuk-QT b/Unuk-QT/Unuk-QT
deleted file mode 100755
index 84ea0f6..0000000
Binary files a/Unuk-QT/Unuk-QT and /dev/null differ
diff --git a/Unuk-QT/Unuk-QT.pro b/Unuk-QT/Unuk-QT.pro
index 0d848af..594ec91 100644
--- a/Unuk-QT/Unuk-QT.pro
+++ b/Unuk-QT/Unuk-QT.pro
@@ -29,17 +29,19 @@ HEADERS += ../src/Libs/wglext.h \
     ../src/libUnuk/System/FPS.h \
     ../src/libUnuk/System/Debug.h \
     ../src/libUnuk/System/Timer.h \
-		../src/libUnuk/UI/MainMenu.h \
-		../src/libUnuk/UI/IngameMenu.h \
-		../src/libUnuk/UI/Font.h \
-		../src/libUnuk/UI/ButtonToggle.h \
-		../src/libUnuk/UI/ButtonGroup.h \
-		../src/libUnuk/UI/Button.h \
-		../src/libUnuk/UI/Text.h \
+    ../src/libUnuk/UI/MainMenu.h \
+    ../src/libUnuk/UI/IngameMenu.h \
+    ../src/libUnuk/UI/Font.h \
+    ../src/libUnuk/UI/ButtonToggle.h \
+    ../src/libUnuk/UI/ButtonGroup.h \
+    ../src/libUnuk/UI/Button.h \
+    ../src/libUnuk/UI/Text.h \
     ../src/Unuk/Globals.h \
     ../src/Unuk/Game.h \
     ../src/Unuk/Constants.h \
-    ../src/Unuk/Player.h
+    ../src/Unuk/Player.h \
+    ../src/libUnuk/LevelGen/LevelGen.h \
+    ../src/libUnuk/LevelGen/Level.h
 SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
     ../src/libUnuk/Engine/ParticleEmitter.cpp \
     ../src/libUnuk/Engine/NPC.cpp \
@@ -59,15 +61,17 @@ SOURCES += ../src/libUnuk/Engine/WorldManager.cpp \
     ../src/libUnuk/System/Input.cpp \
     ../src/libUnuk/System/FPS.cpp \
     ../src/libUnuk/System/Debug.cpp \
-		../src/libUnuk/UI/Text.cpp \
-		../src/libUnuk/UI/MainMenu.cpp \
-		../src/libUnuk/UI/IngameMenu.cpp \
-		../src/libUnuk/UI/Font.cpp \
-		../src/libUnuk/UI/ButtonToggle.cpp \
-		../src/libUnuk/UI/ButtonGroup.cpp \
-		../src/libUnuk/UI/Button.cpp \
+    ../src/libUnuk/UI/Text.cpp \
+    ../src/libUnuk/UI/MainMenu.cpp \
+    ../src/libUnuk/UI/IngameMenu.cpp \
+    ../src/libUnuk/UI/Font.cpp \
+    ../src/libUnuk/UI/ButtonToggle.cpp \
+    ../src/libUnuk/UI/ButtonGroup.cpp \
+    ../src/libUnuk/UI/Button.cpp \
     ../src/Unuk/Player.cpp \
     ../src/Unuk/main.cpp \
     ../src/Unuk/Globals.cpp \
-    ../src/Unuk/Game.cpp
+    ../src/Unuk/Game.cpp \
+    ../src/libUnuk/LevelGen/LevelGen.cpp \
+    ../src/libUnuk/LevelGen/Level.cpp
 OTHER_FILES += 
diff --git a/src/Unuk/Game.cpp b/src/Unuk/Game.cpp
index d8c0078..b5f34bd 100644
--- a/src/Unuk/Game.cpp
+++ b/src/Unuk/Game.cpp
@@ -50,7 +50,7 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
 
   stringstream npcHealth;
   _npcHealth.SetXY(10, 100);
-  _npcHealth.SetTextBlended("NPC 0 Health - XX", vsmall, COLOUR_BLACK);
+	_npcHealth.SetTextBlended("NPC X Health - XX", vsmall, COLOUR_BLACK);
 
   _gameRunning = true;
   while(_gameRunning) {
diff --git a/src/Unuk/Game.h b/src/Unuk/Game.h
index 24aee2a..e4dae89 100644
--- a/src/Unuk/Game.h
+++ b/src/Unuk/Game.h
@@ -35,7 +35,7 @@ private:
   void LoadSavegame(const string savegameIDArg);
   void SaveSavegame(void);
 
-  static const int MAX_FPS = 200;
+	static const int MAX_FPS = 200;
   static const int GAME_UPDATES_PER_SECOND = 60;
   static const int SKIP_TICKS = 1000 / GAME_UPDATES_PER_SECOND;
 
diff --git a/src/libUnuk/LevelGen/Level.cpp b/src/libUnuk/LevelGen/Level.cpp
new file mode 100644
index 0000000..de9e0f4
--- /dev/null
+++ b/src/libUnuk/LevelGen/Level.cpp
@@ -0,0 +1,9 @@
+#include "Level.h"
+
+Level::Level(void) {
+
+}
+
+Level::~Level(void) {
+
+}
diff --git a/src/libUnuk/LevelGen/Level.h b/src/libUnuk/LevelGen/Level.h
new file mode 100644
index 0000000..5d9dff6
--- /dev/null
+++ b/src/libUnuk/LevelGen/Level.h
@@ -0,0 +1,10 @@
+#pragma once
+
+class Level {
+public:
+	Level(void);
+	~Level(void);
+
+private:
+
+};
diff --git a/src/libUnuk/LevelGen/LevelGen.cpp b/src/libUnuk/LevelGen/LevelGen.cpp
new file mode 100644
index 0000000..7fc737e
--- /dev/null
+++ b/src/libUnuk/LevelGen/LevelGen.cpp
@@ -0,0 +1,9 @@
+#include "LevelGen.h"
+
+LevelGen::LevelGen(void) {
+
+}
+
+LevelGen::~LevelGen(void) {
+
+}
diff --git a/src/libUnuk/LevelGen/LevelGen.h b/src/libUnuk/LevelGen/LevelGen.h
new file mode 100644
index 0000000..b69dca9
--- /dev/null
+++ b/src/libUnuk/LevelGen/LevelGen.h
@@ -0,0 +1,10 @@
+#pragma once
+
+class LevelGen {
+public:
+	LevelGen(void);
+	~LevelGen(void);
+
+private:
+
+};