diff --git a/assets/NNDungeon.json b/assets/NNDungeon.json
index 0d2b0f1..8483db4 100644
--- a/assets/NNDungeon.json
+++ b/assets/NNDungeon.json
@@ -925,8 +925,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -997,8 +997,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1092,6 +1092,15 @@
                          "value":true
                         }]
                 }, 
+                {
+                 "id":68,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
                 {
                  "id":70,
                  "properties":[
@@ -1145,24 +1154,24 @@
                          "type":"bool",
                          "value":true
                         }]
-                }, 
+                },
+            
                 {
                  "id":80,
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
-                },
-            
+                }, 
                 {
                  "id":81,
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1170,8 +1179,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1179,8 +1188,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1188,8 +1197,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1197,8 +1206,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1206,8 +1215,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1215,8 +1224,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1224,8 +1233,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1233,8 +1242,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1242,8 +1251,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1251,8 +1260,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1260,8 +1269,8 @@
                  "properties":[
                         {
                          "name":"collides",
-                         "type":"string",
-                         "value":"true"
+                         "type":"bool",
+                         "value":true
                         }]
                 }, 
                 {
@@ -1305,7 +1314,8 @@
                          "type":"bool",
                          "value":true
                         }]
-                }, 
+                },
+            
                 {
                  "id":103,
                  "properties":[
@@ -1319,8 +1329,7 @@
                          "type":"bool",
                          "value":true
                         }]
-                },
-            
+                }, 
                 {
                  "id":104,
                  "properties":[
@@ -1339,6 +1348,15 @@
                          "value":true
                         }]
                 }, 
+                {
+                 "id":108,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
                 {
                  "id":110,
                  "properties":[
@@ -1413,6 +1431,24 @@
                          "value":true
                         }]
                 }, 
+                {
+                 "id":118,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":119,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
                 {
                  "id":120,
                  "properties":[
@@ -1448,6 +1484,61 @@
                          "type":"bool",
                          "value":true
                         }]
+                },
+            
+                {
+                 "id":128,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":129,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":138,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":139,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":149,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
+                }, 
+                {
+                 "id":159,
+                 "properties":[
+                        {
+                         "name":"collides",
+                         "type":"bool",
+                         "value":true
+                        }]
                 }],
          "tilewidth":100
         }, 
