diff --git a/godot/project.godot b/godot/project.godot
index 67446fa..98e704e 100644
--- a/godot/project.godot
+++ b/godot/project.godot
@@ -11,7 +11,7 @@ config_version=4
 [application]
 
 config/name="routes"
-run/main_scene="res://world/world.tscn"
+run/main_scene="res://world/Main.tscn"
 config/icon="res://icon.png"
 
 [importer_defaults]
diff --git a/godot/world/world.tscn b/godot/world/Main.tscn
similarity index 59%
rename from godot/world/world.tscn
rename to godot/world/Main.tscn
index 3d8dae3..756abba 100644
--- a/godot/world/world.tscn
+++ b/godot/world/Main.tscn
@@ -1,13 +1,13 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://world/World.tscn" type="PackedScene" id=1]
-[ext_resource path="res://world/worldcam.gd" type="Script" id=3]
+[ext_resource path="res://world/worldcam.gd" type="Script" id=1]
+[ext_resource path="res://world/World.tscn" type="PackedScene" id=2]
 
 [node name="Main" type="Node2D"]
 
 [node name="Worldcam" type="Camera2D" parent="."]
 current = true
 zoom = Vector2( 0.4, 0.4 )
-script = ExtResource( 3 )
+script = ExtResource( 1 )
 
-[node name="World" parent="." instance=ExtResource( 1 )]
+[node name="World" parent="." instance=ExtResource( 2 )]
diff --git a/godot/world/Tilemap.tscn b/godot/world/Tilemap.tscn
index 0829e46..bd723c0 100644
--- a/godot/world/Tilemap.tscn
+++ b/godot/world/Tilemap.tscn
@@ -8,5 +8,8 @@ position = Vector2( -2, 0 )
 mode = 1
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 32, 16 )
+cell_tile_origin = 1
+collision_layer = 0
+collision_mask = 0
 format = 1
 script = ExtResource( 2 )
diff --git a/godot/world/Tilemaps.gd b/godot/world/Tilemaps.gd
deleted file mode 100644
index 487b284..0000000
--- a/godot/world/Tilemaps.gd
+++ /dev/null
@@ -1,2 +0,0 @@
-extends Node
-
diff --git a/routes-native/src/stateserver/world/tiles.rs b/routes-native/src/stateserver/world/tiles.rs
index 0e2cbfd..fa824b8 100644
--- a/routes-native/src/stateserver/world/tiles.rs
+++ b/routes-native/src/stateserver/world/tiles.rs
@@ -17,6 +17,12 @@ pub struct Tile {
     kind: Tiletypes,
     #[builder(default = "true")]
     is_support: bool,
+    #[builder(default = "true")]
+    needs_support: bool,
+    #[builder(default = "vec![]")]
+    can_be_above: Vec<Tiletypes>,
+    #[builder(default = "vec![]")]
+    can_be_next_to: Vec<Tiletypes>,
 }
 
 impl Tile {