diff --git a/Unuk.png b/Unuk.png
new file mode 100644
index 0000000..70f69ea
Binary files /dev/null and b/Unuk.png differ
diff --git a/src/libUnuk/ButtonToggle.cpp b/src/libUnuk/ButtonToggle.cpp
index f5e5719..d1e17b6 100644
--- a/src/libUnuk/ButtonToggle.cpp
+++ b/src/libUnuk/ButtonToggle.cpp
@@ -1,13 +1,35 @@
 #include "ButtonToggle.h"
 
+ButtonToggle::ButtonToggle(void) {
+
+}
+
+ButtonToggle::~ButtonToggle(void) {
+
+}
+
 void ButtonToggle::SetOverRGB(Uint8 r, Uint8 g, Uint8 b) {
   Button::SetOverRGB(r, g, b);
 }
 
+void ButtonToggle::SetOverRGB(SDL_Color colour) {
+  Button::SetOverRGB(colour);
+}
+
 void ButtonToggle::SetOffRGB(Uint8 r, Uint8 g, Uint8 b) {
   ButtonToggle::SetOutRGB(r, g, b);
 }
 
-void ButtonToggle::SetOnRGB(Uint8 r, Uint8 g, Uint8 b) {
-
+void ButtonToggle::SetOffRGB(SDL_Color colour) {
+  Button::SetOutRGB(colour);
+}
+
+void ButtonToggle::SetOnRGB(Uint8 r, Uint8 g, Uint8 b) {
+  m_onColour.r = r;
+  m_onColour.g = g;
+  m_onColour.b = b;
+}
+
+void ButtonToggle::SetOnRGB(SDL_Color colour) {
+  m_onColour = colour;
 }
diff --git a/src/libUnuk/ButtonToggle.h b/src/libUnuk/ButtonToggle.h
index 3c45e7e..bbc4c17 100644
--- a/src/libUnuk/ButtonToggle.h
+++ b/src/libUnuk/ButtonToggle.h
@@ -11,8 +11,11 @@ public:
   ~ButtonToggle(void);
 
   void SetOverRGB(Uint8 r, Uint8 g, Uint8 b);
+  void SetOverRGB(SDL_Color);
   void SetOffRGB(Uint8 r, Uint8 g, Uint8 b);
+  void SetOffRGB(SDL_Color);
   void SetOnRGB(Uint8 r, Uint8 g, Uint8 b);
+  void SetOnRGB(SDL_Color);
 
   void SetTextRGB(Uint8 r, Uint8 g, Uint8 b);
   void SetOnText(string);
diff --git a/src/libUnuk/Character.cpp b/src/libUnuk/Character.cpp
index eedd437..9a2a59a 100644
--- a/src/libUnuk/Character.cpp
+++ b/src/libUnuk/Character.cpp
@@ -130,12 +130,15 @@ bool Character::CheckTileCollisions(void) {
 bool Character::CheckEntityCollisions(void) {
   for(int i = -1; i < 2; i++) {
     for(int j = -1; j < 2; j++) {
-      if(map->GetEntitySolidity(tileX + i, tileY + j))
+      if(map->GetEntitySolidity(tileX + i, tileY + j)) {
+        printf("\nw - ", map->GetEntityWidth(tileX + i, tileY + j));
+        printf("\nh - ", map->GetEntityHeight(tileX + i, tileY + j));
         if(CheckCollisionXY(x, y, w, h, map->GetEntityX(tileX + i, tileY + j),
                             map->GetEntityY(tileX + i, tileY + j),
                             map->GetEntityWidth(tileX + i, tileY + j),
                             map->GetEntityHeight(tileX + i, tileY + j)))
           return true;
+      }
     }
   }
   return false;
diff --git a/src/libUnuk/Character.h b/src/libUnuk/Character.h
index 90aaaf4..6b7c24d 100644
--- a/src/libUnuk/Character.h
+++ b/src/libUnuk/Character.h
@@ -10,6 +10,7 @@
 #include "Collision.h"
 #include "Map.h"
 #include "Timer.h"
+#include "Debug.h"
 using namespace std;
 
 class Map;
@@ -71,7 +72,7 @@ protected:
   
 private:
   static const int ANIMATION_SPEED         = 200;
-  static const int ATTACKING_DISPLAY_LEN   = 100;
+  static const int ATTACKING_DISPLAY_LEN   = 150;
   
   SDL_Surface* m_texture;
   
diff --git a/src/libUnuk/Map.cpp b/src/libUnuk/Map.cpp
index 01d2786..32aea83 100644
--- a/src/libUnuk/Map.cpp
+++ b/src/libUnuk/Map.cpp
@@ -56,6 +56,9 @@ void Map::Load(const string filename) {
             m_entityTextures->GetTextureWidth(m_tile[m_mapRows][m_mapColumns].GetEntityID()),
             m_entityTextures->GetTextureHeight(m_tile[m_mapRows][m_mapColumns].GetEntityID()));
 
+        printf("\nw - ", m_entityTextures->GetTextureWidth(m_tile[m_mapRows][m_mapColumns].GetEntityID()));
+        printf("\nh - ", m_entityTextures->GetTextureHeight(m_tile[m_mapRows][m_mapColumns].GetEntityID()));
+
         // Set the entities x and y variables.
         m_tile[m_mapRows][m_mapColumns].SetEntityXY(
             m_tile[m_mapRows][m_mapColumns].GetTileX() - (m_tile[m_mapRows][m_mapColumns].GetEntityWidth()  / 2 + TILE_WIDTH  / 2),