diff --git a/assets/gulch.json b/assets/gulch.json
index 1da9f5e..12805c7 100644
--- a/assets/gulch.json
+++ b/assets/gulch.json
@@ -4,13 +4,101 @@
  "layers":[
         {
          "chunks":[
+                {
+                 "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+                    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+                    1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738,
+                    12, 12, 12, 5, 5, 5, 4, 4, 4, 4, 12, 12, 5, 5, 5, 4,
+                    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12],
+                 "height":16,
+                 "width":16,
+                 "x":0,
+                 "y":-16
+                }, 
+                {
+                 "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+                    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+                    1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738,
+                    12, 12, 12, 12, 12, 5, 5, 5, 4, 12, 12, 12, 12, 12, 12, 12,
+                    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12],
+                 "height":16,
+                 "width":16,
+                 "x":16,
+                 "y":-16
+                }, 
+                {
+                 "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+                    11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+                    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+                    1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738,
+                    12, 12, 12, 12, 5, 5, 5, 4, 4, 4, 4, 12, 12, 5, 5, 5,
+                    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12],
+                 "height":16,
+                 "width":16,
+                 "x":32,
+                 "y":-16
+                }, 
+                {
+                 "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 45, 0, 0, 0, 0, 0, 0,
+                    11, 11, 11, 11, 11, 11, 11, 11, 11, 55, 0, 0, 0, 0, 0, 0,
+                    24, 24, 24, 24, 24, 24, 24, 24, 24, 45, 0, 0, 0, 0, 0, 0,
+                    1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 1610612738, 55, 0, 0, 0, 0, 0, 0,
+                    4, 12, 12, 12, 12, 12, 5, 5, 5, 45, 0, 0, 0, 0, 0, 0,
+                    12, 12, 12, 12, 12, 12, 12, 12, 12, 55, 0, 0, 0, 0, 0, 0],
+                 "height":16,
+                 "width":16,
+                 "x":48,
+                 "y":-16
+                }, 
                 {
                  "data":[12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
                     12, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
                     12, 14, 14, 14, 14, 15, 14, 14, 14, 14, 15, 14, 14, 15, 14, 15,
-                    6, 6, 6, 6, 6, 7, 8, 6, 6, 6, 6, 6, 14, 14, 14, 15,
-                    6, 6, 6, 6, 6, 17, 18, 6, 6, 6, 6, 6, 6, 6, 13, 13,
-                    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 7, 8, 6, 6, 13,
+                    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 14, 14, 14, 15,
+                    6, 6, 6, 6, 6, 7, 8, 6, 6, 6, 6, 6, 6, 6, 13, 13,
+                    10, 10, 10, 10, 6, 17, 18, 6, 10, 10, 10, 7, 8, 6, 6, 13,
                     10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 17, 18, 6, 6, 6,
                     10, 10, 20, 10, 10, 10, 10, 10, 10, 10, 10, 10, 6, 6, 6, 6,
                     10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 6,
@@ -33,8 +121,8 @@
                     15, 15, 15, 15, 15, 4, 4, 4, 4, 23, 22, 22, 22, 12, 12, 12,
                     13, 15, 15, 15, 15, 4, 4, 4, 4, 23, 23, 12, 12, 12, 12, 14,
                     13, 13, 13, 13, 5, 5, 5, 5, 5, 5, 5, 12, 12, 12, 12, 12,
-                    7, 8, 14, 14, 5, 5, 5, 5, 5, 5, 5, 12, 12, 12, 12, 12,
-                    17, 18, 6, 14, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 12,
+                    6, 7, 8, 14, 5, 5, 5, 5, 5, 5, 5, 12, 12, 12, 12, 12,
+                    6, 17, 18, 14, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 12,
                     6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 12, 12, 12,
                     10, 6, 6, 9, 5, 5, 5, 5, 5, 5, 5, 5, 12, 12, 12, 12,
                     10, 6, 6, 6, 1610612767, 1610612777, 1610612787, 1610612767, 1610612777, 1610612787, 1610612767, 1610612777, 1610612757, 1610612757, 1610612757, 1610612757,
@@ -116,8 +204,8 @@
                 }, 
                 {
                  "data":[6, 6, 6, 6, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-                    7, 8, 6, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-                    17, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+                    6, 7, 8, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+                    6, 17, 18, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
                     5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
                     4, 4, 4, 4, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
                     15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
@@ -267,7 +355,8 @@
                  "width":16,
                  "x":48,
                  "y":32
-                }, 
+                },
+            
                 {
                  "data":[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
                     1610612747, 1, 1610612747, 1, 1610612747, 1, 1610612747, 1, 1610612747, 1, 1610612747, 1, 1610612747, 1, 1610612747, 1,
@@ -356,12 +445,12 @@
                  "x":48,
                  "y":48
                 }],
-         "height":64,
+         "height":80,
          "id":1,
          "name":"main",
          "opacity":1,
          "startx":0,
-         "starty":0,
+         "starty":-16,
          "type":"tilelayer",
          "visible":true,
          "width":64,
@@ -373,7 +462,7 @@
                 {
                  "data":[12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -395,7 +484,7 @@
                 {
                  "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 35, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 28, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -417,7 +506,7 @@
                 {
                  "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 35, 0, 0, 0, 28, 29, 0, 0, 36, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 38, 39, 0, 0, 0, 0, 0, 0, 0,
@@ -426,7 +515,7 @@
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -449,8 +538,8 @@
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 2684354595, 2684354596, 2684354594, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 26, 27, 60, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 26, 27, 19, 28, 29, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 6, 38, 39, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 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,
@@ -463,8 +552,8 @@
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 69, 0, 40, 0, 68, 0, 70, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 79, 0, 50, 0, 78, 0, 80, 0, 0, 0, 0, 0, 0, 0,
@@ -486,7 +575,7 @@
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, 0, 19, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 3221225551, 0, 3221225552, 0, 0, 0, 68, 0, 69, 0, 0, 0,
                     0, 0, 0, 0, 3221225541, 0, 3221225542, 0, 0, 0, 78, 0, 79, 0, 0, 0,
@@ -506,9 +595,9 @@
                  "data":[0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 35,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 27, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 66, 67, 0, 0, 40, 0, 68, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 78, 0, 0, 0, 0, 0,
@@ -533,11 +622,11 @@
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 90, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 100, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 89, 90, 0, 0, 0, 0, 89, 90, 0, 0, 0, 0, 89, 90, 0,
                     0, 99, 100, 0, 0, 0, 0, 99, 100, 0, 0, 0, 0, 99, 100, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
@@ -574,12 +663,12 @@
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 66, 67, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 66, 67, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 66, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, 0, 0,
@@ -622,7 +711,7 @@
                     99, 100, 0, 0, 0, 0, 0, 0, 99, 100, 0, 99, 100, 99, 100, 0,
                     0, 59, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -644,7 +733,7 @@
                     0, 60, 99, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -658,15 +747,15 @@
                 }, 
                 {
                  "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0, 0, 3221225552, 0, 0, 0, 0, 0, 0, 0, 68,
-                    0, 0, 0, 0, 0, 0, 0, 3221225542, 0, 0, 0, 0, 0, 60, 0, 78,
+                    0, 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0, 0, 80, 0, 0, 0, 0, 0, 60, 0, 0,
                     90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 90,
                     100, 0, 0, 0, 0, 0, 0, 0, 89, 90, 0, 0, 0, 0, 99, 100,
                     90, 0, 0, 0, 0, 0, 0, 0, 99, 100, 0, 0, 0, 0, 0, 89,
                     100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -680,15 +769,15 @@
                 }, 
                 {
                  "data":[0, 0, 0, 0, 0, 59, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 3221225551, 59, 47, 48, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 3221225541, 60, 57, 58, 57, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 59, 47, 48, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 60, 57, 58, 57, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 59, 0, 0, 59, 60, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19,
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -783,8 +872,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2696.42424242424,
-                 "y":3282.84848484848
+                 "x":2696.42,
+                 "y":3282.85
                 }, 
                 {
                  "gid":101,
@@ -829,8 +918,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2193.51515151515,
-                 "y":3556.90909090909
+                 "x":2193.52,
+                 "y":3556.91
                 }, 
                 {
                  "gid":111,
@@ -875,8 +964,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":4020.66666666667,
-                 "y":3205.15151515152
+                 "x":4020.67,
+                 "y":3205.15
                 }, 
                 {
                  "gid":101,
@@ -898,8 +987,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":5568.06060606061,
-                 "y":3414.36363636364
+                 "x":5568.06,
+                 "y":3414.36
                 }, 
                 {
                  "gid":101,
@@ -921,36 +1010,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":4244.42424242424,
-                 "y":3644.90909090909
-                }, 
-                {
-                 "gid":115,
-                 "height":100,
-                 "id":15,
-                 "name":"",
-                 "properties":[
-                        {
-                         "name":"garbage",
-                         "type":"int",
-                         "value":1
-                        }, 
-                        {
-                         "name":"patrolX",
-                         "type":"int",
-                         "value":600
-                        }, 
-                        {
-                         "name":"speed",
-                         "type":"int",
-                         "value":300
-                        }],
-                 "rotation":0,
-                 "type":"",
-                 "visible":true,
-                 "width":100,
-                 "x":2140.55,
-                 "y":1386.61
+                 "x":4244.42,
+                 "y":3644.91
                 }, 
                 {
                  "gid":113,
@@ -977,8 +1038,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2501.5196969697,
-                 "y":1501.51060606061
+                 "x":2501.52,
+                 "y":1501.51
                 }, 
                 {
                  "gid":113,
@@ -1033,8 +1094,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2804.55,
-                 "y":701.515
+                 "x":2416.55,
+                 "y":689.515
                 }, 
                 {
                  "gid":101,
@@ -1056,8 +1117,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2880.30696969697,
-                 "y":2289.38939393939
+                 "x":2880.31,
+                 "y":2289.39
                 }, 
                 {
                  "gid":101,
@@ -1079,8 +1140,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2895.45939393939,
-                 "y":1501.51090909091
+                 "x":2895.46,
+                 "y":1501.51
                 }, 
                 {
                  "gid":101,
@@ -1102,10 +1163,9 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":1895.45,
-                 "y":398.485
-                },
-            
+                 "x":2651.45,
+                 "y":-105.515
+                }, 
                 {
                  "gid":111,
                  "height":100,
@@ -1128,7 +1188,8 @@
                  "width":100,
                  "x":765.758,
                  "y":2082.61
-                }, 
+                },
+            
                 {
                  "gid":111,
                  "height":100,
@@ -1172,8 +1233,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2210.61,
-                 "y":598.485
+                 "x":1850.61,
+                 "y":62.485
                 }, 
                 {
                  "gid":111,
@@ -1218,8 +1279,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2983.33,
-                 "y":243.939
+                 "x":4015.33,
+                 "y":75.939
                 }, 
                 {
                  "gid":111,
@@ -1241,8 +1302,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":4171.21,
-                 "y":192.424
+                 "x":3519.21,
+                 "y":-115.576
                 }, 
                 {
                  "gid":111,
@@ -1264,8 +1325,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":3513.63272727273,
-                 "y":1801.51909090909
+                 "x":3513.63,
+                 "y":1801.52
                 }, 
                 {
                  "gid":101,
@@ -1343,8 +1404,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":2795.45454545455,
-                 "y":5304.54545454545
+                 "x":2795.45,
+                 "y":5304.55
                 }, 
                 {
                  "gid":113,
@@ -1371,8 +1432,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":3710.60606060606,
-                 "y":3207.57575757576
+                 "x":3710.61,
+                 "y":3207.58
                 }, 
                 {
                  "gid":111,
@@ -1394,8 +1455,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":601.515151515152,
-                 "y":5295.45454545455
+                 "x":601.515,
+                 "y":5295.45
                 }, 
                 {
                  "gid":111,
@@ -1417,7 +1478,7 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":204.545454545455,
+                 "x":204.545,
                  "y":5500
                 }, 
                 {
@@ -1440,7 +1501,7 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":746.969696969697,
+                 "x":746.97,
                  "y":5600
                 }, 
                 {
@@ -1473,7 +1534,7 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":5598.48484848485,
+                 "x":5598.48,
                  "y":5500
                 }, 
                 {
@@ -1501,10 +1562,9 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":5343.93939393939,
-                 "y":3307.57575757576
-                },
-            
+                 "x":5343.94,
+                 "y":3307.58
+                }, 
                 {
                  "gid":101,
                  "height":100,
@@ -1530,9 +1590,10 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":4405.27621212121,
-                 "y":2705.87757575758
-                }, 
+                 "x":4405.28,
+                 "y":2705.88
+                },
+            
                 {
                  "gid":101,
                  "height":100,
@@ -1553,7 +1614,7 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":4092.66257575758,
+                 "x":4092.66,
                  "y":2900
                 }, 
                 {
@@ -1581,7 +1642,7 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":3810.36772727273,
+                 "x":3810.37,
                  "y":2332.55
                 }, 
                 {
@@ -1609,8 +1670,8 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":5319.69696969697,
-                 "y":2462.12121212121
+                 "x":5319.7,
+                 "y":2462.12
                 }, 
                 {
                  "gid":113,
@@ -1637,8 +1698,54 @@
                  "type":"",
                  "visible":true,
                  "width":100,
-                 "x":5546.9696969697,
-                 "y":2834.84848484848
+                 "x":5546.97,
+                 "y":2834.85
+                }, 
+                {
+                 "gid":101,
+                 "height":100,
+                 "id":54,
+                 "name":"",
+                 "properties":[
+                        {
+                         "name":"fire",
+                         "type":"int",
+                         "value":1500
+                        }, 
+                        {
+                         "name":"patrolX",
+                         "type":"int",
+                         "value":-500
+                        }],
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":100,
+                 "x":1250,
+                 "y":-154
+                }, 
+                {
+                 "gid":101,
+                 "height":100,
+                 "id":55,
+                 "name":"",
+                 "properties":[
+                        {
+                         "name":"fire",
+                         "type":"int",
+                         "value":1500
+                        }, 
+                        {
+                         "name":"patrolX",
+                         "type":"int",
+                         "value":-500
+                        }],
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":100,
+                 "x":5542,
+                 "y":-154
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -1669,7 +1776,7 @@
          "y":0
         }],
  "nextlayerid":7,
- "nextobjectid":54,
+ "nextobjectid":56,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.11.2",
diff --git a/raw/NNDungeon.tmx b/raw/NNDungeon.tmx
index 24b6f53..ca233d2 100644
--- a/raw/NNDungeon.tmx
+++ b/raw/NNDungeon.tmx
@@ -37,7 +37,7 @@
   </tile>
   <tile id="8">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="9">
@@ -77,7 +77,7 @@
   </tile>
   <tile id="18">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="20">
@@ -130,6 +130,11 @@
     <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
+  <tile id="68">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
   <tile id="70">
    <properties>
     <property name="collides" type="bool" value="true"/>
@@ -162,67 +167,67 @@
   </tile>
   <tile id="80">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="81">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="82">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="83">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="84">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="85">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="86">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="87">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="88">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="94">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="96">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="97">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="98">
    <properties>
-    <property name="collides" value="true"/>
+    <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
   <tile id="100">
@@ -259,6 +264,11 @@
     <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
+  <tile id="108">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
   <tile id="110">
    <properties>
     <property name="collides" type="bool" value="true"/>
@@ -293,6 +303,16 @@
     <property name="collides" type="bool" value="true"/>
    </properties>
   </tile>
+  <tile id="118">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
+  <tile id="119">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
   <tile id="120">
    <properties>
     <property name="lockedDoor" type="bool" value="true"/>
@@ -313,6 +333,36 @@
     <property name="lockedDoor" type="bool" value="true"/>
    </properties>
   </tile>
+  <tile id="128">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
+  <tile id="129">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
+  <tile id="138">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
+  <tile id="139">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
+  <tile id="149">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
+  <tile id="159">
+   <properties>
+    <property name="collides" type="bool" value="true"/>
+   </properties>
+  </tile>
  </tileset>
  <tileset firstgid="201" name="99boy-tiles" tilewidth="100" tileheight="100" tilecount="100" columns="10">
   <image source="../assets/99boy-tiles.png" width="1000" height="1000"/>
diff --git a/raw/Tile-Project-Legends.tiled-session b/raw/Tile-Project-Legends.tiled-session
index 78a6d3a..2c0fc3c 100644
--- a/raw/Tile-Project-Legends.tiled-session
+++ b/raw/Tile-Project-Legends.tiled-session
@@ -3,7 +3,7 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "NNDungeon.tmx",
+    "activeFile": "gulch.tmx",
     "expandedProjectPaths": [
         "."
     ],
@@ -14,14 +14,14 @@
         },
         "NNDungeon.tmx": {
             "expandedObjectLayers": [
-                5,
-                3
+                3,
+                5
             ],
             "scale": 0.33,
             "selectedLayer": 2,
             "viewCenter": {
-                "x": 3886.363636363636,
-                "y": 1003.0303030303032
+                "x": 4722.727272727273,
+                "y": 1472.7272727272727
             }
         },
         "NNDungeon.tmx#99boy-tiles": {
@@ -45,11 +45,11 @@
             "expandedObjectLayers": [
                 5
             ],
-            "scale": 0.33,
-            "selectedLayer": 2,
+            "scale": 0.25,
+            "selectedLayer": 1,
             "viewCenter": {
-                "x": 3634.848484848485,
-                "y": 4763.636363636364
+                "x": 786,
+                "y": 672
             }
         },
         "gulch.tmx#99boy-tiles": {
@@ -75,10 +75,10 @@
         "NNDungeon.tmx"
     ],
     "project": "Tile-Project-Legends.tiled-project",
