diff --git a/gymkhana/characters/mark/mark.esc b/gymkhana/characters/mark/mark.esc
new file mode 100644
index 00000000..5638a54a
--- /dev/null
+++ b/gymkhana/characters/mark/mark.esc
@@ -0,0 +1,3 @@
+:look
+
+say player "That's a-me, Mark-io."
diff --git a/gymkhana/characters/mark/mark.tscn b/gymkhana/characters/mark/mark.tscn
new file mode 100644
index 00000000..faac755c
--- /dev/null
+++ b/gymkhana/characters/mark/mark.tscn
@@ -0,0 +1,529 @@
+[gd_scene load_steps=85 format=2]
+
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_player.gd" type="Script" id=1]
+[ext_resource path="res://game/characters/mark/png/mark_talk_down.png" type="Texture" id=2]
+[ext_resource path="res://game/characters/mark/png/markjester.png" type="Texture" id=3]
+[ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=4]
+[ext_resource path="res://game/characters/mark/png/mark_talk_down_right.png" type="Texture" id=5]
+[ext_resource path="res://game/characters/mark/png/mark_talk_up.png" type="Texture" id=6]
+[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=7]
+[ext_resource path="res://game/characters/mark/mark_animations.tres" type="Resource" id=8]
+[ext_resource path="res://game/characters/mark/png/markjester_talk.png" type="Texture" id=9]
+
+[sub_resource type="AtlasTexture" id=18]
+atlas = ExtResource( 4 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=67]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 4 )
+region = Rect2( 120, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=66]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 120, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=11]
+atlas = ExtResource( 4 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=69]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=17]
+atlas = ExtResource( 4 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=70]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=27]
+atlas = ExtResource( 4 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=65]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 4 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=68]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 2 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 2 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 2 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=56]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=57]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=58]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=59]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 432, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=60]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 456, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=61]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 480, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=28]
+atlas = ExtResource( 5 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=29]
+atlas = ExtResource( 5 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=30]
+atlas = ExtResource( 5 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=62]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=63]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=64]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 120, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=48]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 312, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=49]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 336, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=50]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 360, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=51]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 384, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=52]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 408, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 7 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 7 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 7 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=9]
+atlas = ExtResource( 7 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=10]
+atlas = ExtResource( 7 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=38]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 144, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=39]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 168, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=40]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 192, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=41]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 216, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=42]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 240, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=12]
+atlas = ExtResource( 6 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=13]
+atlas = ExtResource( 6 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=33]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 264, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=34]
+flags = 4
+atlas = ExtResource( 9 )
+region = Rect2( 288, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=19]
+atlas = ExtResource( 4 )
+region = Rect2( 144, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=20]
+atlas = ExtResource( 4 )
+region = Rect2( 168, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=21]
+atlas = ExtResource( 4 )
+region = Rect2( 192, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=53]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 144, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=54]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 168, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=55]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 192, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=71]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 408, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=72]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 432, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=73]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 456, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=74]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 480, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=75]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 504, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=22]
+atlas = ExtResource( 4 )
+region = Rect2( 216, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=23]
+atlas = ExtResource( 4 )
+region = Rect2( 240, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=24]
+atlas = ExtResource( 4 )
+region = Rect2( 264, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=25]
+atlas = ExtResource( 4 )
+region = Rect2( 288, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=26]
+atlas = ExtResource( 4 )
+region = Rect2( 312, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=43]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 216, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=44]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 240, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=45]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 264, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=46]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 288, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=47]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 312, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=14]
+atlas = ExtResource( 4 )
+region = Rect2( 336, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=15]
+atlas = ExtResource( 4 )
+region = Rect2( 360, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=16]
+atlas = ExtResource( 4 )
+region = Rect2( 384, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=35]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 336, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=36]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 360, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=37]
+flags = 4
+atlas = ExtResource( 3 )
+region = Rect2( 384, 0, 24, 70 )
+
+[sub_resource type="SpriteFrames" id=31]
+animations = [ {
+"frames": [ SubResource( 18 ) ],
+"loop": true,
+"name": "idle_down",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 67 ) ],
+"loop": true,
+"name": "idle_down_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 4 ) ],
+"loop": true,
+"name": "idle_down_left",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 66 ) ],
+"loop": true,
+"name": "idle_down_left_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 11 ) ],
+"loop": true,
+"name": "idle_down_right",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 69 ) ],
+"loop": true,
+"name": "idle_down_right_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 17 ) ],
+"loop": true,
+"name": "idle_left",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 70 ) ],
+"loop": true,
+"name": "idle_left_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 27 ) ],
+"loop": true,
+"name": "idle_right",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 65 ) ],
+"loop": true,
+"name": "idle_right_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 5 ) ],
+"loop": true,
+"name": "idle_up",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 68 ) ],
+"loop": true,
+"name": "idle_up_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 2 ), SubResource( 3 ) ],
+"loop": true,
+"name": "speak_down",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ],
+"loop": true,
+"name": "speak_down_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 59 ), SubResource( 60 ), SubResource( 61 ) ],
+"loop": true,
+"name": "speak_down_left_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ],
+"loop": true,
+"name": "speak_down_right",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 62 ), SubResource( 63 ), SubResource( 64 ) ],
+"loop": true,
+"name": "speak_down_right_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 48 ), SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ) ],
+"loop": true,
+"name": "speak_left_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ],
+"loop": true,
+"name": "speak_right",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 38 ), SubResource( 39 ), SubResource( 40 ), SubResource( 41 ), SubResource( 42 ) ],
+"loop": true,
+"name": "speak_right_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ],
+"loop": true,
+"name": "speak_up",
+"speed": 3.0
+}, {
+"frames": [ SubResource( 33 ), SubResource( 34 ) ],
+"loop": true,
+"name": "speak_up_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 20 ) ],
+"loop": true,
+"name": "walk_down",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 53 ), SubResource( 54 ), SubResource( 55 ), SubResource( 54 ) ],
+"loop": true,
+"name": "walk_down_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 71 ), SubResource( 72 ), SubResource( 73 ), SubResource( 74 ), SubResource( 75 ) ],
+"loop": true,
+"name": "walk_left_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ) ],
+"loop": true,
+"name": "walk_right",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ) ],
+"loop": true,
+"name": "walk_right_jester",
+"speed": 5.0
+}, {
+"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ],
+"loop": true,
+"name": "walk_up",
+"speed": 6.0
+}, {
+"frames": [ SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 36 ) ],
+"loop": true,
+"name": "walk_up_jester",
+"speed": 5.0
+} ]
+
+[sub_resource type="CapsuleShape2D" id=32]
+radius = 38.2347
+height = 217.78
+
+[node name="mark" type="Area2D"]
+pause_mode = 1
+script = ExtResource( 1 )
+global_id = "player"
+esc_script = "res://game/characters/mark/mark.esc"
+is_movable = true
+default_action = "look"
+combine_when_selected_action_is_in = [  ]
+dialog_color = Color( 1, 1, 1, 1 )
+animations = ExtResource( 8 )
+
+[node name="sprite" type="AnimatedSprite" parent="."]
+position = Vector2( 0, -137.938 )
+scale = Vector2( 4, 4 )
+frames = SubResource( 31 )
+animation = "idle_down"
+
+[node name="collision" type="CollisionShape2D" parent="."]
+position = Vector2( 0.455139, -138.362 )
+shape = SubResource( 32 )
+
+[node name="debug" type="Label" parent="."]
+margin_right = 40.0
+margin_bottom = 14.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="dialog_position" type="Position2D" parent="."]
+position = Vector2( 0, -320 )
diff --git a/gymkhana/characters/mark/mark_animations.tres b/gymkhana/characters/mark/mark_animations.tres
new file mode 100644
index 00000000..d466d0d5
--- /dev/null
+++ b/gymkhana/characters/mark/mark_animations.tres
@@ -0,0 +1,172 @@
+[gd_resource type="Resource" load_steps=36 format=2]
+
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3]
+
+[sub_resource type="Resource" id=1]
+script = ExtResource( 2 )
+angle_start = 340
+angle_size = 40
+
+[sub_resource type="Resource" id=2]
+script = ExtResource( 2 )
+angle_start = 20
+angle_size = 50
+
+[sub_resource type="Resource" id=3]
+script = ExtResource( 2 )
+angle_start = 70
+angle_size = 40
+
+[sub_resource type="Resource" id=4]
+script = ExtResource( 2 )
+angle_start = 110
+angle_size = 50
+
+[sub_resource type="Resource" id=5]
+script = ExtResource( 2 )
+angle_start = 160
+angle_size = 40
+
+[sub_resource type="Resource" id=6]
+script = ExtResource( 2 )
+angle_start = 200
+angle_size = 50
+
+[sub_resource type="Resource" id=7]
+script = ExtResource( 2 )
+angle_start = 250
+angle_size = 40
+
+[sub_resource type="Resource" id=8]
+script = ExtResource( 2 )
+angle_start = 290
+angle_size = 50
+
+[sub_resource type="Resource" id=9]
+script = ExtResource( 3 )
+animation = "walk_up"
+mirrored = false
+
+[sub_resource type="Resource" id=10]
+script = ExtResource( 3 )
+animation = "walk_up"
+mirrored = false
+
+[sub_resource type="Resource" id=11]
+script = ExtResource( 3 )
+animation = "walk_right"
+mirrored = false
+
+[sub_resource type="Resource" id=12]
+script = ExtResource( 3 )
+animation = "walk_down"
+mirrored = false
+
+[sub_resource type="Resource" id=13]
+script = ExtResource( 3 )
+animation = "walk_down"
+mirrored = false
+
+[sub_resource type="Resource" id=14]
+script = ExtResource( 3 )
+animation = "walk_down"
+mirrored = false
+
+[sub_resource type="Resource" id=15]
+script = ExtResource( 3 )
+animation = "walk_right"
+mirrored = true
+
+[sub_resource type="Resource" id=16]
+script = ExtResource( 3 )
+animation = "walk_up"
+mirrored = false
+
+[sub_resource type="Resource" id=17]
+script = ExtResource( 3 )
+animation = "idle_up"
+mirrored = false
+
+[sub_resource type="Resource" id=18]
+script = ExtResource( 3 )
+animation = "idle_up"
+mirrored = false
+
+[sub_resource type="Resource" id=19]
+script = ExtResource( 3 )
+animation = "idle_right"
+mirrored = false
+
+[sub_resource type="Resource" id=20]
+script = ExtResource( 3 )
+animation = "idle_down_right"
+mirrored = false
+
+[sub_resource type="Resource" id=21]
+script = ExtResource( 3 )
+animation = "idle_down"
+mirrored = false
+
+[sub_resource type="Resource" id=22]
+script = ExtResource( 3 )
+animation = "idle_down_left"
+mirrored = false
+
+[sub_resource type="Resource" id=23]
+script = ExtResource( 3 )
+animation = "idle_left"
+mirrored = false
+
+[sub_resource type="Resource" id=24]
+script = ExtResource( 3 )
+animation = "idle_up"
+mirrored = false
+
+[sub_resource type="Resource" id=25]
+script = ExtResource( 3 )
+animation = "speak_up"
+mirrored = false
+
+[sub_resource type="Resource" id=26]
+script = ExtResource( 3 )
+animation = "speak_up"
+mirrored = false
+
+[sub_resource type="Resource" id=27]
+script = ExtResource( 3 )
+animation = "speak_right"
+mirrored = false
+
+[sub_resource type="Resource" id=28]
+script = ExtResource( 3 )
+animation = "speak_down"
+mirrored = false
+
+[sub_resource type="Resource" id=29]
+script = ExtResource( 3 )
+animation = "speak_down"
+mirrored = false
+
+[sub_resource type="Resource" id=30]
+script = ExtResource( 3 )
+animation = "speak_down"
+mirrored = false
+
+[sub_resource type="Resource" id=31]
+script = ExtResource( 3 )
+animation = "speak_right"
+mirrored = true
+
+[sub_resource type="Resource" id=32]
+script = ExtResource( 3 )
+animation = "speak_up"
+mirrored = false
+
+[resource]
+script = ExtResource( 1 )
+dir_angles = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ]
+directions = [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ]
+idles = [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ]
+speaks = [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ]
diff --git a/gymkhana/characters/mark/mark_animations_jester.tres b/gymkhana/characters/mark/mark_animations_jester.tres
new file mode 100644
index 00000000..d2fd3bcc
--- /dev/null
+++ b/gymkhana/characters/mark/mark_animations_jester.tres
@@ -0,0 +1,172 @@
+[gd_resource type="Resource" load_steps=36 format=2]
+
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3]
+
+[sub_resource type="Resource" id=1]
+script = ExtResource( 2 )
+angle_start = 340
+angle_size = 40
+
+[sub_resource type="Resource" id=2]
+script = ExtResource( 2 )
+angle_start = 20
+angle_size = 50
+
+[sub_resource type="Resource" id=3]
+script = ExtResource( 2 )
+angle_start = 70
+angle_size = 40
+
+[sub_resource type="Resource" id=4]
+script = ExtResource( 2 )
+angle_start = 110
+angle_size = 50
+
+[sub_resource type="Resource" id=5]
+script = ExtResource( 2 )
+angle_start = 160
+angle_size = 40
+
+[sub_resource type="Resource" id=6]
+script = ExtResource( 2 )
+angle_start = 200
+angle_size = 50
+
+[sub_resource type="Resource" id=7]
+script = ExtResource( 2 )
+angle_start = 250
+angle_size = 40
+
+[sub_resource type="Resource" id=8]
+script = ExtResource( 2 )
+angle_start = 290
+angle_size = 50
+
+[sub_resource type="Resource" id=9]
+script = ExtResource( 3 )
+animation = "walk_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=10]
+script = ExtResource( 3 )
+animation = "walk_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=11]
+script = ExtResource( 3 )
+animation = "walk_right_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=12]
+script = ExtResource( 3 )
+animation = "walk_down_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=13]
+script = ExtResource( 3 )
+animation = "walk_down_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=14]
+script = ExtResource( 3 )
+animation = "walk_down_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=15]
+script = ExtResource( 3 )
+animation = "walk_left_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=16]
+script = ExtResource( 3 )
+animation = "walk_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=17]
+script = ExtResource( 3 )
+animation = "idle_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=18]
+script = ExtResource( 3 )
+animation = "idle_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=19]
+script = ExtResource( 3 )
+animation = "idle_right_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=20]
+script = ExtResource( 3 )
+animation = "idle_down_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=21]
+script = ExtResource( 3 )
+animation = "idle_down_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=22]
+script = ExtResource( 3 )
+animation = "idle_down_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=23]
+script = ExtResource( 3 )
+animation = "idle_left_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=24]
+script = ExtResource( 3 )
+animation = "idle_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=25]
+script = ExtResource( 3 )
+animation = "speak_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=26]
+script = ExtResource( 3 )
+animation = "speak_up_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=27]
+script = ExtResource( 3 )
+animation = "speak_right_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=28]
+script = ExtResource( 3 )
+animation = "speak_down_right_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=29]
+script = ExtResource( 3 )
+animation = "speak_down_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=30]
+script = ExtResource( 3 )
+animation = "speak_down_left_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=31]
+script = ExtResource( 3 )
+animation = "speak_left_jester"
+mirrored = false
+
+[sub_resource type="Resource" id=32]
+script = ExtResource( 3 )
+animation = "speak_up_jester"
+mirrored = false
+
+[resource]
+script = ExtResource( 1 )
+dir_angles = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ]
+directions = [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ]
+idles = [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ]
+speaks = [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ]
diff --git a/gymkhana/characters/mark/mark_talk.tscn b/gymkhana/characters/mark/mark_talk.tscn
new file mode 100644
index 00000000..6f37c920
--- /dev/null
+++ b/gymkhana/characters/mark/mark_talk.tscn
@@ -0,0 +1,34 @@
+[gd_scene load_steps=8 format=2]
+
+[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=1]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 1 )
+region = Rect2( 24, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 1 )
+region = Rect2( 48, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 1 )
+region = Rect2( 72, 0, 24, 70 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 1 )
+region = Rect2( 96, 0, 24, 70 )
+
+[sub_resource type="SpriteFrames" id=6]
+animations = [ {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+} ]
+
+[node name="AnimatedSprite" type="AnimatedSprite"]
+frames = SubResource( 6 )
diff --git a/gymkhana/characters/mark/mark_think.tscn b/gymkhana/characters/mark/mark_think.tscn
new file mode 100644
index 00000000..c80159d4
--- /dev/null
+++ b/gymkhana/characters/mark/mark_think.tscn
@@ -0,0 +1,58 @@
+[gd_scene load_steps=12 format=2]
+
+[ext_resource path="res://game/characters/mark/png/mark_thinking_question.png" type="Texture" id=1]
+[ext_resource path="res://game/characters/mark/png/mark_thinking.png" type="Texture" id=2]
+
+[sub_resource type="AtlasTexture" id=1]
+atlas = ExtResource( 1 )
+region = Rect2( 0, 0, 27, 27 )
+
+[sub_resource type="AtlasTexture" id=2]
+atlas = ExtResource( 1 )
+region = Rect2( 189, 0, 27, 27 )
+
+[sub_resource type="AtlasTexture" id=3]
+atlas = ExtResource( 1 )
+region = Rect2( 162, 0, 27, 27 )
+
+[sub_resource type="AtlasTexture" id=4]
+atlas = ExtResource( 1 )
+region = Rect2( 135, 0, 27, 27 )
+
+[sub_resource type="AtlasTexture" id=5]
+atlas = ExtResource( 1 )
+region = Rect2( 108, 0, 27, 27 )
+
+[sub_resource type="AtlasTexture" id=6]
+atlas = ExtResource( 1 )
+region = Rect2( 81, 0, 27, 27 )
+
+[sub_resource type="AtlasTexture" id=7]
+atlas = ExtResource( 1 )
+region = Rect2( 54, 0, 27, 27 )
+
+[sub_resource type="AtlasTexture" id=8]
+atlas = ExtResource( 1 )
+region = Rect2( 27, 0, 27, 27 )
+
+[sub_resource type="SpriteFrames" id=9]
+animations = [ {
+"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ],
+"loop": true,
+"name": "default",
+"speed": 8.0
+} ]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="MarkThinking" type="Sprite" parent="."]
+position = Vector2( -48, 0 )
+scale = Vector2( 4, 4 )
+texture = ExtResource( 2 )
+
+[node name="AnimatedSprite" type="AnimatedSprite" parent="."]
+position = Vector2( 54, 0 )
+scale = Vector2( 4, 4 )
+frames = SubResource( 9 )
+frame = 6
+playing = true
diff --git a/gymkhana/characters/mark/png/mark.png b/gymkhana/characters/mark/png/mark.png
new file mode 100644
index 00000000..91cacd24
Binary files /dev/null and b/gymkhana/characters/mark/png/mark.png differ
diff --git a/gymkhana/characters/mark/png/mark_talk_down.png b/gymkhana/characters/mark/png/mark_talk_down.png
new file mode 100644
index 00000000..85a7ba2f
Binary files /dev/null and b/gymkhana/characters/mark/png/mark_talk_down.png differ
diff --git a/gymkhana/characters/mark/png/mark_talk_down_right.png b/gymkhana/characters/mark/png/mark_talk_down_right.png
new file mode 100644
index 00000000..820a4531
Binary files /dev/null and b/gymkhana/characters/mark/png/mark_talk_down_right.png differ
diff --git a/gymkhana/characters/mark/png/mark_talk_right.png b/gymkhana/characters/mark/png/mark_talk_right.png
new file mode 100644
index 00000000..15937f21
Binary files /dev/null and b/gymkhana/characters/mark/png/mark_talk_right.png differ
diff --git a/gymkhana/characters/mark/png/mark_talk_up.png b/gymkhana/characters/mark/png/mark_talk_up.png
new file mode 100644
index 00000000..1d85e560
Binary files /dev/null and b/gymkhana/characters/mark/png/mark_talk_up.png differ
diff --git a/gymkhana/characters/mark/png/mark_talk_up_right.png b/gymkhana/characters/mark/png/mark_talk_up_right.png
new file mode 100644
index 00000000..a21e4b5b
Binary files /dev/null and b/gymkhana/characters/mark/png/mark_talk_up_right.png differ
diff --git a/gymkhana/characters/mark/png/mark_thinking.png b/gymkhana/characters/mark/png/mark_thinking.png
new file mode 100644
index 00000000..05d53f1d
Binary files /dev/null and b/gymkhana/characters/mark/png/mark_thinking.png differ
diff --git a/gymkhana/characters/mark/png/mark_thinking_question.png b/gymkhana/characters/mark/png/mark_thinking_question.png
new file mode 100644
index 00000000..55fe47d2
Binary files /dev/null and b/gymkhana/characters/mark/png/mark_thinking_question.png differ
diff --git a/gymkhana/characters/mark/png/markjester.png b/gymkhana/characters/mark/png/markjester.png
new file mode 100644
index 00000000..4aaa672d
Binary files /dev/null and b/gymkhana/characters/mark/png/markjester.png differ
diff --git a/gymkhana/characters/mark/png/markjester_talk.png b/gymkhana/characters/mark/png/markjester_talk.png
new file mode 100644
index 00000000..2833bc84
Binary files /dev/null and b/gymkhana/characters/mark/png/markjester_talk.png differ
diff --git a/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg b/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg
new file mode 100644
index 00000000..163cc564
Binary files /dev/null and b/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg differ
diff --git a/gymkhana/rooms/home/art1.png b/gymkhana/rooms/home/art1.png
new file mode 100644
index 00000000..21ad184a
Binary files /dev/null and b/gymkhana/rooms/home/art1.png differ
diff --git a/gymkhana/rooms/home/art2.png b/gymkhana/rooms/home/art2.png
new file mode 100644
index 00000000..a0045ee5
Binary files /dev/null and b/gymkhana/rooms/home/art2.png differ
diff --git a/gymkhana/rooms/home/esc/right_exit.esc b/gymkhana/rooms/home/esc/right_exit.esc
new file mode 100644
index 00000000..f7d53f2c
--- /dev/null
+++ b/gymkhana/rooms/home/esc/right_exit.esc
@@ -0,0 +1,3 @@
+:exit_scene
+play_snd res://game/sfx/sounds/doorOpen_2.ogg
+change_scene "res://game/rooms/room02/room02.tscn"
diff --git a/gymkhana/rooms/home/esc/right_platform.esc b/gymkhana/rooms/home/esc/right_platform.esc
new file mode 100755
index 00000000..3940a3d7
--- /dev/null
+++ b/gymkhana/rooms/home/esc/right_platform.esc
@@ -0,0 +1,3 @@
+:look
+say player "That's the other side."
+
diff --git a/gymkhana/rooms/home/esc/room01.esc b/gymkhana/rooms/home/esc/room01.esc
new file mode 100644
index 00000000..5042d5ef
--- /dev/null
+++ b/gymkhana/rooms/home/esc/room01.esc
@@ -0,0 +1,29 @@
+:setup
+
+
+> [eq ESC_LAST_SCENE room2]
+	teleport player r1_r_exit
+	# Set player look left
+	set_angle player 270
+	stop
+
+
+:ready
+
+play_snd res://game/sfx/contemplation.ogg _music
+
+> [!room1_visited]
+	set_global room1_visited true
+	set_global dialog_advance 0 
+	set_global dialog_popup_advance 0
+	walk_block player r1_destination_point
+	wait 2
+	walk_block player r1_destination_point2
+	wait 2
+	set_angle player 225 0.2
+	wait 2
+	walk_block player r1_destination_point3
+	wait 1
+	turn_to player r1_r_exit
+	
+
diff --git a/gymkhana/rooms/home/esc/trigger.esc b/gymkhana/rooms/home/esc/trigger.esc
new file mode 100644
index 00000000..0555b052
--- /dev/null
+++ b/gymkhana/rooms/home/esc/trigger.esc
@@ -0,0 +1,5 @@
+:trigger_in
+
+
+:trigger_out
+say player "I'm near the door."
diff --git a/gymkhana/rooms/home/esc/wall_item.esc b/gymkhana/rooms/home/esc/wall_item.esc
new file mode 100755
index 00000000..699df6a7
--- /dev/null
+++ b/gymkhana/rooms/home/esc/wall_item.esc
@@ -0,0 +1,13 @@
+:look
+> [eq dialog_advance 0]
+	say player ROOM1_look_wall_item_1:"I don't know what that stuff is."
+	set_global dialog_advance 1
+	stop
+> [eq dialog_advance 1]
+	say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is."
+	set_global dialog_advance 2
+	stop
+> [eq dialog_advance 2]
+	say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!"
+	say player ROOM1_look_wall_item_4:"Please stop asking me that!"
+	stop
diff --git a/gymkhana/rooms/home/esc/wall_item_popupdialog.esc b/gymkhana/rooms/home/esc/wall_item_popupdialog.esc
new file mode 100755
index 00000000..04ddc8c6
--- /dev/null
+++ b/gymkhana/rooms/home/esc/wall_item_popupdialog.esc
@@ -0,0 +1,13 @@
+:look
+> [eq dialog_popup_advance 0]
+	say player ROOM1_look_wall_item_1:"I don't know what that stuff is." avatar
+	set_global dialog_popup_advance 1
+	stop
+> [eq dialog_popup_advance 1]
+	say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." avatar
+	set_global dialog_popup_advance 2
+	stop
+> [eq dialog_popup_advance 2]
+	say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" avatar
+	say player ROOM1_look_wall_item_4:"Please stop asking me that!" avatar
+	stop
diff --git a/game/rooms/sarrera/Gymkhana.png b/gymkhana/rooms/home/intro/Gymkhana.png
similarity index 100%
rename from game/rooms/sarrera/Gymkhana.png
rename to gymkhana/rooms/home/intro/Gymkhana.png
diff --git a/game/rooms/sarrera/esc/intro.esc b/gymkhana/rooms/home/intro/esc/intro.esc
similarity index 100%
rename from game/rooms/sarrera/esc/intro.esc
rename to gymkhana/rooms/home/intro/esc/intro.esc
diff --git a/game/rooms/sarrera/escoria-logo-comet-anim.png b/gymkhana/rooms/home/intro/escoria-logo-comet-anim.png
similarity index 100%
rename from game/rooms/sarrera/escoria-logo-comet-anim.png
rename to gymkhana/rooms/home/intro/escoria-logo-comet-anim.png
diff --git a/game/rooms/sarrera/escoria-logo-comet.png b/gymkhana/rooms/home/intro/escoria-logo-comet.png
similarity index 100%
rename from game/rooms/sarrera/escoria-logo-comet.png
rename to gymkhana/rooms/home/intro/escoria-logo-comet.png
diff --git a/game/rooms/sarrera/escoria_background.png b/gymkhana/rooms/home/intro/escoria_background.png
similarity index 100%
rename from game/rooms/sarrera/escoria_background.png
rename to gymkhana/rooms/home/intro/escoria_background.png
diff --git a/game/rooms/sarrera/escoria_background_1080p.png b/gymkhana/rooms/home/intro/escoria_background_1080p.png
similarity index 100%
rename from game/rooms/sarrera/escoria_background_1080p.png
rename to gymkhana/rooms/home/intro/escoria_background_1080p.png
diff --git a/game/rooms/sarrera/intro_background_space.png b/gymkhana/rooms/home/intro/intro_background_space.png
similarity index 100%
rename from game/rooms/sarrera/intro_background_space.png
rename to gymkhana/rooms/home/intro/intro_background_space.png
diff --git a/game/rooms/sarrera/intro_background_space_1080p.png b/gymkhana/rooms/home/intro/intro_background_space_1080p.png
similarity index 100%
rename from game/rooms/sarrera/intro_background_space_1080p.png
rename to gymkhana/rooms/home/intro/intro_background_space_1080p.png
diff --git a/game/rooms/sarrera/intro_room.tscn b/gymkhana/rooms/home/intro/intro_room.tscn
similarity index 92%
rename from game/rooms/sarrera/intro_room.tscn
rename to gymkhana/rooms/home/intro/intro_room.tscn
index 195c2fc0..62c87547 100644
--- a/game/rooms/sarrera/intro_room.tscn
+++ b/gymkhana/rooms/home/intro/intro_room.tscn
@@ -1,41 +1,41 @@
 [gd_scene load_steps=17 format=2]
 
