diff --git a/Data/Media/Images/Entities/barrel.png b/Data/Media/Images/Entities/barrel.png
new file mode 100644
index 0000000..ae413cb
Binary files /dev/null and b/Data/Media/Images/Entities/barrel.png differ
diff --git a/Data/Media/Images/Entities/cabin.png b/Data/Media/Images/Entities/cabin.png
new file mode 100644
index 0000000..a17e28a
Binary files /dev/null and b/Data/Media/Images/Entities/cabin.png differ
diff --git a/Data/Media/Images/Entities/chest.png b/Data/Media/Images/Entities/chest.png
new file mode 100644
index 0000000..e58a641
Binary files /dev/null and b/Data/Media/Images/Entities/chest.png differ
diff --git a/Data/Media/Images/Entities/hedge.png b/Data/Media/Images/Entities/hedge.png
new file mode 100644
index 0000000..1a41de6
Binary files /dev/null and b/Data/Media/Images/Entities/hedge.png differ
diff --git a/Data/Media/Images/Entities/tree.png b/Data/Media/Images/Entities/tree.png
index 554c867..7383cd5 100644
Binary files a/Data/Media/Images/Entities/tree.png and b/Data/Media/Images/Entities/tree.png differ
diff --git a/Data/Media/Images/Tiles/grass.png b/Data/Media/Images/Tiles/grass.png
index 08e0a87..7984135 100644
Binary files a/Data/Media/Images/Tiles/grass.png and b/Data/Media/Images/Tiles/grass.png differ
diff --git a/Data/Media/Images/Tiles/water3anim.png b/Data/Media/Images/Tiles/water3anim.png
new file mode 100644
index 0000000..eae6ea1
Binary files /dev/null and b/Data/Media/Images/Tiles/water3anim.png differ
diff --git a/Data/Media/Maps/MainMenu b/Data/Media/Maps/MainMenu
deleted file mode 100644
index d05f5bc..0000000
--- a/Data/Media/Maps/MainMenu
+++ /dev/null
@@ -1,13 +0,0 @@
-grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 tree 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-water 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 water 0 n 0 000 n 0 0 water 1 n 0 000 n 0 0 water 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-water 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 water 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-water 1 n 0 000 n 0 0 water 1 n 0 000 n 0 0 water 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 water 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 water 0 n 0 000 n 0 0 water 0 n 0 000 n 0 0 water 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 1 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
-grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0 grass 0 n 0 000 n 0 0
diff --git a/Data/Media/Maps/map b/Data/Media/Maps/map
index 9e8b282..4e531f8 100644
--- a/Data/Media/Maps/map
+++ b/Data/Media/Maps/map
@@ -1,13611 +1,1141 @@
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+ice
+false
+
+tree
+true
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
+grass
+false
+
+null
+false
+
+100
+
+null
+0
+0
+
+
+
\ No newline at end of file
diff --git a/Save/config b/Save/config
new file mode 100644
index 0000000..8dd2e5f
--- /dev/null
+++ b/Save/config
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/src/libUnuk/Map.cpp b/src/libUnuk/Map.cpp
index 6a86896..3bb5653 100644
--- a/src/libUnuk/Map.cpp
+++ b/src/libUnuk/Map.cpp
@@ -77,8 +77,8 @@ void Map::Load(const string filename) {
entityPath << "../Data/Media/Images/Entities/" << entityName << ".png";
m_tile[x][y].SetEntityTexture(m_entityTextures.AddAlpha(entityPath.str()));
- m_tile[x][y].SetEntityXY(m_tile[x][y].GetTileX() - (m_tile[x][y].GetEntityWidth() / 2 + TILE_WIDTH / 2),
- m_tile[x][y].GetTileY() - (m_tile[x][y].GetEntityHeight() / 2 + TILE_HEIGHT / 2));
+ m_tile[x][y].SetEntityXY(m_tile[x][y].GetTileX() + TILE_WIDTH / 2 - m_tile[x][y].GetEntityWidth() / 2,
+ m_tile[x][y].GetTileY() + TILE_HEIGHT / 2 - m_tile[x][y].GetEntityHeight() / 2);
}
//