-    "property.type": "int",
+    "property.type": "bool",
     "recentFiles": [
-        "gulch.tmx",
         "NNDungeon.tmx",
+        "gulch.tmx",
         "gluch.tmx"
     ],
     "tileset.embedInMap": true,
diff --git a/raw/gulch.tmx b/raw/gulch.tmx
index 461c5f5..2776ca5 100644
--- a/raw/gulch.tmx
+++ b/raw/gulch.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="16" height="9" tilewidth="100" tileheight="100" infinite="1" nextlayerid="7" nextobjectid="54">
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="16" height="9" tilewidth="100" tileheight="100" infinite="1" nextlayerid="7" nextobjectid="56">
  <editorsettings>
   <export target="../assets/gulch.json" format="json"/>
  </editorsettings>
@@ -291,13 +291,85 @@
  </tileset>
  <layer id="1" name="main" width="16" height="9">
   <data encoding="csv">
+   <chunk x="0" y="-16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,
+1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,
+12,12,12,5,5,5,4,4,4,4,12,12,5,5,5,4,
+12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12
+</chunk>
+   <chunk x="16" y="-16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,
+1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,
+12,12,12,12,12,5,5,5,4,12,12,12,12,12,12,12,
+12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12
+</chunk>
+   <chunk x="32" y="-16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,
+1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,
+12,12,12,12,5,5,5,4,4,4,4,12,12,5,5,5,
+12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12
+</chunk>
+   <chunk x="48" y="-16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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,1,1,1,1,1,1,1,1,45,0,0,0,0,0,0,
+11,11,11,11,11,11,11,11,11,55,0,0,0,0,0,0,
+24,24,24,24,24,24,24,24,24,45,0,0,0,0,0,0,
+1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,1610612738,55,0,0,0,0,0,0,
+4,12,12,12,12,12,5,5,5,45,0,0,0,0,0,0,
+12,12,12,12,12,12,12,12,12,55,0,0,0,0,0,0
+</chunk>
    <chunk x="0" y="0" width="16" height="16">
 12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
 12,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
 12,14,14,14,14,15,14,14,14,14,15,14,14,15,14,15,
