diff --git a/.gitignore b/.gitignore
index 3fb8cc8..b006c5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,6 @@ Bin/*.dll
 *.swp
 *.o
 *.exe
-*log
+*.log
+*Unuk-QT
+*Unuk
diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index d7e9061..4a9cc28 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 7 00:36:51 2012
+# Generated by qmake (2.01a) (Qt 4.7.3) on: Tue Jan 10 11:05:09 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
@@ -70,7 +70,8 @@ SOURCES       = ../src/libUnuk/Debug.cpp \
 		../src/libUnuk/MapEntities.cpp \
 		../src/libUnuk/FPS.cpp \
 		../src/libUnuk/MemManager.cpp \
-		../src/libUnuk/AStar.cpp 
+		../src/libUnuk/AStar.cpp \
+		../src/libUnuk/ButtonGroup.cpp 
 OBJECTS       = Debug.o \
 		main.o \
 		Input.o \
@@ -98,7 +99,8 @@ OBJECTS       = Debug.o \
 		MapEntities.o \
 		FPS.o \
 		MemManager.o \
-		AStar.o
+		AStar.o \
+		ButtonGroup.o
 DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
 		/usr/share/qt4/mkspecs/common/unix.conf \
 		/usr/share/qt4/mkspecs/common/linux.conf \
@@ -198,7 +200,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/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Input.h ../src/libUnuk/Rect.h ../src/libUnuk/Timer.h ../src/libUnuk/Font.h ../Constants.h ../src/Unuk/Constants.h ../src/libUnuk/ApplySurface.h ../src/Unuk/Globals.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/TextureManager.h ../src/libUnuk/Texture.h ../src/libUnuk/Text.h ../src/libUnuk/MapTile.h ../src/libUnuk/Map.h ../src/libUnuk/Button.h ../src/libUnuk/ButtonToggle.h ../src/libUnuk/MainMenu.h ../src/libUnuk/ParticleEmitter.h ../src/libUnuk/IngameMenu.h ../src/libUnuk/Collision.h ../src/libUnuk/Character.h ../src/libUnuk/NPC.h ../src/Unuk/Player.h ../src/Unuk/Game.h ../src/libUnuk/MapElement.h ../src/libUnuk/MapEntities.h ../src/libUnuk/FPS.h ../src/libUnuk/MemManager.h ../src/libUnuk/MemClass.h ../src/libUnuk/Node.h ../src/libUnuk/AStarBase.h ../src/libUnuk/AStar.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.cpp ../src/Unuk/main.cpp ../src/libUnuk/Input.cpp ../src/libUnuk/Timer.cpp ../src/libUnuk/Font.cpp ../src/libUnuk/ApplySurface.cpp ../src/Unuk/Globals.cpp ../src/libUnuk/Rect.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/TextureManager.cpp ../src/libUnuk/Texture.cpp ../src/libUnuk/Text.cpp ../src/libUnuk/Map.cpp ../src/libUnuk/Button.cpp ../src/libUnuk/ButtonToggle.cpp ../src/libUnuk/ParticleEmitter.cpp ../src/libUnuk/MainMenu.cpp ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/Collision.cpp ../src/libUnuk/Character.cpp ../src/libUnuk/NPC.cpp ../src/Unuk/Player.cpp ../src/Unuk/Game.cpp ../src/libUnuk/MapElement.cpp ../src/libUnuk/MapEntities.cpp ../src/libUnuk/FPS.cpp ../src/libUnuk/MemManager.cpp ../src/libUnuk/AStar.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/libUnuk/Debug.h ../src/Libs/wglext.h ../src/Libs/glxext.h ../src/libUnuk/Input.h ../src/libUnuk/Rect.h ../src/libUnuk/Timer.h ../src/libUnuk/Font.h ../Constants.h ../src/Unuk/Constants.h ../src/libUnuk/ApplySurface.h ../src/Unuk/Globals.h ../src/libUnuk/ImageLoader.h ../src/libUnuk/TextureManager.h ../src/libUnuk/Texture.h ../src/libUnuk/Text.h ../src/libUnuk/MapTile.h ../src/libUnuk/Map.h ../src/libUnuk/Button.h ../src/libUnuk/ButtonToggle.h ../src/libUnuk/MainMenu.h ../src/libUnuk/ParticleEmitter.h ../src/libUnuk/IngameMenu.h ../src/libUnuk/Collision.h ../src/libUnuk/Character.h ../src/libUnuk/NPC.h ../src/Unuk/Player.h ../src/Unuk/Game.h ../src/libUnuk/MapElement.h ../src/libUnuk/MapEntities.h ../src/libUnuk/FPS.h ../src/libUnuk/MemManager.h ../src/libUnuk/MemClass.h ../src/libUnuk/Node.h ../src/libUnuk/AStarBase.h ../src/libUnuk/AStar.h ../src/libUnuk/ButtonGroup.h .tmp/Unuk-QT1.0.0/ && $(COPY_FILE) --parents ../src/libUnuk/Debug.cpp ../src/Unuk/main.cpp ../src/libUnuk/Input.cpp ../src/libUnuk/Timer.cpp ../src/libUnuk/Font.cpp ../src/libUnuk/ApplySurface.cpp ../src/Unuk/Globals.cpp ../src/libUnuk/Rect.cpp ../src/libUnuk/ImageLoader.cpp ../src/libUnuk/TextureManager.cpp ../src/libUnuk/Texture.cpp ../src/libUnuk/Text.cpp ../src/libUnuk/Map.cpp ../src/libUnuk/Button.cpp ../src/libUnuk/ButtonToggle.cpp ../src/libUnuk/ParticleEmitter.cpp ../src/libUnuk/MainMenu.cpp ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/Collision.cpp ../src/libUnuk/Character.cpp ../src/libUnuk/NPC.cpp ../src/Unuk/Player.cpp ../src/Unuk/Game.cpp ../src/libUnuk/MapElement.cpp ../src/libUnuk/MapEntities.cpp ../src/libUnuk/FPS.cpp ../src/libUnuk/MemManager.cpp ../src/libUnuk/AStar.cpp ../src/libUnuk/ButtonGroup.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 
@@ -248,6 +250,7 @@ main.o: ../src/Unuk/main.cpp ../src/libUnuk/MainMenu.h \
 		../src/libUnuk/FPS.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/Timer.h \
+		../src/libUnuk/ButtonGroup.h \
 		../src/libUnuk/Button.h \
 		../src/libUnuk/Input.h \
 		../src/libUnuk/Text.h \
@@ -266,6 +269,8 @@ main.o: ../src/Unuk/main.cpp ../src/libUnuk/MainMenu.h \
 		../src/libUnuk/MemClass.h \
 		../src/libUnuk/MemManager.h \
 		../src/libUnuk/Collision.h \
+		../src/libUnuk/AStar.h \
+		../src/libUnuk/AStarBase.h \
 		../src/Unuk/Game.h \
 		../src/Unuk/Player.h \
 		../src/libUnuk/IngameMenu.h \
@@ -366,6 +371,7 @@ MainMenu.o: ../src/libUnuk/MainMenu.cpp ../src/libUnuk/MainMenu.h \
 		../src/libUnuk/FPS.h \
 		../src/Unuk/Globals.h \
 		../src/libUnuk/Timer.h \
+		../src/libUnuk/ButtonGroup.h \
 		../src/libUnuk/Button.h \
 		../src/libUnuk/Input.h \
 		../src/libUnuk/Text.h \
@@ -384,6 +390,7 @@ MainMenu.o: ../src/libUnuk/MainMenu.cpp ../src/libUnuk/MainMenu.h \
 IngameMenu.o: ../src/libUnuk/IngameMenu.cpp ../src/libUnuk/IngameMenu.h \
 		../src/Unuk/Globals.h \
 		../src/Unuk/Constants.h \
+		../src/libUnuk/ButtonGroup.h \
 		../src/libUnuk/Button.h \
 		../src/libUnuk/Input.h \
 		../src/libUnuk/Text.h \
@@ -433,7 +440,9 @@ NPC.o: ../src/libUnuk/NPC.cpp ../src/libUnuk/NPC.h \
 		../src/libUnuk/MapEntities.h \
 		../src/libUnuk/Timer.h \
 		../src/libUnuk/Text.h \
-		../src/libUnuk/Font.h
+		../src/libUnuk/Font.h \
+		../src/libUnuk/AStar.h \
+		../src/libUnuk/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o NPC.o ../src/libUnuk/NPC.cpp
 
 Player.o: ../src/Unuk/Player.cpp ../src/Unuk/Player.h \
@@ -476,11 +485,14 @@ Game.o: ../src/Unuk/Game.cpp ../src/Unuk/Game.h \
 		../src/libUnuk/Text.h \
 		../src/libUnuk/Font.h \
 		../src/libUnuk/IngameMenu.h \
+		../src/libUnuk/ButtonGroup.h \
 		../src/libUnuk/Button.h \
 		../src/libUnuk/Input.h \
 		../src/libUnuk/Rect.h \
 		../src/libUnuk/ButtonToggle.h \
-		../src/libUnuk/NPC.h
+		../src/libUnuk/NPC.h \
+		../src/libUnuk/AStar.h \
+		../src/libUnuk/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Game.o ../src/Unuk/Game.cpp
 
 MapElement.o: ../src/libUnuk/MapElement.cpp ../src/libUnuk/MapElement.h \
@@ -513,6 +525,17 @@ AStar.o: ../src/libUnuk/AStar.cpp ../src/libUnuk/AStar.h \
 		../src/libUnuk/AStarBase.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o AStar.o ../src/libUnuk/AStar.cpp
 
+ButtonGroup.o: ../src/libUnuk/ButtonGroup.cpp ../src/libUnuk/ButtonGroup.h \
+		../src/libUnuk/Button.h \
+		../src/Unuk/Globals.h \
+		../src/libUnuk/Input.h \
+		../src/libUnuk/Text.h \
+		../src/libUnuk/ApplySurface.h \
+		../src/libUnuk/Debug.h \
+		../src/libUnuk/Font.h \
+		../src/libUnuk/Rect.h
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ButtonGroup.o ../src/libUnuk/ButtonGroup.cpp
+
 ####### Install
 
 install:   FORCE
diff --git a/Unuk-QT/Unuk-QT b/Unuk-QT/Unuk-QT
deleted file mode 100755
index 46f2e9e..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 7af9372..a069546 100644
--- a/Unuk-QT/Unuk-QT.pro
+++ b/Unuk-QT/Unuk-QT.pro
@@ -42,7 +42,8 @@ HEADERS += ../src/libUnuk/Debug.h \
     ../src/libUnuk/MemClass.h \
     ../src/libUnuk/Node.h \
     ../src/libUnuk/AStarBase.h \
-    ../src/libUnuk/AStar.h
+    ../src/libUnuk/AStar.h \
+    ../src/libUnuk/ButtonGroup.h
 SOURCES += ../src/libUnuk/Debug.cpp \
     ../src/Unuk/main.cpp \
     ../src/libUnuk/Input.cpp \
@@ -70,4 +71,5 @@ SOURCES += ../src/libUnuk/Debug.cpp \
     ../src/libUnuk/MapEntities.cpp \
     ../src/libUnuk/FPS.cpp \
     ../src/libUnuk/MemManager.cpp \
-    ../src/libUnuk/AStar.cpp
+    ../src/libUnuk/AStar.cpp \
+    ../src/libUnuk/ButtonGroup.cpp
diff --git a/src/Unuk/Player.cpp b/src/Unuk/Player.cpp
index 2e40485..f4b5be2 100644
--- a/src/Unuk/Player.cpp
+++ b/src/Unuk/Player.cpp
@@ -38,6 +38,10 @@ void Player::HandleInput(void) {
       yVel = 0;
       directionFacing = FACING_RIGHT;
       break;
+    case SDLK_SPACE:
+      attacking = true;
+      attackTimer.Start();
+      break;
     default:
       break;
     }
diff --git a/src/libUnuk/ButtonGroup.h b/src/libUnuk/ButtonGroup.h
index faf1f1b..b242f74 100644
--- a/src/libUnuk/ButtonGroup.h
+++ b/src/libUnuk/ButtonGroup.h
@@ -3,6 +3,7 @@
 #include <list>
 
 #include "Button.h"
+#include "MemClass.h"
 
 class ButtonGroup {
 public:
@@ -32,4 +33,4 @@ private:
   int _selectedButton;
 };
 
-#endif
\ No newline at end of file
+#endif