diff --git a/assets/maps/test.tmj b/assets/maps/test.tmj
index ec4ee4f..f23e5dd 100644
--- a/assets/maps/test.tmj
+++ b/assets/maps/test.tmj
@@ -10,26 +10,26 @@
             28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
             55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
             1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
-            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
-            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
-            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
-            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 191, 273, 192, 273, 273, 192, 273, 273, 193, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
-            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 217, 56, 217, 55, 56, 217, 55, 56, 245, 273, 193, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
-            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 217, 2, 217, 1, 2, 217, 1, 2, 3, 1, 245, 193, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
-            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 217, 29, 217, 28, 29, 217, 28, 29, 30, 28, 29, 217, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
-            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 191, 273, 273, 273, 273, 273, 273, 193, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 217, 56, 217, 55, 56, 217, 55, 190, 57, 55, 56, 217, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
-            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 191, 273, 247, 2, 3, 1, 2, 3, 1, 245, 273, 273, 193, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 191, 247, 2, 244, 1, 2, 217, 1, 217, 3, 1, 2, 217, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
-            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 191, 247, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 245, 273, 273, 273, 193, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 217, 28, 29, 30, 28, 29, 217, 28, 217, 30, 28, 29, 217, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
-            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 191, 247, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 245, 273, 273, 193, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 217, 55, 56, 191, 193, 56, 217, 55, 217, 57, 55, 56, 217, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
-            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 191, 247, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 245, 273, 273, 193, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 217, 1, 272, 247, 217, 2, 217, 1, 217, 3, 1, 2, 217, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
-            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 191, 247, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 245, 193, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 217, 28, 29, 30, 217, 29, 217, 28, 217, 30, 28, 29, 217, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
-            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 191, 247, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 245, 273, 193, 55, 56, 57, 55, 56, 57, 55, 56, 217, 55, 56, 57, 217, 56, 217, 55, 217, 57, 55, 56, 217, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
-            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 217, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 245, 193, 2, 3, 1, 2, 3, 1, 2, 218, 273, 274, 3, 217, 2, 217, 1, 217, 3, 1, 2, 217, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
-            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 191, 247, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 245, 193, 30, 28, 29, 30, 28, 29, 217, 28, 29, 30, 217, 29, 244, 28, 217, 30, 28, 29, 217, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
-            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 217, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 245, 193, 55, 56, 57, 55, 56, 217, 55, 56, 57, 217, 56, 57, 55, 217, 57, 55, 56, 217, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
-            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 191, 247, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 245, 193, 2, 3, 1, 2, 217, 1, 2, 3, 217, 2, 3, 1, 217, 3, 1, 2, 217, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
-            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 217, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 245, 193, 30, 28, 29, 245, 273, 273, 273, 246, 273, 273, 273, 246, 273, 273, 273, 247, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
-            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 217, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 245, 193, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 1, 2, 3, 3, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 1, 2, 3, 3, 30, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
+            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 1, 2, 3, 30, 1, 2, 3, 3, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 1, 2, 1, 2, 3, 57, 1, 2, 3, 30, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 1, 2, 1, 1, 1, 1, 1, 2, 3, 3, 3, 3, 3, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
+            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 28, 28, 28, 1, 2, 3, 3, 30, 30, 30, 30, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 1, 2, 55, 55, 55, 1, 2, 3, 30, 57, 57, 57, 57, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 191, 273, 273, 273, 273, 273, 273, 193, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 1, 2, 3, 3, 2, 3, 28, 1, 2, 3, 3, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
+            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 191, 273, 247, 2, 3, 1, 2, 3, 1, 245, 273, 273, 193, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 30, 3, 1, 55, 1, 2, 3, 30, 3, 55, 56, 57, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 191, 247, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 245, 273, 273, 273, 193, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 1, 2, 3, 57, 30, 3, 55, 1, 2, 3, 57, 30, 55, 56, 57, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 191, 247, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 245, 273, 273, 193, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 1, 2, 3, 56, 1, 2, 3, 2, 3, 30, 3, 3, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
+            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 191, 247, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 245, 273, 273, 193, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 3, 3, 3, 57, 30, 30, 55, 56, 57, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 191, 247, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 245, 193, 29, 30, 28, 29, 30, 28, 29, 30, 1, 2, 1, 2, 3, 1, 2, 3, 30, 3, 57, 57, 55, 56, 57, 3, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 191, 247, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 245, 273, 193, 55, 56, 57, 55, 56, 57, 1, 1, 1, 2, 1, 28, 29, 30, 57, 30, 55, 56, 55, 56, 57, 30, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
+            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 217, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 245, 193, 2, 3, 1, 2, 3, 28, 1, 1, 1, 28, 55, 56, 57, 57, 57, 55, 56, 55, 56, 57, 57, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 191, 247, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 245, 193, 30, 28, 29, 30, 55, 1, 28, 28, 55, 55, 56, 57, 56, 57, 55, 56, 57, 55, 56, 57, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 217, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 245, 193, 55, 56, 57, 55, 28, 55, 55, 55, 56, 57, 55, 56, 57, 2, 3, 1, 55, 56, 57, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
+            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 191, 247, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 245, 193, 2, 3, 1, 55, 28, 28, 28, 55, 55, 56, 57, 1, 1, 1, 28, 55, 56, 57, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 217, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 245, 193, 30, 28, 29, 55, 55, 55, 55, 56, 57, 55, 28, 28, 28, 55, 55, 56, 57, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 217, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 245, 193, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 55, 55, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
             1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 191, 247, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 217, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2,
             28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 217, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 245, 193, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29,
             55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 217, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 245, 193, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56,