-6,6,6,6,6,7,8,6,6,6,6,6,14,14,14,15,
-6,6,6,6,6,17,18,6,6,6,6,6,6,6,13,13,
-10,10,10,10,10,10,10,10,10,10,10,7,8,6,6,13,
+6,6,6,6,6,6,6,6,6,6,6,6,14,14,14,15,
+6,6,6,6,6,7,8,6,6,6,6,6,6,6,13,13,
+10,10,10,10,6,17,18,6,10,10,10,7,8,6,6,13,
 10,10,10,10,10,10,10,10,10,10,10,17,18,6,6,6,
 10,10,20,10,10,10,10,10,10,10,10,10,6,6,6,6,
 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,6,
@@ -316,8 +388,8 @@
 15,15,15,15,15,4,4,4,4,23,22,22,22,12,12,12,
 13,15,15,15,15,4,4,4,4,23,23,12,12,12,12,14,
 13,13,13,13,5,5,5,5,5,5,5,12,12,12,12,12,
-7,8,14,14,5,5,5,5,5,5,5,12,12,12,12,12,
-17,18,6,14,5,5,5,5,5,5,5,5,5,5,5,12,
+6,7,8,14,5,5,5,5,5,5,5,12,12,12,12,12,
+6,17,18,14,5,5,5,5,5,5,5,5,5,5,5,12,
 6,6,6,6,5,5,5,5,5,5,5,5,5,12,12,12,
 10,6,6,9,5,5,5,5,5,5,5,5,12,12,12,12,
 10,6,6,6,1610612767,1610612777,1610612787,1610612767,1610612777,1610612787,1610612767,1610612777,1610612757,1610612757,1610612757,1610612757,
