diff --git a/ruf-der-pilze/scenes/tavern.tscn b/ruf-der-pilze/scenes/tavern.tscn
index b52e70d..7c438e3 100644
--- a/ruf-der-pilze/scenes/tavern.tscn
+++ b/ruf-der-pilze/scenes/tavern.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=18 format=3]
+[gd_scene load_steps=28 format=3]
 
 [ext_resource type="Script" path="res://scripts/tavern.gd" id="1"]
 [ext_resource type="PackedScene" path="res://scenes/taproom.tscn" id="2"]
@@ -35,6 +35,48 @@ size = Vector3(0.5, 0.01, 3)
 [sub_resource type="BoxMesh" id="BoxMesh_trail_medium"]
 size = Vector3(0.5, 0.01, 4)
 
+[sub_resource type="BoxMesh" id="BoxMesh_stairs"]
+size = Vector3(1.5, 0.2, 4)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_stairs"]
+size = Vector3(1.5, 0.2, 4)
+
+[sub_resource type="BoxMesh" id="BoxMesh_upper_floor"]
+size = Vector3(18, 0.1, 8)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_upper_floor"]
+size = Vector3(18, 0.1, 8)
+
+[sub_resource type="BoxMesh" id="BoxMesh_upper_wall_long"]
+size = Vector3(18, 3, 0.1)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_upper_wall_long"]
+size = Vector3(18, 3, 0.1)
+
+[sub_resource type="BoxMesh" id="BoxMesh_upper_wall_short"]
+size = Vector3(0.1, 3, 8)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_upper_wall_short"]
+size = Vector3(0.1, 3, 8)
+
+[sub_resource type="BoxMesh" id="BoxMesh_bed"]
+size = Vector3(1.8, 0.5, 0.9)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_bed"]
+size = Vector3(1.8, 0.5, 0.9)
+
+[sub_resource type="BoxMesh" id="BoxMesh_anna_door"]
+size = Vector3(0.05, 2.5, 1.2)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_anna_door"]
+size = Vector3(0.05, 2.5, 1.2)
+
+[sub_resource type="BoxMesh" id="BoxMesh_myzel_patch"]
+size = Vector3(0.8, 0.01, 0.8)
+
+[sub_resource type="BoxMesh" id="BoxMesh_myzel_trail_anna"]
+size = Vector3(0.4, 0.01, 1.5)
+
 [node name="Tavern" type="Node3D"]
 script = ExtResource("1")
 
@@ -103,3 +145,258 @@ surface_material_override/0 = SubResource("Material_myzel")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.06, 0)
 mesh = SubResource("BoxMesh_trail_medium")
 surface_material_override/0 = SubResource("Material_myzel")
+
+[node name="Stairs" type="StaticBody3D" parent="GroundFloor"]
+transform = Transform3D(1, 0, 0, 0, 0.906, -0.423, 0, 0.423, 0.906, 0, 1, 3)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="GroundFloor/Stairs"]
+mesh = SubResource("BoxMesh_stairs")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="GroundFloor/Stairs"]
+shape = SubResource("BoxShape3D_stairs")
+
+[node name="UpperFloor" type="Node3D" parent="."]
+
+[node name="Floor" type="StaticBody3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 4, 0)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Floor"]
+mesh = SubResource("BoxMesh_upper_floor")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Floor"]
+shape = SubResource("BoxShape3D_upper_floor")
+
+[node name="Ceiling" type="StaticBody3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 7, 0)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Ceiling"]
+mesh = SubResource("BoxMesh_upper_floor")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Ceiling"]
+shape = SubResource("BoxShape3D_upper_floor")
+
+[node name="WallBack" type="StaticBody3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 5.5, -4)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/WallBack"]
+mesh = SubResource("BoxMesh_upper_wall_long")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/WallBack"]
+shape = SubResource("BoxShape3D_upper_wall_long")
+
+[node name="WallFront" type="StaticBody3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 5.5, 4)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/WallFront"]
+mesh = SubResource("BoxMesh_upper_wall_long")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/WallFront"]
+shape = SubResource("BoxShape3D_upper_wall_long")
+
+[node name="WallLeft" type="StaticBody3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6, 5.5, 0)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/WallLeft"]
+mesh = SubResource("BoxMesh_upper_wall_short")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/WallLeft"]
+shape = SubResource("BoxShape3D_upper_wall_short")
+
+[node name="WallRight" type="StaticBody3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 5.5, 0)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/WallRight"]
+mesh = SubResource("BoxMesh_upper_wall_short")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/WallRight"]
+shape = SubResource("BoxShape3D_upper_wall_short")
+
+[node name="CorridorWall" type="StaticBody3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 5.5, 2)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/CorridorWall"]
+mesh = SubResource("BoxMesh_upper_wall_long")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/CorridorWall"]
+shape = SubResource("BoxShape3D_upper_wall_long")
+
+[node name="Room1" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room1"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room1/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room1/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room1"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room2" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room2/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room2/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room3" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room3"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room3/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room3/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room3"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room4" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room4"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room4/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room4/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room4"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room5" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room5"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room5/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room5/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room5"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room6" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room6"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room6/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room6/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room6"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room7" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room7"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room7/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room7/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room7"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room8" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room8"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room8/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room8/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room8"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="Room9" type="Node3D" parent="UpperFloor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11, 4.1, 2.8)
+
+[node name="Bed" type="StaticBody3D" parent="UpperFloor/Room9"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -2.5)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room9/Bed"]
+mesh = SubResource("BoxMesh_bed")
+surface_material_override/0 = SubResource("Material_myzel")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room9/Bed"]
+shape = SubResource("BoxShape3D_bed")
+
+[node name="SpawnPoint" type="Marker3D" parent="UpperFloor/Room9"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, -1)
+
+[node name="OpenDoor" type="StaticBody3D" parent="UpperFloor/Room9"]
+transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 0.6, 1.25, 0.2)
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="UpperFloor/Room9/OpenDoor"]
+mesh = SubResource("BoxMesh_anna_door")
+surface_material_override/0 = SubResource("Material_wood")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="UpperFloor/Room9/OpenDoor"]
+shape = SubResource("BoxShape3D_anna_door")
+
+[node name="MyzelDecor" type="Node3D" parent="UpperFloor/Room9"]
+
+[node name="MyzelPatch1" type="MeshInstance3D" parent="UpperFloor/Room9/MyzelDecor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.3, 0.01, -2)
+mesh = SubResource("BoxMesh_myzel_patch")
+surface_material_override/0 = SubResource("Material_myzel")
+
+[node name="MyzelPatch2" type="MeshInstance3D" parent="UpperFloor/Room9/MyzelDecor"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 0.8, -3.8)
+mesh = SubResource("BoxMesh_myzel_patch")
+surface_material_override/0 = SubResource("Material_myzel")
+
+[node name="MyzelTrailAnna" type="Node3D" parent="UpperFloor/Room9"]
+
+[node name="TrailOut" type="MeshInstance3D" parent="UpperFloor/Room9/MyzelTrailAnna"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.06, 1.2)
+mesh = SubResource("BoxMesh_myzel_trail_anna")
+surface_material_override/0 = SubResource("Material_myzel")