-[ext_resource path="res://game/rooms/intro/escoria-logo-comet-anim.png" type="Texture" id=1]
-[ext_resource path="res://game/rooms/sarrera/intro_background_space.png" type="Texture" id=2]
-[ext_resource path="res://game/rooms/intro/escoria-logo-comet.png" type="Texture" id=3]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=4]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=5]
-[ext_resource path="res://game/rooms/intro/escoria_background.png" type="Texture" id=6]
-[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=2]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3]
+[ext_resource path="res://game/rooms/intro/escoria_background.png" type="Texture" id=4]
+[ext_resource path="res://game/rooms/intro/escoria-logo-comet-anim.png" type="Texture" id=5]
+[ext_resource path="res://game/rooms/intro/escoria-logo-comet.png" type="Texture" id=6]
+[ext_resource path="res://gymkhana/rooms/home/intro/intro_background_space.png" type="Texture" id=7]
 
 [sub_resource type="AtlasTexture" id=1]
 flags = 4
-atlas = ExtResource( 1 )
+atlas = ExtResource( 5 )
 region = Rect2( 0, 0, 340, 400 )
 
 [sub_resource type="AtlasTexture" id=2]
 flags = 4
-atlas = ExtResource( 1 )
+atlas = ExtResource( 5 )
 region = Rect2( 340, 0, 340, 400 )
 
 [sub_resource type="AtlasTexture" id=3]
 flags = 4