@@ -383,8 +455,8 @@
 </chunk>
    <chunk x="16" y="16" width="16" height="16">
 6,6,6,6,13,13,13,13,13,13,13,13,13,13,13,13,
-7,8,6,14,14,14,14,14,14,14,14,14,14,14,14,14,
-17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+6,7,8,14,14,14,14,14,14,14,14,14,14,14,14,14,
+6,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
 4,4,4,4,15,15,15,15,15,15,15,15,15,15,15,15,
 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
@@ -586,7 +658,7 @@
    <chunk x="0" y="0" width="16" height="16">
 12,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,36,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -604,7 +676,7 @@
    <chunk x="16" y="0" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,35,0,0,0,0,0,36,0,0,0,0,0,0,0,0,
 0,0,0,0,28,29,0,0,0,0,0,0,0,0,0,0,
@@ -622,7 +694,7 @@
    <chunk x="32" y="0" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,35,0,0,0,28,29,0,0,36,0,0,0,0,
 0,0,0,0,0,0,0,38,39,0,0,0,0,0,0,0,
@@ -631,7 +703,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -650,8 +722,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,2684354595,2684354596,2684354594,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,26,27,60,0,0,0,0,0,0,0,
+0,0,0,0,26,27,19,28,29,0,0,0,0,0,0,0,
+0,0,0,0,0,0,6,38,39,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
@@ -660,8 +732,8 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,36,0,0,0,0,0,34,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,69,0,40,0,68,0,70,0,0,0,0,0,0,0,
 0,0,79,0,50,0,78,0,80,0,0,0,0,0,0,0,
