diff --git a/ZoFo/Content/MapData/MapSession.tiled-project b/ZoFo/Content/MapData/MapSession.tiled-project
new file mode 100644
index 0000000..d0eb592
--- /dev/null
+++ b/ZoFo/Content/MapData/MapSession.tiled-project
@@ -0,0 +1,14 @@
+{
+    "automappingRulesFile": "",
+    "commands": [
+    ],
+    "compatibilityVersion": 1100,
+    "extensionsPath": "extensions",
+    "folders": [
+        "."
+    ],
+    "properties": [
+    ],
+    "propertyTypes": [
+    ]
+}
diff --git a/ZoFo/Content/MapData/MapSession.tiled-session b/ZoFo/Content/MapData/MapSession.tiled-session
new file mode 100644
index 0000000..2d63e0b
--- /dev/null
+++ b/ZoFo/Content/MapData/MapSession.tiled-session
@@ -0,0 +1,43 @@
+{
+    "Map/SizeTest": {
+        "height": 4300,
+        "width": 2
+    },
+    "activeFile": "TileMaps/main.tmj",
+    "expandedProjectPaths": [
+        ".",
+        "TileSets",
+        "TileMaps"
+    ],
+    "fileStates": {
+        "TileMaps/TileSets/TileSet 1.tsj": {
+            "scaleInDock": 1
+        },
+        "TileMaps/main.tmj": {
+            "scale": 1,
+            "selectedLayer": 0,
+            "viewCenter": {
+                "x": 256,
+                "y": 255.5
+            }
+        },
+        "TileSets/TileSet 1.tsj": {
+            "scaleInDock": 1,
+            "scaleInEditor": 1
+        }
+    },
+    "last.externalTilesetPath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/TileSets",
+    "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/Background",
+    "map.fixedSize": false,
+    "map.lastUsedFormat": "json",
+    "map.tileHeight": 16,
+    "map.tileWidth": 16,
+    "openFiles": [
+        "TileMaps/main.tmj"
+    ],
+    "project": "MapSession.tiled-project",
+    "recentFiles": [
+        "TileMaps/main.tmj",
+        "TileSets/TileSet 1.tsj"
+    ]
+}
diff --git a/ZoFo/Content/MapData/TileMaps/main.tmj b/ZoFo/Content/MapData/TileMaps/main.tmj
index ae7c346..b4d24d3 100644
--- a/ZoFo/Content/MapData/TileMaps/main.tmj
+++ b/ZoFo/Content/MapData/TileMaps/main.tmj
@@ -5,147 +5,103 @@
         {
          "chunks":[
                 {
-                 "data":[24, 24, 24, 28, 29, 24, 24, 24, 28, 46, 29, 24, 25, 115, 45, 46,
-                    24, 24, 24, 25, 23, 24, 24, 24, 50, 2, 51, 24, 50, 2, 2, 2,
-                    24, 24, 24, 50, 32, 29, 24, 24, 24, 24, 24, 24, 24, 24, 24, 28,
-                    28, 29, 24, 28, 10, 32, 29, 24, 24, 28, 46, 29, 24, 24, 24, 50,
-                    47, 23, 24, 50, 32, 10, 32, 46, 29, 50, 2, 51, 24, 24, 24, 24,
-                    1, 32, 29, 90, 25, 23, 50, 2, 32, 29, 24, 90, 28, 29, 24, 24,
-                    51, 50, 32, 29, 50, 51, 90, 24, 25, 45, 46, 29, 25, 23, 24, 90,
-                    24, 24, 50, 32, 46, 29, 24, 28, 10, 2, 2, 51, 50, 51, 24, 90,
-                    24, 24, 24, 50, 2, 32, 46, 10, 32, 29, 24, 90, 24, 24, 24, 90,
-                    29, 24, 89, 24, 24, 50, 3, 23, 50, 32, 46, 46, 46, 46, 29, 24,
-                    51, 24, 24, 28, 29, 24, 25, 23, 24, 25, 1, 2, 3, 111, 45, 29,
-                    24, 90, 24, 50, 51, 24, 25, 23, 28, 47, 23, 89, 50, 3, 115, 23,
-                    24, 24, 24, 24, 24, 89, 50, 32, 47, 1, 51, 24, 24, 50, 2, 51,
-                    28, 29, 24, 24, 24, 24, 28, 10, 2, 51, 24, 24, 24, 24, 24, 28,
-                    10, 32, 29, 24, 24, 24, 25, 23, 28, 29, 90, 24, 24, 90, 24, 50,
-                    32, 10, 51, 24, 24, 24, 50, 32, 10, 32, 29, 24, 90, 28, 29, 24],
-                 "height":16,
-                 "width":16,
-                 "x":-16,
-                 "y":-16
-                }, 
-                {
-                 "data":[10, 51, 24, 90, 24, 25, 23, 28, 29, 24, 24, 24, 24, 24, 24, 24,
-                    51, 24, 28, 29, 24, 50, 32, 10, 51, 24, 24, 24, 24, 24, 24, 24,
-                    29, 28, 10, 32, 46, 29, 50, 32, 29, 24, 24, 24, 24, 24, 24, 24,
-                    51, 25, 23, 50, 2, 32, 29, 25, 23, 24, 24, 28, 29, 24, 90, 24,
-                    24, 25, 23, 24, 24, 25, 23, 50, 51, 24, 24, 50, 32, 29, 24, 90,
-                    24, 50, 32, 29, 90, 25, 45, 29, 24, 24, 24, 24, 50, 51, 24, 89,
-                    24, 89, 50, 51, 24, 25, 114, 23, 24, 24, 24, 24, 24, 24, 24, 24,
-                    24, 24, 28, 29, 24, 50, 2, 51, 24, 24, 90, 28, 29, 24, 24, 28,
-                    24, 24, 25, 23, 89, 24, 24, 24, 28, 46, 29, 25, 23, 24, 24, 50,
-                    28, 46, 10, 51, 24, 28, 46, 29, 25, 111, 45, 10, 51, 28, 29, 24,
-                    50, 2, 51, 24, 24, 25, 115, 45, 10, 3, 1, 51, 24, 25, 23, 24,
-                    24, 24, 24, 24, 24, 50, 2, 2, 32, 10, 51, 24, 90, 25, 23, 24,
-                    24, 24, 24, 24, 24, 24, 24, 24, 50, 51, 24, 24, 24, 25, 23, 24,
-                    46, 29, 24, 24, 24, 24, 24, 89, 24, 24, 24, 28, 46, 47, 23, 90,
-                    2, 32, 29, 24, 24, 28, 46, 46, 29, 24, 24, 25, 1, 3, 23, 89,
-                    24, 50, 32, 29, 24, 25, 1, 3, 23, 24, 89, 50, 32, 10, 51, 24],
-                 "height":16,
-                 "width":16,
-                 "x":0,
-                 "y":-16
-                }, 
-                {
-                 "data":[24, 24, 24, 24, 90, 24, 89, 24, 89, 24, 50, 51, 89, 24, 24, 24,
-                    24, 28, 29, 28, 29, 24, 24, 24, 24, 28, 29, 24, 24, 24, 28, 29,
-                    24, 25, 23, 50, 51, 24, 24, 28, 29, 50, 51, 24, 24, 24, 25, 45,
-                    90, 50, 51, 28, 29, 24, 24, 25, 23, 24, 24, 28, 29, 24, 50, 3,
-                    24, 24, 28, 10, 51, 90, 90, 50, 51, 24, 24, 50, 51, 24, 24, 50,
-                    24, 24, 25, 45, 29, 24, 28, 29, 24, 24, 24, 24, 24, 28, 29, 24,
-                    90, 24, 50, 2, 51, 28, 10, 51, 90, 24, 28, 29, 24, 25, 45, 46,
-                    29, 90, 24, 24, 24, 50, 51, 24, 24, 28, 10, 32, 46, 10, 3, 1,
-                    32, 29, 24, 90, 24, 24, 24, 24, 28, 47, 23, 50, 2, 51, 50, 51,
-                    25, 23, 24, 24, 28, 46, 46, 46, 47, 114, 45, 29, 24, 24, 24, 24,
-                    50, 32, 29, 24, 50, 3, 111, 111, 115, 111, 1, 32, 29, 24, 24, 24,
-                    24, 50, 51, 24, 28, 10, 2, 2, 2, 2, 32, 10, 51, 24, 24, 89,
-                    24, 24, 89, 90, 25, 23, 24, 24, 24, 24, 50, 32, 46, 46, 29, 89,
-                    24, 24, 24, 90, 25, 23, 89, 24, 28, 29, 90, 50, 2, 2, 51, 24,
-                    24, 24, 24, 28, 10, 51, 24, 28, 47, 45, 29, 24, 24, 24, 24, 24,
-                    24, 24, 24, 25, 23, 24, 90, 50, 2, 2, 32, 46, 46, 46, 46, 46],
-                 "height":16,
-                 "width":16,
-                 "x":16,
-                 "y":-16
-                }, 
-                {
-                 "data":[10, 32, 46, 29, 24, 24, 24, 25, 23, 50, 32, 29, 24, 50, 32, 46,
-                    51, 50, 2, 32, 29, 24, 24, 25, 45, 29, 25, 23, 24, 24, 25, 1,
-                    24, 24, 24, 25, 23, 28, 46, 10, 2, 51, 50, 51, 24, 24, 50, 51,
-                    90, 89, 90, 50, 51, 50, 2, 51, 24, 24, 28, 29, 90, 24, 24, 24,
-                    90, 28, 46, 29, 90, 24, 24, 24, 90, 24, 50, 51, 90, 24, 90, 28,
-                    29, 50, 2, 51, 24, 24, 24, 89, 24, 24, 24, 24, 24, 89, 24, 50,
-                    23, 24, 24, 28, 46, 29, 90, 90, 24, 89, 24, 28, 29, 24, 24, 24,
-                    32, 46, 29, 25, 115, 45, 29, 24, 90, 24, 24, 25, 23, 24, 24, 28,
-                    10, 2, 32, 47, 115, 1, 51, 24, 24, 24, 24, 25, 23, 24, 28, 10,
-                    32, 29, 50, 2, 2, 51, 24, 24, 24, 24, 24, 25, 23, 28, 10, 51,
-                    50, 51, 89, 24, 24, 89, 24, 28, 29, 24, 24, 50, 32, 10, 32, 46,
-                    24, 24, 90, 90, 28, 46, 29, 50, 51, 24, 24, 24, 25, 23, 25, 115,
-                    24, 90, 24, 24, 50, 2, 32, 29, 24, 24, 90, 24, 25, 45, 10, 2,
-                    24, 24, 24, 24, 24, 24, 50, 32, 29, 24, 24, 28, 10, 3, 23, 24,
-                    90, 24, 24, 24, 24, 89, 90, 50, 32, 29, 90, 50, 51, 50, 32, 46,
-                    46, 29, 24, 90, 24, 24, 24, 24, 50, 51, 28, 29, 24, 24, 50, 2],
-                 "height":16,
-                 "width":16,
-                 "x":-16,
-                 "y":0
-                }, 
-                {
-                 "data":[46, 46, 10, 32, 46, 47, 23, 25, 23, 89, 24, 24, 25, 23, 90, 24,
-                    2, 2, 32, 47, 1, 2, 51, 25, 23, 24, 28, 29, 50, 32, 29, 24,
-                    24, 90, 50, 3, 23, 24, 28, 10, 51, 28, 47, 45, 29, 25, 23, 28,
-                    24, 24, 24, 50, 51, 28, 47, 23, 24, 50, 3, 114, 45, 10, 51, 50,
-                    29, 24, 24, 89, 24, 25, 114, 45, 46, 46, 10, 2, 2, 32, 29, 89,
-                    51, 24, 24, 24, 24, 50, 3, 111, 115, 115, 23, 24, 24, 50, 32, 29,
-                    24, 28, 29, 24, 24, 24, 25, 1, 2, 2, 51, 90, 24, 90, 50, 51,
-                    29, 50, 32, 29, 28, 29, 25, 23, 24, 24, 89, 28, 29, 24, 24, 24,
-                    51, 24, 50, 51, 50, 32, 10, 32, 46, 29, 24, 50, 51, 24, 90, 24,
-                    24, 24, 24, 24, 89, 50, 32, 10, 2, 32, 46, 29, 89, 28, 29, 24,
-                    29, 90, 24, 24, 24, 24, 50, 51, 28, 10, 3, 23, 28, 10, 51, 24,
-                    23, 89, 24, 24, 90, 24, 24, 24, 50, 32, 10, 51, 50, 51, 24, 24,
-                    51, 24, 24, 24, 24, 24, 24, 24, 24, 50, 32, 46, 46, 29, 28, 46,
-                    24, 24, 24, 90, 24, 24, 24, 24, 24, 24, 50, 3, 1, 32, 47, 115,
-                    46, 29, 24, 89, 24, 24, 24, 89, 24, 24, 24, 25, 45, 10, 3, 111,
-                    2, 51, 28, 29, 28, 29, 24, 28, 46, 46, 46, 10, 2, 51, 50, 2],
+                 "data":[24, 25, 23, 28, 47, 1, 51, 24, 28, 29, 50, 51, 50, 32, 46, 29,
+                    24, 50, 51, 50, 3, 23, 24, 28, 10, 32, 46, 29, 89, 50, 2, 32,
+                    29, 24, 24, 24, 25, 23, 24, 50, 32, 47, 1, 32, 29, 28, 29, 50,
+                    32, 29, 24, 24, 50, 32, 29, 24, 25, 111, 23, 25, 23, 25, 23, 24,
+                    10, 51, 24, 24, 24, 25, 23, 24, 50, 2, 32, 10, 51, 50, 51, 24,
+                    51, 24, 24, 89, 24, 50, 32, 46, 29, 24, 50, 51, 28, 29, 24, 24,
+                    24, 24, 28, 46, 29, 90, 50, 2, 51, 24, 28, 46, 47, 23, 24, 24,
+                    90, 24, 50, 3, 23, 24, 24, 28, 29, 24, 25, 1, 2, 51, 24, 24,
+                    24, 28, 46, 10, 51, 90, 24, 25, 23, 24, 50, 51, 24, 24, 24, 24,
+                    24, 25, 111, 23, 89, 89, 28, 10, 51, 24, 28, 29, 24, 24, 24, 90,
+                    24, 25, 1, 51, 24, 24, 50, 51, 24, 24, 50, 51, 24, 24, 24, 24,
+                    90, 25, 23, 24, 24, 24, 24, 24, 24, 28, 46, 46, 46, 46, 46, 29,
+                    24, 50, 51, 24, 24, 28, 29, 24, 28, 10, 3, 114, 115, 111, 114, 45,
+                    24, 24, 89, 24, 24, 25, 23, 24, 25, 23, 50, 2, 2, 2, 2, 2,
+                    24, 24, 24, 24, 89, 50, 32, 46, 10, 51, 24, 24, 28, 29, 24, 24,
+                    90, 24, 28, 29, 89, 24, 50, 3, 23, 24, 24, 24, 50, 51, 24, 24],
                  "height":16,
                  "width":16,
                  "x":0,
                  "y":0
                 }, 
                 {
-                 "data":[28, 29, 28, 10, 32, 46, 29, 24, 24, 28, 10, 2, 2, 2, 2, 2,
-                    50, 51, 50, 51, 25, 115, 45, 46, 29, 50, 51, 24, 24, 24, 24, 24,
-                    29, 24, 89, 24, 50, 3, 115, 114, 23, 24, 24, 24, 24, 24, 24, 24,
-                    51, 90, 24, 89, 24, 50, 2, 2, 51, 24, 89, 24, 24, 28, 46, 29,
-                    24, 90, 24, 24, 89, 24, 90, 28, 29, 24, 24, 24, 28, 10, 2, 51,
-                    24, 24, 24, 24, 28, 29, 90, 50, 51, 28, 29, 24, 25, 23, 24, 24,
-                    28, 29, 24, 24, 50, 32, 29, 28, 29, 50, 51, 89, 50, 32, 29, 24,
-                    50, 51, 24, 24, 24, 50, 32, 10, 51, 24, 89, 24, 24, 25, 23, 24,
-                    24, 24, 24, 24, 24, 24, 50, 32, 29, 24, 24, 24, 24, 50, 51, 24,
-                    90, 24, 24, 24, 24, 24, 24, 25, 45, 29, 24, 24, 24, 89, 28, 29,
-                    24, 24, 24, 24, 28, 29, 24, 25, 1, 51, 24, 24, 24, 24, 50, 32,
-                    28, 29, 28, 29, 50, 32, 46, 10, 51, 28, 29, 24, 24, 24, 24, 50,
-                    47, 45, 10, 51, 24, 50, 2, 32, 46, 47, 23, 24, 89, 90, 24, 24,
-                    111, 115, 23, 24, 24, 90, 24, 50, 2, 2, 32, 29, 24, 89, 28, 46,
-                    1, 2, 51, 28, 46, 46, 29, 24, 28, 29, 50, 32, 29, 28, 47, 111,
-                    51, 24, 24, 50, 3, 114, 23, 24, 50, 32, 46, 47, 23, 25, 111, 111],
+                 "data":[89, 24, 24, 24, 89, 24, 28, 47, 23, 50, 51, 24, 25, 1, 0, 0,
+                    29, 28, 46, 29, 24, 28, 10, 3, 23, 89, 24, 24, 50, 32, 0, 0,
+                    51, 50, 2, 51, 24, 25, 45, 10, 51, 24, 89, 24, 24, 25, 0, 0,
+                    24, 24, 28, 46, 46, 10, 2, 51, 24, 24, 28, 29, 89, 50, 0, 0,
+                    89, 24, 50, 2, 2, 51, 89, 24, 24, 90, 25, 23, 24, 24, 0, 0,
+                    24, 24, 24, 24, 90, 28, 29, 24, 24, 24, 50, 51, 24, 24, 0, 0,
+                    24, 24, 89, 24, 24, 25, 23, 24, 24, 24, 24, 24, 24, 28, 0, 0,
+                    24, 24, 89, 89, 24, 50, 32, 29, 24, 24, 24, 28, 29, 25, 0, 0,
+                    24, 24, 24, 24, 24, 89, 50, 32, 29, 24, 24, 50, 51, 50, 0, 0,
+                    24, 24, 24, 24, 24, 24, 90, 50, 32, 29, 28, 29, 24, 24, 0, 0,
+                    24, 28, 46, 46, 29, 24, 89, 24, 50, 51, 50, 51, 24, 24, 0, 0,
+                    89, 50, 2, 2, 32, 46, 46, 29, 24, 24, 24, 24, 24, 89, 0, 0,
+                    46, 46, 46, 46, 47, 112, 1, 51, 90, 24, 24, 24, 28, 46, 0, 0,
+                    3, 115, 1, 2, 2, 2, 32, 29, 24, 24, 28, 46, 10, 2, 0, 0,
+                    50, 2, 51, 24, 24, 24, 25, 23, 24, 24, 50, 2, 32, 29, 0, 0,
+                    24, 24, 24, 24, 24, 24, 25, 23, 90, 24, 24, 24, 25, 23, 0, 0],
                  "height":16,
                  "width":16,
                  "x":16,
                  "y":0
+                }, 
+                {
+                 "data":[24, 89, 50, 51, 89, 28, 29, 50, 51, 24, 24, 24, 24, 24, 24, 24,
+                    24, 89, 28, 29, 90, 25, 45, 46, 29, 24, 24, 24, 89, 89, 24, 24,
+                    24, 90, 25, 45, 29, 50, 2, 2, 51, 90, 24, 24, 24, 24, 24, 24,
+                    24, 90, 50, 2, 32, 29, 89, 24, 24, 24, 24, 90, 24, 24, 24, 28,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                 "height":16,
+                 "width":16,
+                 "x":0,
+                 "y":16
+                }, 
+                {
+                 "data":[24, 24, 24, 24, 24, 24, 50, 32, 29, 24, 24, 24, 50, 51, 0, 0,
+                    24, 24, 28, 29, 24, 24, 24, 50, 32, 29, 24, 24, 24, 24, 0, 0,
+                    90, 24, 50, 32, 29, 24, 24, 24, 50, 51, 24, 24, 24, 24, 0, 0,
+                    46, 29, 24, 25, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+                 "height":16,
+                 "width":16,
+                 "x":16,
+                 "y":16
                 }],
          "class":"Tile",
-         "height":48,
+         "height":32,
          "id":1,
          "name":"\u0421\u043b\u043e\u0439 \u0442\u0430\u0439\u043b\u043e\u0432 1",
          "opacity":1,
-         "startx":-16,
-         "starty":-32,
+         "startx":0,
+         "starty":0,
          "type":"tilelayer",
          "visible":true,
-         "width":48,
+         "width":32,
          "x":0,
          "y":0
         }],
@@ -158,7 +114,7 @@
  "tilesets":[
         {
          "firstgid":1,
-         "source":"TileSets\/TileSet 1.tsj"
+         "source":"..\/TileSets\/TileSet 1.tsj"
         }],
  "tilewidth":16,
  "type":"map",
diff --git a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj
index 3388a9e..aee18cf 100644
--- a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj	
+++ b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj	
@@ -1,16 +1,18 @@
 { "class":"Tile",
  "columns":22,
+ "fillmode":"preserve-aspect-fit",
  "grid":
     {
      "height":24,
      "orientation":"orthogonal",
      "width":24
     },
- "image":"..\/..\/..\/..\/Content\/Textures\/Background\/TilesetFloor.png",
- "imageheight":417,
+ "image":"..\/..\/Textures\/Background\/TilesetFloor.png",
+ "imageheight":416,
  "imagewidth":352,
  "margin":0,
  "name":"TileSet 1",
+ "objectalignment":"topleft",
  "spacing":0,
  "tilecount":572,
  "tiledversion":"1.10.2",
diff --git a/ZoFo/Content/Textures/Background/TilesetFloor.png b/ZoFo/Content/Textures/Background/TilesetFloor.png
index abba7bf..5823d54 100644
Binary files a/ZoFo/Content/Textures/Background/TilesetFloor.png and b/ZoFo/Content/Textures/Background/TilesetFloor.png differ
diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs
index fd67cd1..0c2447e 100644
--- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs
+++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs
@@ -1,6 +1,7 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
@@ -18,7 +19,7 @@ namespace ZoFo.GameCore.GameManagers.MapManager
     {
 
         private static readonly string _templatePath = "Content/MapData/TileMaps/{0}.tmj";
-        private static readonly float _scale = 1.0f;
+        //private static readonly float _scale = 1.0f;
         private List<TileSet> _tileSets = new List<TileSet>();
 
         /// <summary>
@@ -38,7 +39,7 @@ namespace ZoFo.GameCore.GameManagers.MapManager
             List<TileSet> tileSets = new List<TileSet>();
             foreach (TileSetInfo tileSetInfo in tileMap.TileSets) 
             {
-                TileSet tileSet = LoadTileSet("Content/MapData/"+tileSetInfo.Source);
+                TileSet tileSet = LoadTileSet("Content\\MapData\\TileMaps/" + tileSetInfo.Source);
                 tileSet.FirstGid = tileSetInfo.FirstGid;
                 tileSets.Add(tileSet);
             }
@@ -51,22 +52,22 @@ namespace ZoFo.GameCore.GameManagers.MapManager
                     {
                         foreach (var tileSet in tileSets)
                         {
-                            if (tileSet.FirstGid - chunk.Data[i] < 0)
+                            if (tileSet.FirstGid - chunk.Data[i] <= 0)
                             {
                                 int number = chunk.Data[i] - tileSet.FirstGid;
 
-                                int relativeColumn = (number % tileSet.Columns) * tileSet.TileWidth;
-                                int relativeRow = (number / tileSet.Columns) * tileSet.TileHeight;
+                                int relativeColumn = number % tileSet.Columns;
+                                int relativeRow = number / tileSet.Columns;
 
                                 Rectangle sourceRectangle = new Rectangle(relativeColumn * tileSet.TileWidth, relativeRow * tileSet.TileHeight,
-                                   /* relativeColumn * tileSet.TileWidth +*/ tileSet.TileWidth, /*relativeRow * tileSet.TileHeight +*/ tileSet.TileHeight);
+                                   tileSet.TileWidth, tileSet.TileHeight);
 
-                                Vector2 position = new Vector2((i % chunk.Width) * tileSet.TileWidth + chunk.X * chunk.Width, (i / chunk.Height)*tileSet.TileHeight + chunk.Y * chunk.Height) ;
+                                Vector2 position = new Vector2((i % chunk.Width) * tileSet.TileWidth + chunk.X * tileSet.TileWidth, (i / chunk.Height)*tileSet.TileHeight + chunk.Y * tileSet.TileHeight) ;
 
                                 switch (layer.Class)
                                 {
                                     case "Tile":
-                                        AppManager.Instance.server.RegisterGameObject(new MapObject(position, new Vector2(tileSet.TileWidth * _scale, tileSet.TileHeight * _scale), sourceRectangle, "Textures\\TileSets\\"+tileSet.Name)); //fix naming
+                                        AppManager.Instance.server.RegisterGameObject(new MapObject(position, new Vector2(tileSet.TileWidth, tileSet.TileHeight), sourceRectangle, "Textures\\TileSets\\"+tileSet.Name)); //fix naming
                                         break;
                                     case "StopObject":
                                         // new StopObject(position, new Vector2(tileSet.TileWidth * _scale, tileSet.TileHeight * _scale), sourceRectangle, tileSet.Name);
diff --git a/ZoFo/GameCore/GameManagers/MapManager/TileMaps/main.tmj b/ZoFo/GameCore/GameManagers/MapManager/TileMaps/main.tmj
deleted file mode 100644
index a5d33d8..0000000
--- a/ZoFo/GameCore/GameManagers/MapManager/TileMaps/main.tmj
+++ /dev/null
@@ -1,167 +0,0 @@
-{ "compressionlevel":-1,
- "height":20,
- "infinite":true,
- "layers":[
-        {
-         "chunks":[
-                {
-                 "data":[24, 24, 24, 28, 29, 24, 24, 24, 28, 46, 29, 24, 25, 115, 45, 46,
-                    24, 24, 24, 25, 23, 24, 24, 24, 50, 2, 51, 24, 50, 2, 2, 2,
-                    24, 24, 24, 50, 32, 29, 24, 24, 24, 24, 24, 24, 24, 24, 24, 28,
-                    28, 29, 24, 28, 10, 32, 29, 24, 24, 28, 46, 29, 24, 24, 24, 50,
-                    47, 23, 24, 50, 32, 10, 32, 46, 29, 50, 2, 51, 24, 24, 24, 24,
-                    1, 32, 29, 90, 25, 23, 50, 2, 32, 29, 24, 90, 28, 29, 24, 24,
-                    51, 50, 32, 29, 50, 51, 90, 24, 25, 45, 46, 29, 25, 23, 24, 90,
-                    24, 24, 50, 32, 46, 29, 24, 28, 10, 2, 2, 51, 50, 51, 24, 90,
-                    24, 24, 24, 50, 2, 32, 46, 10, 32, 29, 24, 90, 24, 24, 24, 90,
-                    29, 24, 89, 24, 24, 50, 3, 23, 50, 32, 46, 46, 46, 46, 29, 24,
-                    51, 24, 24, 28, 29, 24, 25, 23, 24, 25, 1, 2, 3, 111, 45, 29,
-                    24, 90, 24, 50, 51, 24, 25, 23, 28, 47, 23, 89, 50, 3, 115, 23,
-                    24, 24, 24, 24, 24, 89, 50, 32, 47, 1, 51, 24, 24, 50, 2, 51,
-                    28, 29, 24, 24, 24, 24, 28, 10, 2, 51, 24, 24, 24, 24, 24, 28,
-                    10, 32, 29, 24, 24, 24, 25, 23, 28, 29, 90, 24, 24, 90, 24, 50,
-                    32, 10, 51, 24, 24, 24, 50, 32, 10, 32, 29, 24, 90, 28, 29, 24],
-                 "height":16,
-                 "width":16,
-                 "x":-16,
-                 "y":-16
-                }, 
-                {
-                 "data":[10, 51, 24, 90, 24, 25, 23, 28, 29, 24, 24, 24, 24, 24, 24, 24,
-                    51, 24, 28, 29, 24, 50, 32, 10, 51, 24, 24, 24, 24, 24, 24, 24,
-                    29, 28, 10, 32, 46, 29, 50, 32, 29, 24, 24, 24, 24, 24, 24, 24,
-                    51, 25, 23, 50, 2, 32, 29, 25, 23, 24, 24, 28, 29, 24, 90, 24,
-                    24, 25, 23, 24, 24, 25, 23, 50, 51, 24, 24, 50, 32, 29, 24, 90,
-                    24, 50, 32, 29, 90, 25, 45, 29, 24, 24, 24, 24, 50, 51, 24, 89,
-                    24, 89, 50, 51, 24, 25, 114, 23, 24, 24, 24, 24, 24, 24, 24, 24,
-                    24, 24, 28, 29, 24, 50, 2, 51, 24, 24, 90, 28, 29, 24, 24, 28,
-                    24, 24, 25, 23, 89, 24, 24, 24, 28, 46, 29, 25, 23, 24, 24, 50,
-                    28, 46, 10, 51, 24, 28, 46, 29, 25, 111, 45, 10, 51, 28, 29, 24,
-                    50, 2, 51, 24, 24, 25, 115, 45, 10, 3, 1, 51, 24, 25, 23, 24,
-                    24, 24, 24, 24, 24, 50, 2, 2, 32, 10, 51, 24, 90, 25, 23, 24,
-                    24, 24, 24, 24, 24, 24, 24, 24, 50, 51, 24, 24, 24, 25, 23, 24,
-                    46, 29, 24, 24, 24, 24, 24, 89, 24, 24, 24, 28, 46, 47, 23, 90,
-                    2, 32, 29, 24, 24, 28, 46, 46, 29, 24, 24, 25, 1, 3, 23, 89,
-                    24, 50, 32, 29, 24, 25, 1, 3, 23, 24, 89, 50, 32, 10, 51, 24],
-                 "height":16,
-                 "width":16,
-                 "x":0,
-                 "y":-16
-                }, 
-                {
-                 "data":[24, 24, 24, 24, 90, 24, 89, 24, 89, 24, 50, 51, 89, 24, 24, 24,
-                    24, 28, 29, 28, 29, 24, 24, 24, 24, 28, 29, 24, 24, 24, 28, 29,
-                    24, 25, 23, 50, 51, 24, 24, 28, 29, 50, 51, 24, 24, 24, 25, 45,
-                    90, 50, 51, 28, 29, 24, 24, 25, 23, 24, 24, 28, 29, 24, 50, 3,
-                    24, 24, 28, 10, 51, 90, 90, 50, 51, 24, 24, 50, 51, 24, 24, 50,
-                    24, 24, 25, 45, 29, 24, 28, 29, 24, 24, 24, 24, 24, 28, 29, 24,
-                    90, 24, 50, 2, 51, 28, 10, 51, 90, 24, 28, 29, 24, 25, 45, 46,
-                    29, 90, 24, 24, 24, 50, 51, 24, 24, 28, 10, 32, 46, 10, 3, 1,
-                    32, 29, 24, 90, 24, 24, 24, 24, 28, 47, 23, 50, 2, 51, 50, 51,
-                    25, 23, 24, 24, 28, 46, 46, 46, 47, 114, 45, 29, 24, 24, 24, 24,
-                    50, 32, 29, 24, 50, 3, 111, 111, 115, 111, 1, 32, 29, 24, 24, 24,
-                    24, 50, 51, 24, 28, 10, 2, 2, 2, 2, 32, 10, 51, 24, 24, 89,
-                    24, 24, 89, 90, 25, 23, 24, 24, 24, 24, 50, 32, 46, 46, 29, 89,
-                    24, 24, 24, 90, 25, 23, 89, 24, 28, 29, 90, 50, 2, 2, 51, 24,
-                    24, 24, 24, 28, 10, 51, 24, 28, 47, 45, 29, 24, 24, 24, 24, 24,
-                    24, 24, 24, 25, 23, 24, 90, 50, 2, 2, 32, 46, 46, 46, 46, 46],
-                 "height":16,
-                 "width":16,
-                 "x":16,
-                 "y":-16
-                }, 
-                {
-                 "data":[10, 32, 46, 29, 24, 24, 24, 25, 23, 50, 32, 29, 24, 50, 32, 46,
-                    51, 50, 2, 32, 29, 24, 24, 25, 45, 29, 25, 23, 24, 24, 25, 1,
-                    24, 24, 24, 25, 23, 28, 46, 10, 2, 51, 50, 51, 24, 24, 50, 51,
-                    90, 89, 90, 50, 51, 50, 2, 51, 24, 24, 28, 29, 90, 24, 24, 24,
-                    90, 28, 46, 29, 90, 24, 24, 24, 90, 24, 50, 51, 90, 24, 90, 28,
-                    29, 50, 2, 51, 24, 24, 24, 89, 24, 24, 24, 24, 24, 89, 24, 50,
-                    23, 24, 24, 28, 46, 29, 90, 90, 24, 89, 24, 28, 29, 24, 24, 24,
-                    32, 46, 29, 25, 115, 45, 29, 24, 90, 24, 24, 25, 23, 24, 24, 28,
-                    10, 2, 32, 47, 115, 1, 51, 24, 24, 24, 24, 25, 23, 24, 28, 10,
-                    32, 29, 50, 2, 2, 51, 24, 24, 24, 24, 24, 25, 23, 28, 10, 51,
-                    50, 51, 89, 24, 24, 89, 24, 28, 29, 24, 24, 50, 32, 10, 32, 46,
-                    24, 24, 90, 90, 28, 46, 29, 50, 51, 24, 24, 24, 25, 23, 25, 115,
-                    24, 90, 24, 24, 50, 2, 32, 29, 24, 24, 90, 24, 25, 45, 10, 2,
-                    24, 24, 24, 24, 24, 24, 50, 32, 29, 24, 24, 28, 10, 3, 23, 24,
-                    90, 24, 24, 24, 24, 89, 90, 50, 32, 29, 90, 50, 51, 50, 32, 46,
-                    46, 29, 24, 90, 24, 24, 24, 24, 50, 51, 28, 29, 24, 24, 50, 2],
-                 "height":16,
-                 "width":16,
-                 "x":-16,
-                 "y":0
-                }, 
-                {
-                 "data":[46, 46, 10, 32, 46, 47, 23, 25, 23, 89, 24, 24, 25, 23, 90, 24,
-                    2, 2, 32, 47, 1, 2, 51, 25, 23, 24, 28, 29, 50, 32, 29, 24,
-                    24, 90, 50, 3, 23, 24, 28, 10, 51, 28, 47, 45, 29, 25, 23, 28,
-                    24, 24, 24, 50, 51, 28, 47, 23, 24, 50, 3, 114, 45, 10, 51, 50,
-                    29, 24, 24, 89, 24, 25, 114, 45, 46, 46, 10, 2, 2, 32, 29, 89,
-                    51, 24, 24, 24, 24, 50, 3, 111, 115, 115, 23, 24, 24, 50, 32, 29,
-                    24, 28, 29, 24, 24, 24, 25, 1, 2, 2, 51, 90, 24, 90, 50, 51,
-                    29, 50, 32, 29, 28, 29, 25, 23, 24, 24, 89, 28, 29, 24, 24, 24,
-                    51, 24, 50, 51, 50, 32, 10, 32, 46, 29, 24, 50, 51, 24, 90, 24,
-                    24, 24, 24, 24, 89, 50, 32, 10, 2, 32, 46, 29, 89, 28, 29, 24,
-                    29, 90, 24, 24, 24, 24, 50, 51, 28, 10, 3, 23, 28, 10, 51, 24,
-                    23, 89, 24, 24, 90, 24, 24, 24, 50, 32, 10, 51, 50, 51, 24, 24,
-                    51, 24, 24, 24, 24, 24, 24, 24, 24, 50, 32, 46, 46, 29, 28, 46,
-                    24, 24, 24, 90, 24, 24, 24, 24, 24, 24, 50, 3, 1, 32, 47, 115,
-                    46, 29, 24, 89, 24, 24, 24, 89, 24, 24, 24, 25, 45, 10, 3, 111,
-                    2, 51, 28, 29, 28, 29, 24, 28, 46, 46, 46, 10, 2, 51, 50, 2],
-                 "height":16,
-                 "width":16,
-                 "x":0,
-                 "y":0
-                }, 
-                {
-                 "data":[28, 29, 28, 10, 32, 46, 29, 24, 24, 28, 10, 2, 2, 2, 2, 2,
-                    50, 51, 50, 51, 25, 115, 45, 46, 29, 50, 51, 24, 24, 24, 24, 24,
-                    29, 24, 89, 24, 50, 3, 115, 114, 23, 24, 24, 24, 24, 24, 24, 24,
-                    51, 90, 24, 89, 24, 50, 2, 2, 51, 24, 89, 24, 24, 28, 46, 29,
-                    24, 90, 24, 24, 89, 24, 90, 28, 29, 24, 24, 24, 28, 10, 2, 51,
-                    24, 24, 24, 24, 28, 29, 90, 50, 51, 28, 29, 24, 25, 23, 24, 24,
-                    28, 29, 24, 24, 50, 32, 29, 28, 29, 50, 51, 89, 50, 32, 29, 24,
-                    50, 51, 24, 24, 24, 50, 32, 10, 51, 24, 89, 24, 24, 25, 23, 24,
-                    24, 24, 24, 24, 24, 24, 50, 32, 29, 24, 24, 24, 24, 50, 51, 24,
-                    90, 24, 24, 24, 24, 24, 24, 25, 45, 29, 24, 24, 24, 89, 28, 29,
-                    24, 24, 24, 24, 28, 29, 24, 25, 1, 51, 24, 24, 24, 24, 50, 32,
-                    28, 29, 28, 29, 50, 32, 46, 10, 51, 28, 29, 24, 24, 24, 24, 50,
-                    47, 45, 10, 51, 24, 50, 2, 32, 46, 47, 23, 24, 89, 90, 24, 24,
-                    111, 115, 23, 24, 24, 90, 24, 50, 2, 2, 32, 29, 24, 89, 28, 46,
-                    1, 2, 51, 28, 46, 46, 29, 24, 28, 29, 50, 32, 29, 28, 47, 111,
-                    51, 24, 24, 50, 3, 114, 23, 24, 50, 32, 46, 47, 23, 25, 111, 111],
-                 "height":16,
-                 "width":16,
-                 "x":16,
-                 "y":0
-                }],
-         "class":"Tile",
-         "height":48,
-         "id":1,
-         "name":"\u0421\u043b\u043e\u0439 \u0442\u0430\u0439\u043b\u043e\u0432 1",
-         "opacity":1,
-         "startx":-16,
-         "starty":-32,
-         "type":"tilelayer",
-         "visible":true,
-         "width":48,
-         "x":0,
-         "y":0
-        }],
- "nextlayerid":2,
- "nextobjectid":1,
- "orientation":"orthogonal",
- "renderorder":"right-down",
- "tiledversion":"1.10.2",
- "tileheight":16,
- "tilesets":[
-        {
-         "firstgid":1,
-         "source":"..\/TileSets\/TileSet 1.tsj"
-        }],
- "tilewidth":16,
- "type":"map",
- "version":"1.10",
- "width":30
-}
\ No newline at end of file
diff --git a/ZoFo/GameCore/GameManagers/MapManager/TileMaps/main.tmx b/ZoFo/GameCore/GameManagers/MapManager/TileMaps/main.tmx
deleted file mode 100644
index 4cafd72..0000000
--- a/ZoFo/GameCore/GameManagers/MapManager/TileMaps/main.tmx
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="../TileSets/TileSet 1.tsj"/>
- <layer id="1" name="Слой тайлов 1" width="30" height="20">
-  <data encoding="csv">
-   <chunk x="-16" y="-16" width="16" height="16">
-24,24,24,28,29,24,24,24,28,46,29,24,25,115,45,46,
-24,24,24,25,23,24,24,24,50,2,51,24,50,2,2,2,
-24,24,24,50,32,29,24,24,24,24,24,24,24,24,24,28,
-28,29,24,28,10,32,29,24,24,28,46,29,24,24,24,50,
-47,23,24,50,32,10,32,46,29,50,2,51,24,24,24,24,
-1,32,29,90,25,23,50,2,32,29,24,90,28,29,24,24,
-51,50,32,29,50,51,90,24,25,45,46,29,25,23,24,90,
-24,24,50,32,46,29,24,28,10,2,2,51,50,51,24,90,
-24,24,24,50,2,32,46,10,32,29,24,90,24,24,24,90,
-29,24,89,24,24,50,3,23,50,32,46,46,46,46,29,24,
-51,24,24,28,29,24,25,23,24,25,1,2,3,111,45,29,
-24,90,24,50,51,24,25,23,28,47,23,89,50,3,115,23,
-24,24,24,24,24,89,50,32,47,1,51,24,24,50,2,51,
-28,29,24,24,24,24,28,10,2,51,24,24,24,24,24,28,
-10,32,29,24,24,24,25,23,28,29,90,24,24,90,24,50,
-32,10,51,24,24,24,50,32,10,32,29,24,90,28,29,24
-</chunk>
-   <chunk x="0" y="-16" width="16" height="16">
-10,51,24,90,24,25,23,28,29,24,24,24,24,24,24,24,
-51,24,28,29,24,50,32,10,51,24,24,24,24,24,24,24,
-29,28,10,32,46,29,50,32,29,24,24,24,24,24,24,24,
-51,25,23,50,2,32,29,25,23,24,24,28,29,24,90,24,
-24,25,23,24,24,25,23,50,51,24,24,50,32,29,24,90,
-24,50,32,29,90,25,45,29,24,24,24,24,50,51,24,89,
-24,89,50,51,24,25,114,23,24,24,24,24,24,24,24,24,
-24,24,28,29,24,50,2,51,24,24,90,28,29,24,24,28,
-24,24,25,23,89,24,24,24,28,46,29,25,23,24,24,50,
-28,46,10,51,24,28,46,29,25,111,45,10,51,28,29,24,
-50,2,51,24,24,25,115,45,10,3,1,51,24,25,23,24,
-24,24,24,24,24,50,2,2,32,10,51,24,90,25,23,24,
-24,24,24,24,24,24,24,24,50,51,24,24,24,25,23,24,
-46,29,24,24,24,24,24,89,24,24,24,28,46,47,23,90,
-2,32,29,24,24,28,46,46,29,24,24,25,1,3,23,89,
-24,50,32,29,24,25,1,3,23,24,89,50,32,10,51,24
-</chunk>
-   <chunk x="16" y="-16" width="16" height="16">
-24,24,24,24,90,24,89,24,89,24,50,51,89,24,24,24,
-24,28,29,28,29,24,24,24,24,28,29,24,24,24,28,29,
-24,25,23,50,51,24,24,28,29,50,51,24,24,24,25,45,
-90,50,51,28,29,24,24,25,23,24,24,28,29,24,50,3,
-24,24,28,10,51,90,90,50,51,24,24,50,51,24,24,50,
-24,24,25,45,29,24,28,29,24,24,24,24,24,28,29,24,
-90,24,50,2,51,28,10,51,90,24,28,29,24,25,45,46,
-29,90,24,24,24,50,51,24,24,28,10,32,46,10,3,1,
-32,29,24,90,24,24,24,24,28,47,23,50,2,51,50,51,
-25,23,24,24,28,46,46,46,47,114,45,29,24,24,24,24,
-50,32,29,24,50,3,111,111,115,111,1,32,29,24,24,24,
-24,50,51,24,28,10,2,2,2,2,32,10,51,24,24,89,
-24,24,89,90,25,23,24,24,24,24,50,32,46,46,29,89,
-24,24,24,90,25,23,89,24,28,29,90,50,2,2,51,24,
-24,24,24,28,10,51,24,28,47,45,29,24,24,24,24,24,
-24,24,24,25,23,24,90,50,2,2,32,46,46,46,46,46
-</chunk>
-   <chunk x="-16" y="0" width="16" height="16">
-10,32,46,29,24,24,24,25,23,50,32,29,24,50,32,46,
-51,50,2,32,29,24,24,25,45,29,25,23,24,24,25,1,
-24,24,24,25,23,28,46,10,2,51,50,51,24,24,50,51,
-90,89,90,50,51,50,2,51,24,24,28,29,90,24,24,24,
-90,28,46,29,90,24,24,24,90,24,50,51,90,24,90,28,
-29,50,2,51,24,24,24,89,24,24,24,24,24,89,24,50,
-23,24,24,28,46,29,90,90,24,89,24,28,29,24,24,24,
-32,46,29,25,115,45,29,24,90,24,24,25,23,24,24,28,
-10,2,32,47,115,1,51,24,24,24,24,25,23,24,28,10,
-32,29,50,2,2,51,24,24,24,24,24,25,23,28,10,51,
-50,51,89,24,24,89,24,28,29,24,24,50,32,10,32,46,
-24,24,90,90,28,46,29,50,51,24,24,24,25,23,25,115,
-24,90,24,24,50,2,32,29,24,24,90,24,25,45,10,2,
-24,24,24,24,24,24,50,32,29,24,24,28,10,3,23,24,
-90,24,24,24,24,89,90,50,32,29,90,50,51,50,32,46,
-46,29,24,90,24,24,24,24,50,51,28,29,24,24,50,2
-</chunk>
-   <chunk x="0" y="0" width="16" height="16">
-46,46,10,32,46,47,23,25,23,89,24,24,25,23,90,24,
-2,2,32,47,1,2,51,25,23,24,28,29,50,32,29,24,
-24,90,50,3,23,24,28,10,51,28,47,45,29,25,23,28,
-24,24,24,50,51,28,47,23,24,50,3,114,45,10,51,50,
-29,24,24,89,24,25,114,45,46,46,10,2,2,32,29,89,
-51,24,24,24,24,50,3,111,115,115,23,24,24,50,32,29,
-24,28,29,24,24,24,25,1,2,2,51,90,24,90,50,51,
-29,50,32,29,28,29,25,23,24,24,89,28,29,24,24,24,
-51,24,50,51,50,32,10,32,46,29,24,50,51,24,90,24,
-24,24,24,24,89,50,32,10,2,32,46,29,89,28,29,24,
-29,90,24,24,24,24,50,51,28,10,3,23,28,10,51,24,
-23,89,24,24,90,24,24,24,50,32,10,51,50,51,24,24,
-51,24,24,24,24,24,24,24,24,50,32,46,46,29,28,46,
-24,24,24,90,24,24,24,24,24,24,50,3,1,32,47,115,
-46,29,24,89,24,24,24,89,24,24,24,25,45,10,3,111,
-2,51,28,29,28,29,24,28,46,46,46,10,2,51,50,2
-</chunk>
-   <chunk x="16" y="0" width="16" height="16">
-28,29,28,10,32,46,29,24,24,28,10,2,2,2,2,2,
-50,51,50,51,25,115,45,46,29,50,51,24,24,24,24,24,
-29,24,89,24,50,3,115,114,23,24,24,24,24,24,24,24,
-51,90,24,89,24,50,2,2,51,24,89,24,24,28,46,29,
-24,90,24,24,89,24,90,28,29,24,24,24,28,10,2,51,
-24,24,24,24,28,29,90,50,51,28,29,24,25,23,24,24,
-28,29,24,24,50,32,29,28,29,50,51,89,50,32,29,24,
-50,51,24,24,24,50,32,10,51,24,89,24,24,25,23,24,
-24,24,24,24,24,24,50,32,29,24,24,24,24,50,51,24,
-90,24,24,24,24,24,24,25,45,29,24,24,24,89,28,29,
-24,24,24,24,28,29,24,25,1,51,24,24,24,24,50,32,
-28,29,28,29,50,32,46,10,51,28,29,24,24,24,24,50,
-47,45,10,51,24,50,2,32,46,47,23,24,89,90,24,24,
-111,115,23,24,24,90,24,50,2,2,32,29,24,89,28,46,
-1,2,51,28,46,46,29,24,28,29,50,32,29,28,47,111,
-51,24,24,50,3,114,23,24,50,32,46,47,23,25,111,111
-</chunk>
-  </data>
- </layer>
-</map>
diff --git a/ZoFo/GameCore/GameManagers/MapManager/TileSets/TileSet 1.tsj b/ZoFo/GameCore/GameManagers/MapManager/TileSets/TileSet 1.tsj
deleted file mode 100644
index 3388a9e..0000000
--- a/ZoFo/GameCore/GameManagers/MapManager/TileSets/TileSet 1.tsj	
+++ /dev/null
@@ -1,166 +0,0 @@
-{ "class":"Tile",
- "columns":22,
- "grid":
-    {
-     "height":24,
-     "orientation":"orthogonal",
-     "width":24
-    },
- "image":"..\/..\/..\/..\/Content\/Textures\/Background\/TilesetFloor.png",
- "imageheight":417,
- "imagewidth":352,
- "margin":0,
- "name":"TileSet 1",
- "spacing":0,
- "tilecount":572,
- "tiledversion":"1.10.2",
- "tileheight":16,
- "tiles":[
-        {
-         "id":27,
-         "probability":0.5
-        }, 
-        {
-         "id":28,
-         "probability":0.5
-        }, 
-        {
-         "id":49,
-         "probability":0.5
-        }, 
-        {
-         "id":50,
-         "probability":0.5
-        }, 
-        {
-         "id":88,
-         "probability":0.100000001490116
-        }, 
-        {
-         "id":89,
-         "probability":0.100000001490116
-        }, 
-        {
-         "id":110,
-         "probability":2
-        }, 
-        {
-         "id":111,
-         "probability":0.100000001490116
-        }, 
-        {
-         "id":112,
-         "probability":0.100000001490116
-        }],
- "tilewidth":16,
- "type":"tileset",
- "version":"1.10",
- "wangsets":[
-        {
-         "colors":[
-                {
-                 "color":"#ff0000",
-                 "name":"Sand",
-                 "probability":1,
-                 "tile":23
-                }, 
-                {
-                 "color":"#00ff00",
-                 "name":"SandStone",
-                 "probability":0.3,
-                 "tile":110
-                }],
-         "name":"\u041f\u0435\u0441\u0447\u0430\u043d\u044b\u0439",
-         "tile":-1,
-         "type":"corner",
-         "wangtiles":[
-                {
-                 "tileid":0,
-                 "wangid":[0, 2, 0, 1, 0, 2, 0, 2]
-                }, 
-                {
-                 "tileid":1,
-                 "wangid":[0, 2, 0, 1, 0, 1, 0, 2]
-                }, 
-                {
-                 "tileid":2,
-                 "wangid":[0, 2, 0, 2, 0, 1, 0, 2]
-                }, 
-                {
-                 "tileid":9,
-                 "wangid":[0, 2, 0, 1, 0, 2, 0, 1]
-                }, 
-                {
-                 "tileid":22,
-                 "wangid":[0, 1, 0, 1, 0, 2, 0, 2]
-                }, 
-                {
-                 "tileid":23,
-                 "wangid":[0, 1, 0, 1, 0, 1, 0, 1]
-                }, 
-                {
-                 "tileid":24,
-                 "wangid":[0, 2, 0, 2, 0, 1, 0, 1]
-                }, 
-                {
-                 "tileid":27,
-                 "wangid":[0, 1, 0, 2, 0, 1, 0, 1]
-                }, 
-                {
-                 "tileid":28,
-                 "wangid":[0, 1, 0, 1, 0, 2, 0, 1]
-                }, 
-                {
-                 "tileid":31,
-                 "wangid":[0, 1, 0, 2, 0, 1, 0, 2]
-                }, 
-                {
-                 "tileid":44,
-                 "wangid":[0, 1, 0, 2, 0, 2, 0, 2]
-                }, 
-                {
-                 "tileid":45,
-                 "wangid":[0, 1, 0, 2, 0, 2, 0, 1]
-                }, 
-                {
-                 "tileid":46,
-                 "wangid":[0, 2, 0, 2, 0, 2, 0, 1]
-                }, 
-                {
-                 "tileid":49,
-                 "wangid":[0, 2, 0, 1, 0, 1, 0, 1]
-                }, 
-                {
-                 "tileid":50,
-                 "wangid":[0, 1, 0, 1, 0, 1, 0, 2]
-                }, 
-                {
-                 "tileid":88,
-                 "wangid":[0, 1, 0, 1, 0, 1, 0, 1]
-                }, 
-                {
-                 "tileid":89,
-                 "wangid":[0, 1, 0, 1, 0, 1, 0, 1]
-                }, 
-                {
-                 "tileid":110,
-                 "wangid":[0, 2, 0, 2, 0, 2, 0, 2]
-                }, 
-                {
-                 "tileid":111,
-                 "wangid":[0, 2, 0, 2, 0, 2, 0, 2]
-                }, 
-                {
-                 "tileid":112,
-                 "wangid":[0, 2, 0, 2, 0, 2, 0, 2]
-                }, 
-                {
-                 "tileid":113,
-                 "wangid":[0, 2, 0, 2, 0, 2, 0, 2]
-                }, 
-                {
-                 "tileid":114,
-                 "wangid":[0, 2, 0, 2, 0, 2, 0, 2]
-                }]
-        }]
-}
\ No newline at end of file
diff --git a/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs b/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs
index ae7b8b1..300cbcc 100644
--- a/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs
+++ b/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs
@@ -2,6 +2,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -22,7 +23,6 @@ namespace ZoFo.GameCore.GameObjects.MapObjects
             _sourceRectangle = sourceRectangle;
             graphicsComponent.ObjectDrawRectangle = new Rectangle((int)position.X, (int)position.Y, (int)size.X, (int)size.Y);
             graphicsComponent.BuildComponent(textureName);
-
             graphicsComponent.LoadContent();
 
         }
diff --git a/ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs b/ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs
index f10b40a..c945b77 100644
--- a/ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs
+++ b/ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs
@@ -24,7 +24,7 @@ namespace ZoFo.GameCore.ZoFo_graphics
         private List<Texture2D> textures;
         public List<string> texturesNames; //rethink public and following that errors
         private AnimationContainer currentAnimation;
-        static public int scaling = 5;
+        static public int scaling = 2;
         public int parentId;
         public AnimationContainer CurrentAnimation
         {