-atlas = ExtResource( 1 )
+atlas = ExtResource( 5 )
 region = Rect2( 680, 0, 340, 400 )
 
 [sub_resource type="AtlasTexture" id=4]
 flags = 4
-atlas = ExtResource( 1 )
+atlas = ExtResource( 5 )
 region = Rect2( 1020, 0, 340, 400 )
 
 [sub_resource type="AtlasTexture" id=5]
 flags = 4
-atlas = ExtResource( 1 )
+atlas = ExtResource( 5 )
 region = Rect2( 1360, 0, 340, 400 )
 
 [sub_resource type="AtlasTexture" id=6]
 flags = 4
-atlas = ExtResource( 1 )
+atlas = ExtResource( 5 )
 region = Rect2( 1700, 0, 340, 400 )
 
 [sub_resource type="SpriteFrames" id=7]
@@ -233,7 +233,7 @@ tracks/9/keys = {
 }
 
 [node name="ESCRoom" type="Node2D"]
-script = ExtResource( 5 )
+script = ExtResource( 2 )
 global_id = "intro_cutscene"
 esc_script = "res://game/rooms/intro/esc/intro.esc"
 camera_limits = [ Rect2( 0, 0, 1920, 1080 ) ]
@@ -242,14 +242,14 @@ camera_limits = [ Rect2( 0, 0, 1920, 1080 ) ]
 margin_right = 1279.0
 margin_bottom = 900.0
 mouse_filter = 2