@@ -679,7 +751,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,34,0,0,0,0,19,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,3221225551,0,3221225552,0,0,0,68,0,69,0,0,0,
 0,0,0,0,3221225541,0,3221225542,0,0,0,78,0,79,0,0,0,
@@ -695,9 +767,9 @@
 0,0,0,0,0,0,0,0,26,27,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,26,27,35,
+0,0,0,0,0,0,0,0,0,0,0,0,0,26,27,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,66,67,0,0,40,0,68,0,0,0,0,0,
 0,0,0,0,0,0,0,0,50,0,78,0,0,0,0,0,
@@ -718,11 +790,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,89,90,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,99,100,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,89,90,0,0,0,0,89,90,0,0,0,0,89,90,0,
 0,99,100,0,0,0,0,99,100,0,0,0,0,99,100,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -751,12 +823,12 @@
 0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,78,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,66,67,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,66,67,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,66,67,0,0,0,0,0,0,0,0,0,70,0,0,
@@ -791,7 +863,7 @@
 99,100,0,0,0,0,0,0,99,100,0,99,100,99,100,0,
 0,59,60,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -809,7 +881,7 @@
 0,60,99,100,0,0,0,0,0,0,0,0,0,0,0,99,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -819,15 +891,15 @@
 </chunk>
    <chunk x="32" y="48" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,3221225552,0,0,0,0,0,0,0,68,