@@ -384,8 +384,8 @@
                  "type":"",
                  "visible":true,
                  "width":10,
-                 "x":914.186666666667,
-                 "y":396.083666666667
+                 "x":1164.85366666667,
+                 "y":474.084
                 }],
          "opacity":1,
          "type":"objectgroup",
diff --git a/game/main.c b/game/main.c
index 98db29b..3ac73e9 100644
--- a/game/main.c
+++ b/game/main.c
@@ -213,7 +213,7 @@ void render(float dt, void *userData) {
     static PathNode *heap = NULL;
     if (!heap)
         heap = bzHeapCreate(PathNode, game->map.width * game->map.height);
-    if (!ecs_has(ECS, game->entity, Path)) {
+    if (!ecs_has(ECS, game->entity, Path) && IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) {
         Path path = {};
         const Position *start = ecs_get(ECS, game->entity, Position);
         findPath(&(PathfindingDesc) {
@@ -227,7 +227,7 @@ void render(float dt, void *userData) {
                 .outPath=&path,
                 .pool=game->pools.pathData
         });
-        if (path.paths && IsMouseButtonPressed(MOUSE_BUTTON_LEFT)) {
+        if (path.paths) {
             ecs_set_ptr(ECS, game->entity, Path, &path);
         }
     }
diff --git a/game/pathfinding.c b/game/pathfinding.c
index 85dac73..6bc8e8d 100644
--- a/game/pathfinding.c
+++ b/game/pathfinding.c
@@ -73,7 +73,7 @@ bool findPath(const PathfindingDesc *desc) {
                     .weight = gCost + toTargetCost,
                     .gCost = gCost,
                     .hCost = toTargetCost,
-                    .pos = (TilePosition) {x, y}
+                    .pos = curPos
                 });
 
             }
diff --git a/game/systems_entity.c b/game/systems_entity.c
index 3459ba5..c37e9e7 100644
--- a/game/systems_entity.c
+++ b/game/systems_entity.c
@@ -57,7 +57,6 @@ void updatePos(ecs_iter_t *it) {
     for (i32 i = 0; i < it->count; i++) {
         Vector2 d = Vector2Subtract(target[i], pos[i]);
         if (Vector2LengthSqr(d) < 1) {
-            bzLogInfo("Done");
             ecs_remove(ECS, it->entities[i], TargetPosition);
         }
 
diff --git a/tiled/test.tmx b/tiled/test.tmx
index fab587b..29cde2f 100644
--- a/tiled/test.tmx
+++ b/tiled/test.tmx
@@ -15,26 +15,26 @@
 28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,
 55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
 1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,
-28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,
-55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
-1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,
-28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,191,273,192,273,273,192,273,273,193,28,29,30,28,29,30,28,29,30,28,29,30,28,29,
-55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,217,56,217,55,56,217,55,56,245,273,193,57,55,56,57,55,56,57,55,56,57,55,56,
-1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,217,2,217,1,2,217,1,2,3,1,245,193,1,2,3,1,2,3,1,2,3,1,2,
-28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,217,29,217,28,29,217,28,29,30,28,29,217,28,29,30,28,29,30,28,29,30,28,29,
-55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,191,273,273,273,273,273,273,193,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,217,56,217,55,56,217,55,190,57,55,56,217,55,56,57,55,56,57,55,56,57,55,56,
-1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,191,273,247,2,3,1,2,3,1,245,273,273,193,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,191,247,2,244,1,2,217,1,217,3,1,2,217,1,2,3,1,2,3,1,2,3,1,2,
-28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,191,247,30,28,29,30,28,29,30,28,29,30,28,245,273,273,273,193,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,217,28,29,30,28,29,217,28,217,30,28,29,217,28,29,30,28,29,30,28,29,30,28,29,
-55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,191,247,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,245,273,273,193,55,56,57,55,56,57,55,56,57,55,56,57,55,56,217,55,56,191,193,56,217,55,217,57,55,56,217,55,56,57,55,56,57,55,56,57,55,56,
-1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,191,247,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,245,273,273,193,1,2,3,1,2,3,1,2,3,1,2,217,1,272,247,217,2,217,1,217,3,1,2,217,1,2,3,1,2,3,1,2,3,1,2,
-28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,191,247,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,245,193,29,30,28,29,30,28,29,30,28,29,217,28,29,30,217,29,217,28,217,30,28,29,217,28,29,30,28,29,30,28,29,30,28,29,
-55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,191,247,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,245,273,193,55,56,57,55,56,57,55,56,217,55,56,57,217,56,217,55,217,57,55,56,217,55,56,57,55,56,57,55,56,57,55,56,
-1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,217,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,245,193,2,3,1,2,3,1,2,218,273,274,3,217,2,217,1,217,3,1,2,217,1,2,3,1,2,3,1,2,3,1,2,
-28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,191,247,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,245,193,30,28,29,30,28,29,217,28,29,30,217,29,244,28,217,30,28,29,217,28,29,30,28,29,30,28,29,30,28,29,
-55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,217,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,245,193,55,56,57,55,56,217,55,56,57,217,56,57,55,217,57,55,56,217,55,56,57,55,56,57,55,56,57,55,56,
-1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,191,247,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,245,193,2,3,1,2,217,1,2,3,217,2,3,1,217,3,1,2,217,1,2,3,1,2,3,1,2,3,1,2,
-28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,217,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,245,193,30,28,29,245,273,273,273,246,273,273,273,246,273,273,273,247,28,29,30,28,29,30,28,29,30,28,29,
-55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,217,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,245,193,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
+28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,1,2,3,3,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,
+55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,1,2,3,3,30,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
+1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,1,2,3,30,1,2,3,3,2,3,1,2,3,1,2,3,1,2,3,1,2,
+28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,1,2,1,2,3,57,1,2,3,30,29,30,28,29,30,28,29,30,28,29,30,28,29,
+55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,1,2,1,1,1,1,1,2,3,3,3,3,3,56,57,55,56,57,55,56,57,55,56,
+1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,28,28,28,1,2,3,3,30,30,30,30,2,3,1,2,3,1,2,3,1,2,
+28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,1,2,55,55,55,1,2,3,30,57,57,57,57,29,30,28,29,30,28,29,30,28,29,
+55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,191,273,273,273,273,273,273,193,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,1,2,3,3,2,3,28,1,2,3,3,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
+1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,191,273,247,2,3,1,2,3,1,245,273,273,193,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,30,3,1,55,1,2,3,30,3,55,56,57,1,2,3,1,2,3,1,2,3,1,2,
+28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,191,247,30,28,29,30,28,29,30,28,29,30,28,245,273,273,273,193,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,1,2,3,57,30,3,55,1,2,3,57,30,55,56,57,28,29,30,28,29,30,28,29,30,28,29,
+55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,191,247,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,245,273,273,193,55,56,57,55,56,57,55,56,57,55,56,57,1,2,3,56,1,2,3,2,3,30,3,3,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
+1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,191,247,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,245,273,273,193,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,3,3,3,57,30,30,55,56,57,1,2,3,1,2,3,1,2,3,1,2,
+28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,191,247,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,245,193,29,30,28,29,30,28,29,30,1,2,1,2,3,1,2,3,30,3,57,57,55,56,57,3,29,30,28,29,30,28,29,30,28,29,
+55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,191,247,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,245,273,193,55,56,57,55,56,57,1,1,1,2,1,28,29,30,57,30,55,56,55,56,57,30,56,57,55,56,57,55,56,57,55,56,
+1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,217,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,245,193,2,3,1,2,3,28,1,1,1,28,55,56,57,57,57,55,56,55,56,57,57,2,3,1,2,3,1,2,3,1,2,
+28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,191,247,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,245,193,30,28,29,30,55,1,28,28,55,55,56,57,56,57,55,56,57,55,56,57,29,30,28,29,30,28,29,30,28,29,
+55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,217,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,245,193,55,56,57,55,28,55,55,55,56,57,55,56,57,2,3,1,55,56,57,56,57,55,56,57,55,56,57,55,56,
+1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,191,247,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,245,193,2,3,1,55,28,28,28,55,55,56,57,1,1,1,28,55,56,57,2,3,1,2,3,1,2,3,1,2,
+28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,217,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,245,193,30,28,29,55,55,55,55,56,57,55,28,28,28,55,55,56,57,29,30,28,29,30,28,29,30,28,29,
+55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,217,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,245,193,55,56,57,55,56,57,55,56,57,55,55,55,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
 1,2,3,1,2,3,1,2,3,1,2,3,1,2,191,247,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,217,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,
 28,29,30,28,29,30,28,29,30,28,29,30,28,29,217,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,245,193,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,30,28,29,
 55,56,57,55,56,57,55,56,57,55,56,57,55,56,217,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,245,193,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,57,55,56,
@@ -331,7 +331,7 @@
 </data>
  </layer>
  <objectgroup id="31" name="Entities">
-  <object id="19728" gid="1322" x="914.187" y="396.084" width="10" height="10"/>
+  <object id="19728" gid="1322" x="1164.85" y="474.084" width="10" height="10"/>
  </objectgroup>
  <objectgroup id="28" name="Game">
   <object id="19726" name="camera" x="1048" y="476">