-texture = ExtResource( 6 )
+texture = ExtResource( 4 )
 expand = true
 stretch_mode = 1
-script = ExtResource( 4 )
+script = ExtResource( 1 )
 
 [node name="IntroBackgroundSpace" type="Sprite" parent="."]
 position = Vector2( 641, 451 )
-texture = ExtResource( 2 )
+texture = ExtResource( 7 )
 
 [node name="animated_asteroid" type="AnimatedSprite" parent="."]
 visible = false
@@ -265,11 +265,11 @@ polygon = PoolVector2Array( 0, 0, 1280, 0, 1280, 900, 0, 900 )
 visible = false
 modulate = Color( 1, 1, 1, 0 )
 position = Vector2( 620, 450 )
-texture = ExtResource( 3 )
+texture = ExtResource( 6 )
 
 [node name="ESCItem" type="Area2D" parent="."]
 pause_mode = 1
-script = ExtResource( 7 )
+script = ExtResource( 3 )
 global_id = "intro_animation_player"
 combine_when_selected_action_is_in = [  ]
 dialog_color = Color( 1, 1, 1, 1 )
diff --git a/gymkhana/rooms/home/room01.tscn b/gymkhana/rooms/home/room01.tscn
new file mode 100644
index 00000000..4d663941
--- /dev/null
+++ b/gymkhana/rooms/home/room01.tscn
@@ -0,0 +1,217 @@
+[gd_scene load_steps=12 format=2]
+
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2]
+[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3]
+[ext_resource path="res://gymkhana/characters/mark/mark.tscn" type="PackedScene" id=4]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
+[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=7]
+[ext_resource path="res://game/rooms/room01/room1background.png" type="Texture" id=8]
+[ext_resource path="res://game/rooms/room01/art2.png" type="Texture" id=9]
+[ext_resource path="res://game/rooms/room01/art1.png" type="Texture" id=10]
+
+[sub_resource type="NavigationPolygon" id=1]
+vertices = PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 )
+polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ) ]
+outlines = [ PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 ) ]
+
+[node name="room1" type="Node2D"]
+script = ExtResource( 6 )
+__meta__ = {
+"_edit_vertical_guides_": [  ]
+}
+global_id = "room1"
+esc_script = "res://game/rooms/room01/esc/room01.esc"
+player_scene = ExtResource( 4 )
+camera_limits = [ Rect2( 0, 0, 1280, 550 ) ]
+editor_debug_mode = 1
+
+[node name="ESCBackground" type="TextureRect" parent="."]
+margin_right = 40.0
+margin_bottom = 40.0
+mouse_filter = 2
+texture = ExtResource( 8 )
+script = ExtResource( 2 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="advice2" type="Label" parent="ESCBackground"]
+anchor_right = 0.023274
+anchor_bottom = 0.018018
+margin_left = 90.2752
+margin_top = 170.824
+margin_right = 298.275
+margin_bottom = 215.824
+custom_fonts/font = ExtResource( 3 )
+text = "Move : left click
+Fast move : double left click"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="room_label" type="Label" parent="ESCBackground"]
+margin_left = 7.0
+margin_top = 3.0
+margin_right = 89.0
+margin_bottom = 24.0
+custom_fonts/font = ExtResource( 3 )
+text = "ROOM 1"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="advice" type="Label" parent="ESCBackground"]
+anchor_right = 0.023274
+anchor_bottom = 0.018018
+margin_left = 90.0
+margin_top = 59.0
+margin_right = 368.0
+margin_bottom = 128.0
+custom_fonts/font = ExtResource( 3 )
+text = "Don't click immediately! 
+Player will walk around the room, 
+but you can interrupt him if you want."
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="walkable_area" type="Navigation2D" parent="."]
+script = ExtResource( 1 )
+
+[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="walkable_area"]
+navpoly = SubResource( 1 )
+
+[node name="Hotspots" type="Node2D" parent="."]
+
+[node name="r_door" type="Area2D" parent="Hotspots"]
+pause_mode = 1
+script = ExtResource( 5 )
+global_id = "r1_r_exit"
+esc_script = "res://game/rooms/room01/esc/right_exit.esc"
+is_exit = true
+tooltip_name = "Exit to room 2"
+default_action = "walk"
+combine_when_selected_action_is_in = [  ]
+dialog_color = Color( 1, 1, 1, 1 )
+animations = null
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"]
+polygon = PoolVector2Array( 1173, 63, 1278, 106, 1278, 420, 1172, 356 )
+
+[node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"]
+position = Vector2( 1221, 400 )
+script = ExtResource( 7 )
+
+[node name="artwork1" type="Area2D" parent="Hotspots"]
+pause_mode = 1
+script = ExtResource( 5 )
+global_id = "r1_wall_item1"
+esc_script = "res://game/rooms/room01/esc/wall_item.esc"
+tooltip_name = "Artwork"
+default_action = "look"
+combine_when_selected_action_is_in = [  ]
+inventory_texture = ExtResource( 10 )
+dialog_color = Color( 1, 1, 1, 1 )
+animations = null
+
+[node name="Art1" type="Sprite" parent="Hotspots/artwork1"]
+position = Vector2( 470, 140 )
+texture = ExtResource( 10 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/artwork1"]
+position = Vector2( -84, 11.1 )
+polygon = PoolVector2Array( 487, 62, 627, 62, 627, 198, 487, 199 )
+
+[node name="ESCLocation" type="Position2D" parent="Hotspots/artwork1"]
+position = Vector2( 476, 385 )
+script = ExtResource( 7 )
+
+[node name="Label" type="Label" parent="Hotspots/artwork1"]
+margin_left = 375.422
+margin_top = 268.594
+margin_right = 657.422
+margin_bottom = 313.594
+custom_fonts/font = ExtResource( 3 )
+text = "If you look at this object, the character's
+speech will appear above his head"
+__meta__ = {
+"_edit_use_anchors_": false,
+"_editor_description_": ""
+}
+
+[node name="artwork2" type="Area2D" parent="Hotspots"]
+pause_mode = 1
+script = ExtResource( 5 )
+global_id = "r1_wall_item2"
+esc_script = "res://game/rooms/room01/esc/wall_item_popupdialog.esc"
+tooltip_name = "Artwork 2"
+default_action = "look"
+combine_when_selected_action_is_in = [  ]
+inventory_texture = ExtResource( 9 )
+dialog_color = Color( 1, 1, 1, 1 )
+animations = null
+
+[node name="Art12" type="Sprite" parent="Hotspots/artwork2"]
+position = Vector2( 830, 140 )
+texture = ExtResource( 9 )
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/artwork2"]
+position = Vector2( 273, 11 )
+polygon = PoolVector2Array( 487, 62, 627, 62, 627, 198, 487, 199 )
+
+[node name="ESCLocation" type="Position2D" parent="Hotspots/artwork2"]
+position = Vector2( 829, 379 )
+script = ExtResource( 7 )
+
+[node name="Label2" type="Label" parent="Hotspots/artwork2"]
+margin_left = 734.0
+margin_top = 269.0
+margin_right = 1020.0
+margin_bottom = 314.0
+custom_fonts/font = ExtResource( 3 )
+text = "If you look at this object, the character
+will talk via a popup"
+__meta__ = {
+"_edit_use_anchors_": false,
+"_editor_description_": ""
+}
+
+[node name="trigger_talk" type="Area2D" parent="Hotspots"]
+pause_mode = 1
+script = ExtResource( 5 )
+global_id = "trigger_talk"
+esc_script = "res://game/rooms/room01/esc/trigger.esc"
+is_trigger = true
+player_orients_on_arrival = false
+combine_when_selected_action_is_in = [  ]
+dialog_color = Color( 1, 1, 1, 1 )
+animations = null
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/trigger_talk"]
+polygon = PoolVector2Array( 1027, 352, 1187, 502, 1249.67, 445.131, 1123, 351 )
+
+[node name="player_start" type="Position2D" parent="."]
+position = Vector2( 172.471, 434.487 )
+script = ExtResource( 7 )
+global_id = "r1_start"
+is_start_location = true
+
+[node name="orients_down_on_arrival" type="Position2D" parent="."]
+position = Vector2( 400.129, 432.969 )
+script = ExtResource( 7 )
+global_id = "r1_destination_point"
+interaction_direction = 4
+
+[node name="set_angle_by_esc" type="Position2D" parent="."]
+position = Vector2( 934.11, 502.959 )
+script = ExtResource( 7 )
+global_id = "r1_destination_point2"
+player_orients_on_arrival = false
+
+[node name="turn_to_r_door_by_esc" type="Position2D" parent="."]
+position = Vector2( 660.468, 381.489 )
+script = ExtResource( 7 )
+global_id = "r1_destination_point3"
+player_orients_on_arrival = false
diff --git a/gymkhana/rooms/home/room1background.png b/gymkhana/rooms/home/room1background.png
new file mode 100644
index 00000000..a2d5cd86
Binary files /dev/null and b/gymkhana/rooms/home/room1background.png differ