-0,0,0,0,0,0,0,3221225542,0,0,0,0,0,60,0,78,
+0,0,0,0,0,0,0,70,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,80,0,0,0,0,0,60,0,0,
 90,0,0,0,0,0,0,0,0,0,0,0,0,0,89,90,
 100,0,0,0,0,0,0,0,89,90,0,0,0,0,99,100,
 90,0,0,0,0,0,0,0,99,100,0,0,0,0,0,89,
 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,99,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -837,15 +909,15 @@
 </chunk>
    <chunk x="48" y="48" width="16" height="16">
 0,0,0,0,0,59,60,0,0,0,0,0,0,0,0,0,
-0,3221225551,59,47,48,47,48,0,0,0,0,0,0,0,0,0,
-0,3221225541,60,57,58,57,58,0,0,0,0,0,0,0,0,0,
+0,0,59,47,48,47,48,0,0,0,0,0,0,0,0,0,
+0,0,60,57,58,57,58,0,0,0,0,0,0,0,0,0,
 0,0,0,59,0,0,59,60,0,0,0,0,0,0,0,0,
 0,0,0,0,0,60,0,0,0,0,0,0,0,0,0,0,
 90,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -910,13 +982,6 @@
     <property name="patrolX" type="int" value="-500"/>
    </properties>
   </object>
-  <object id="15" gid="115" x="2140.55" y="1386.61" width="100" height="100">
-   <properties>
-    <property name="garbage" type="int" value="1"/>
-    <property name="patrolX" type="int" value="600"/>
-    <property name="speed" type="int" value="300"/>
-   </properties>
-  </object>
   <object id="18" gid="113" x="2501.52" y="1501.51" width="100" height="100">
    <properties>
     <property name="fire" type="int" value="800"/>
@@ -931,7 +996,7 @@
     <property name="patrolY" type="int" value="200"/>
    </properties>
   </object>
-  <object id="20" gid="113" x="2804.55" y="701.515" width="100" height="100">
+  <object id="20" gid="113" x="2416.55" y="689.515" width="100" height="100">
    <properties>
     <property name="fire" type="int" value="800"/>
     <property name="patrolX" type="int" value="-800"/>
@@ -950,7 +1015,7 @@
     <property name="patrolX" type="int" value="-500"/>
    </properties>
   </object>
-  <object id="23" gid="101" x="1895.45" y="398.485" width="100" height="100">
+  <object id="23" gid="101" x="2651.45" y="-105.515" width="100" height="100">
    <properties>
     <property name="fire" type="int" value="1500"/>
     <property name="patrolX" type="int" value="-500"/>
