diff --git a/assets/buildings.tsj b/assets/buildings.tsj
index 0eee95f..cfb8733 100644
--- a/assets/buildings.tsj
+++ b/assets/buildings.tsj
@@ -11,39 +11,443 @@
  "tiles":[
         {
          "id":0,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
         {
          "id":1,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
         {
          "id":2,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
+        {
+         "id":3,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"granary"
+        }, 
+        {
+         "id":4,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"armory"
+        }, 
+        {
+         "id":5,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"warehouse"
+        }, 
+        {
+         "id":6,
+         "type":"mine"
+        }, 
+        {
+         "id":7,
+         "type":"mine"
+        }, 
+        {
+         "id":8,
+         "type":"baracks"
+        }, 
+        {
+         "id":9,
+         "type":"baracks"
+        }, 
+        {
+         "id":10,
+         "type":"orchard"
+        }, 
+        {
+         "id":11,
+         "type":"orchard"
+        }, 
+        {
+         "id":12,
+         "type":"animal_farm"
+        }, 
+        {
+         "id":13,
+         "type":"animal_farm"
+        }, 
         {
          "id":32,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
         {
          "id":33,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
         {
          "id":34,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
+        {
+         "id":35,
+         "type":"fletcher"
+        }, 
+        {
+         "id":36,
+         "type":"fletcher"
+        }, 
+        {
+         "id":40,
+         "type":"baracks"
+        }, 
+        {
+         "id":41,
+         "type":"baracks"
+        }, 
+        {
+         "id":42,
+         "type":"orchard"
+        }, 
+        {
+         "id":43,
+         "type":"orchard"
+        }, 
+        {
+         "id":44,
+         "type":"animal_farm"
+        }, 
+        {
+         "id":45,
+         "type":"animal_farm"
+        }, 
         {
          "id":64,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
         {
          "id":65,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
         }, 
         {
          "id":66,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
          "type":"keep"
+        }, 
+        {
+         "id":67,
+         "type":"smithy"
+        }, 
+        {
+         "id":68,
+         "type":"smithy"
+        }, 
+        {
+         "id":72,
+         "type":"workshop"
+        }, 
+        {
+         "id":73,
+         "type":"workshop"
+        }, 
+        {
+         "id":74,
+         "type":"farm"
+        }, 
+        {
+         "id":96,
+         "type":"road"
+        }, 
+        {
+         "id":97,
+         "type":"wall"
+        }, 
+        {
+         "id":98,
+         "type":"gatehouse"
+        }, 
+        {
+         "id":128,
+         "type":"tower"
+        }, 
+        {
+         "id":129,
+         "type":"tower"
+        }, 
+        {
+         "id":130,
+         "type":"small_tower"
+        }, 
+        {
+         "id":160,
+         "type":"tower"
+        }, 
+        {
+         "id":161,
+         "type":"tower"
         }],
  "tilewidth":16,
  "type":"tileset",
diff --git a/assets/maps/test.tmj b/assets/maps/test.tmj
index d71f72d..3d0f636 100644
--- a/assets/maps/test.tmj
+++ b/assets/maps/test.tmj
@@ -36,12 +36,12 @@
             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, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 245, 193, 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, 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,
             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, 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,
-            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, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 245, 193, 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, 217, 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, 217, 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, 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, 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,
-            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 217, 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, 217, 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, 217, 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, 245, 193, 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, 191, 247, 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, 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, 191, 247, 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, 191, 193, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 245, 193, 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, 217, 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, 191, 273, 273, 273, 247, 217, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 217, 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, 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, 217, 55, 56, 57, 55, 217, 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,
+            1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 217, 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, 191, 247, 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,
+            28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 29, 30, 28, 217, 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, 273, 193, 191, 247, 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,
+            55, 56, 57, 55, 56, 57, 55, 56, 57, 55, 56, 57, 191, 247, 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, 247, 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,
             1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 217, 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, 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, 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, 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,
             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, 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,
diff --git a/assets/terrain.tsj b/assets/terrain.tsj
index 488a989..1dae2e1 100644
--- a/assets/terrain.tsj
+++ b/assets/terrain.tsj
@@ -21,7 +21,7 @@
                      "ellipse":true,
                      "height":6,
                      "id":1,
-                     "name":"collision",
+                     "name":"",
                      "rotation":0,
                      "type":"",
                      "visible":true,
@@ -35,6 +35,790 @@
              "x":0,
              "y":0
             }
+        }, 
+        {
+         "id":189,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":13,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":12,
+                     "x":2,
+                     "y":3
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":190,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":191,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":192,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":194,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":196,
+         "type":"shore"
+        }, 
+        {
+         "id":197,
+         "type":"shore"
+        }, 
+        {
+         "id":198,
+         "type":"shore"
+        }, 
+        {
+         "id":199,
+         "type":"shore"
+        }, 
+        {
+         "id":200,
+         "type":"shore"
+        }, 
+        {
+         "id":201,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":202,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":203,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":204,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":205,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":206,
+         "type":"water"
+        }, 
+        {
+         "id":207,
+         "type":"water"
+        }, 
+        {
+         "id":208,
+         "type":"water"
+        }, 
+        {
+         "id":209,
+         "type":"water"
+        }, 
+        {
+         "id":210,
+         "type":"water"
+        }, 
+        {
+         "id":211,
+         "type":"water"
+        }, 
+        {
+         "id":212,
+         "type":"water"
+        }, 
+        {
+         "id":213,
+         "type":"water"
+        }, 
+        {
+         "id":214,
+         "type":"water"
+        }, 
+        {
+         "id":215,
+         "type":"water"
+        }, 
+        {
+         "id":216,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":12,
+                     "x":2,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":217,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":218,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":219,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }, 
+                    {
+                     "height":16,
+                     "id":2,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":220,
+         "type":"river"
+        }, 
+        {
+         "id":221,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":222,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":223,
+         "type":"shore"
+        }, 
+        {
+         "id":224,
+         "type":"water"
+        }, 
+        {
+         "id":225,
+         "type":"shore"
+        }, 
+        {
+         "id":226,
+         "type":"shore"
+        }, 
+        {
+         "id":227,
+         "type":"shore"
+        }, 
+        {
+         "id":228,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":229,
+         "type":"water"
+        }, 
+        {
+         "id":230,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":231,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":232,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":233,
+         "type":"water"
+        }, 
+        {
+         "id":234,
+         "type":"water"
+        }, 
+        {
+         "id":235,
+         "type":"water"
+        }, 
+        {
+         "id":236,
+         "type":"water"
+        }, 
+        {
+         "id":237,
+         "type":"water"
+        }, 
+        {
+         "id":238,
+         "type":"water"
+        }, 
+        {
+         "id":239,
+         "type":"water"
+        }, 
+        {
+         "id":240,
+         "type":"water"
+        }, 
+        {
+         "id":241,
+         "type":"water"
+        }, 
+        {
+         "id":242,
+         "type":"water"
+        }, 
+        {
+         "id":243,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":13,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":12,
+                     "x":2,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":244,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":245,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":246,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":248,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":16,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":0
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":250,
+         "type":"shore"
+        }, 
+        {
+         "id":251,
+         "type":"shore"
+        }, 
+        {
+         "id":252,
+         "type":"shore"
+        }, 
+        {
+         "id":253,
+         "type":"shore"
+        }, 
+        {
+         "id":254,
+         "type":"shore"
+        }, 
+        {
+         "id":255,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":256,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":257,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":258,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":259,
+         "type":"sand_shore"
+        }, 
+        {
+         "id":260,
+         "type":"water"
+        }, 
+        {
+         "id":261,
+         "type":"water"
+        }, 
+        {
+         "id":262,
+         "type":"water"
+        }, 
+        {
+         "id":265,
+         "type":"water"
+        }, 
+        {
+         "id":266,
+         "type":"water"
+        }, 
+        {
+         "id":267,
+         "type":"water"
+        }, 
+        {
+         "id":270,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "ellipse":true,
+                     "height":12,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":12,
+                     "x":2,
+                     "y":3
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":271,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":12,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":13,
+                     "x":3,
+                     "y":2
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":272,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":12,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":16,
+                     "x":0,
+                     "y":2
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":273,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "name":"",
+             "objects":[
+                    {
+                     "height":12,
+                     "id":1,
+                     "name":"",
+                     "rotation":0,
+                     "type":"",
+                     "visible":true,
+                     "width":13,
+                     "x":0,
+                     "y":2
+                    }],
+             "opacity":1,
+             "type":"objectgroup",
+             "visible":true,
+             "x":0,
+             "y":0
+            },
+         "type":"river"
+        }, 
+        {
+         "id":274,
+         "type":"river"
         }],
  "tilewidth":16,
  "type":"tileset",
diff --git a/engine/breeze/world/tileset.c b/engine/breeze/world/tileset.c
index e32187c..0950378 100644
--- a/engine/breeze/world/tileset.c
+++ b/engine/breeze/world/tileset.c
@@ -28,12 +28,11 @@ BzTileset bzTilesetCreate(const BzTilesetDesc *desc) {
     }
 
     cute_tiled_tile_descriptor_t *cuteTile = cuteTileset->tiles;
-    while (cuteTile) {
-        if (!cuteTile->objectgroup) break;
+    for (; cuteTile; cuteTile = cuteTile->next) {
+        if (!cuteTile->objectgroup) continue;
         cute_tiled_object_t *cuteObject = cuteTile->objectgroup->objects;
         // NOTE: Only supporting single collider (integer values)
         if (cuteObject) {
-            if (cuteObject->vertices) break;
 
             BzTileCollider collider = {BZ_TILE_COLLIDER_RECT};
             if (cuteObject->ellipse)
@@ -45,7 +44,6 @@ BzTileset bzTilesetCreate(const BzTilesetDesc *desc) {
 
             tileset.tileColliders[cuteTile->tile_index] = collider;
         }
-        cuteTile = cuteTile->next;
     }
 
     cute_tiled_free_external_tileset(cuteTileset);
diff --git a/tiled/buildings.tsx b/tiled/buildings.tsx
index cb231d8..61661ea 100644
--- a/tiled/buildings.tsx
+++ b/tiled/buildings.tsx
@@ -4,12 +4,36 @@
   <export target="../assets/buildings.tsj" format="json"/>
  </editorsettings>
  <image source="../assets/buildings.png" width="512" height="512"/>
- <tile id="0" type="keep"/>
- <tile id="1" type="keep"/>
- <tile id="2" type="keep"/>
- <tile id="3" type="granary"/>
- <tile id="4" type="armory"/>
- <tile id="5" type="warehouse"/>
+ <tile id="0" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="1" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="2" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="3" type="granary">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4" type="armory">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="5" type="warehouse">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="6" type="mine"/>
  <tile id="7" type="mine"/>
  <tile id="8" type="baracks"/>
@@ -18,9 +42,21 @@
  <tile id="11" type="orchard"/>
  <tile id="12" type="animal_farm"/>
  <tile id="13" type="animal_farm"/>
- <tile id="32" type="keep"/>
- <tile id="33" type="keep"/>
- <tile id="34" type="keep"/>
+ <tile id="32" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="33" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="34" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="35" type="fletcher"/>
  <tile id="36" type="fletcher"/>
  <tile id="40" type="baracks"/>
@@ -29,9 +65,21 @@
  <tile id="43" type="orchard"/>
  <tile id="44" type="animal_farm"/>
  <tile id="45" type="animal_farm"/>
- <tile id="64" type="keep"/>
- <tile id="65" type="keep"/>
- <tile id="66" type="keep"/>
+ <tile id="64" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="65" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="66" type="keep">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="67" type="smithy"/>
  <tile id="68" type="smithy"/>
  <tile id="72" type="workshop"/>
diff --git a/tiled/terrain.tsx b/tiled/terrain.tsx
index 003d100..a7b7698 100644
--- a/tiled/terrain.tsx
+++ b/tiled/terrain.tsx
@@ -11,6 +11,167 @@
    </object>
   </objectgroup>
  </tile>
+ <tile id="189" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="3" width="12" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="190" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="191" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="192" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="194" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="196" type="shore"/>
+ <tile id="197" type="shore"/>
+ <tile id="198" type="shore"/>
+ <tile id="199" type="shore"/>
+ <tile id="200" type="shore"/>
+ <tile id="201" type="sand_shore"/>
+ <tile id="202" type="sand_shore"/>
+ <tile id="203" type="sand_shore"/>
+ <tile id="204" type="sand_shore"/>
+ <tile id="205" type="sand_shore"/>
+ <tile id="206" type="water"/>
+ <tile id="207" type="water"/>
+ <tile id="208" type="water"/>
+ <tile id="209" type="water"/>
+ <tile id="210" type="water"/>
+ <tile id="211" type="water"/>
+ <tile id="212" type="water"/>
+ <tile id="213" type="water"/>
+ <tile id="214" type="water"/>
+ <tile id="215" type="water"/>
+ <tile id="216" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="0" width="12" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="217" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="218" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="219" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+   <object id="2" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="220" type="river"/>
+ <tile id="221" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="222" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="223" type="shore"/>
+ <tile id="224" type="water"/>
+ <tile id="225" type="shore"/>
+ <tile id="226" type="shore"/>
+ <tile id="227" type="shore"/>
+ <tile id="228" type="sand_shore"/>
+ <tile id="229" type="water"/>
+ <tile id="230" type="sand_shore"/>
+ <tile id="231" type="sand_shore"/>
+ <tile id="232" type="sand_shore"/>
+ <tile id="233" type="water"/>
+ <tile id="234" type="water"/>
+ <tile id="235" type="water"/>
+ <tile id="236" type="water"/>
+ <tile id="237" type="water"/>
+ <tile id="238" type="water"/>
+ <tile id="239" type="water"/>
+ <tile id="240" type="water"/>
+ <tile id="241" type="water"/>
+ <tile id="242" type="water"/>
+ <tile id="243" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="0" width="12" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="244" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="245" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="246" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="248" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="250" type="shore"/>
+ <tile id="251" type="shore"/>
+ <tile id="252" type="shore"/>
+ <tile id="253" type="shore"/>
+ <tile id="254" type="shore"/>
+ <tile id="255" type="sand_shore"/>
+ <tile id="256" type="sand_shore"/>
+ <tile id="257" type="sand_shore"/>
+ <tile id="258" type="sand_shore"/>
+ <tile id="259" type="sand_shore"/>
+ <tile id="260" type="water"/>
+ <tile id="261" type="water"/>
+ <tile id="262" type="water"/>
+ <tile id="265" type="water"/>
+ <tile id="266" type="water"/>
+ <tile id="267" type="water"/>
+ <tile id="270" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="3" width="12" height="12">
+    <ellipse/>
+   </object>
+  </objectgroup>
+ </tile>
+ <tile id="271" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="2" width="13" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="272" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="16" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="273" type="river">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="2" width="13" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="274" type="river"/>
  <wangsets>
   <wangset name="River" type="edge" tile="-1">
    <wangcolor name="" color="#1c95ff" tile="-1" probability="1"/>
diff --git a/tiled/test.tmx b/tiled/test.tmx
index f172743..03e59b7 100644
--- a/tiled/test.tmx
+++ b/tiled/test.tmx
@@ -40,12 +40,12 @@
 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,3,1,2,3,1,2,3,1,2,3,1,245,193,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,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,
 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,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,
-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,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,1,2,3,245,193,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,217,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,217,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,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,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,
-1,2,3,1,2,3,1,2,3,1,2,3,1,217,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,217,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,217,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,245,193,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,191,247,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,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,191,247,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,191,193,3,1,2,3,1,2,3,1,2,3,245,193,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,217,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,191,273,273,273,247,217,30,28,29,30,28,29,30,28,29,30,28,217,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,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,217,55,56,57,55,217,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,
+1,2,3,1,2,3,1,2,3,1,2,3,1,217,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,191,247,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,
+28,29,30,28,29,30,28,29,30,28,29,30,28,217,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,273,193,191,247,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,
+55,56,57,55,56,57,55,56,57,55,56,57,191,247,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,247,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,
 1,2,3,1,2,3,1,2,3,1,2,3,217,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,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,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,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,
 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,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,