@@ -968,7 +1033,7 @@
     <property name="patrolX" type="int" value="700"/>
    </properties>
   </object>
-  <object id="32" gid="111" x="2210.61" y="598.485" width="100" height="100">
+  <object id="32" gid="111" x="1850.61" y="62.485" width="100" height="100">
    <properties>
     <property name="fire" type="int" value="2000"/>
     <property name="patrolX" type="int" value="700"/>
@@ -980,13 +1045,13 @@
     <property name="patrolX" type="int" value="700"/>
    </properties>
   </object>
-  <object id="34" gid="111" x="2983.33" y="243.939" width="100" height="100">
+  <object id="34" gid="111" x="4015.33" y="75.939" width="100" height="100">
    <properties>
     <property name="fire" type="int" value="2000"/>
     <property name="patrolX" type="int" value="700"/>
    </properties>
   </object>
-  <object id="35" gid="111" x="4171.21" y="192.424" width="100" height="100">
+  <object id="35" gid="111" x="3519.21" y="-115.576" width="100" height="100">
    <properties>
     <property name="fire" type="int" value="2000"/>
     <property name="patrolX" type="int" value="700"/>
@@ -1092,6 +1157,18 @@
     <property name="patrolY" type="int" value="-400"/>
    </properties>
   </object>
+  <object id="54" gid="101" x="1250" y="-154" width="100" height="100">
+   <properties>
+    <property name="fire" type="int" value="1500"/>
+    <property name="patrolX" type="int" value="-500"/>
+   </properties>
+  </object>
+  <object id="55" gid="101" x="5542" y="-154" width="100" height="100">
+   <properties>
+    <property name="fire" type="int" value="1500"/>
+    <property name="patrolX" type="int" value="-500"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup id="6" name="zone">
   <object id="37" name="99Dungeon" x="5614.67" y="898" width="91.3333" height="201.333"/>
diff --git a/src/globalState.js b/src/globalState.js
new file mode 100644
index 0000000..ea152ac
--- /dev/null
+++ b/src/globalState.js
@@ -0,0 +1,66 @@
+export class GlobalState {
+    constructor() {
+        this.playerData = {
+            hearts: 3,
+            maxHearts: 3,
+            score: 0,
+            inventory: [],
+            upgrades: []
+        };
+    }
+
+    get hearts() {
+        return this.playerData.hearts;
+    }
+
+    set hearts(value) {
+        if (value < 0) {
+            throw new Error("Hearts cannot be less than 0");
+        }
+        this.playerData.hearts = value;
+    }
+
+    get maxHearts() {
+        return this.playerData.maxHearts;
+    }
+
+    set maxHearts(value) {
+        if (value < 0) {
+            throw new Error("Max hearts cannot be less than 0");
+        }
+        this.playerData.maxHearts = value;
+    }
+
+    get score() {
+        return this.playerData.score;
+    }
+
+    set score(value) {
+        if (value < 0) {
+            throw new Error("Score cannot be less than 0");
+        }
+        this.playerData.score = value;
+    }
+
+    get inventory() {
+        return [...this.playerData.inventory]; // Return a copy to prevent external modification
+    }
+
+    set inventory(value) {
+        if (!Array.isArray(value)) {
+            throw new Error("Inventory must be an array");
+        }
+        this.playerData.inventory = value;
+    }
+
+    get upgrades() {
+        return [...this.playerData.upgrades]; // Return a copy to prevent external modification
+    }
+
+    set upgrades(value) {
+        if (!Array.isArray(value)) {
+            throw new Error("Upgrades must be an array");
+        }
+        this.playerData.upgrades = value;
+    }
+}
\ No newline at end of file
diff --git a/src/scenes/MenuScene.js b/src/scenes/MenuScene.js
index 2fdc8ed..11db831 100644
--- a/src/scenes/MenuScene.js
+++ b/src/scenes/MenuScene.js
@@ -69,8 +69,8 @@ export class MenuScene extends Phaser.Scene {
         this.tweens.add({
             targets: logo,
             scale: 1.2,
-            delay: 1000,
-            duration: 3000,
+            delay: 500,
+            duration: 2000,
             ease: 'Power2',
             onComplete: () => {
                 this.tweens.add({