diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index fb100f31..894a7934 100644
Binary files a/desktop/resources/cursor.png and b/desktop/resources/cursor.png differ
diff --git a/desktop/resources/cursor_light.png b/desktop/resources/cursor_light.png
index e572c973..67e336e4 100644
Binary files a/desktop/resources/cursor_light.png and b/desktop/resources/cursor_light.png differ
diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas
index a01567d0..48009a18 100644
--- a/desktop/resources/packed/pack.atlas
+++ b/desktop/resources/packed/pack.atlas
@@ -39,16 +39,9 @@ behindhouse/stick
   orig: 24, 42
   offset: 0, 0
   index: -1
-black
-  rotate: false
-  xy: 2013, 134
-  size: 32, 24
-  orig: 32, 24
-  offset: 0, 0
-  index: -1
 butterfly
   rotate: false
-  xy: 1475, 393
+  xy: 1897, 1471
   size: 14, 7
   orig: 14, 7
   offset: 0, 0
@@ -62,44 +55,23 @@ castle-gate/background
   index: -1
 castle-gate/coinflip
   rotate: false
-  xy: 1228, 904
+  xy: 1978, 876
   size: 50, 10
   orig: 50, 10
   offset: 0, 0
   index: -1
 castle-gate/frankie-walk-1
   rotate: false
-  xy: 2013, 234
+  xy: 2013, 168
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
-castle-gate/frankie-walk-2
+castle-gate/goon-2
   rotate: false
-  xy: 2013, 197
-  size: 24, 35
-  orig: 24, 35
-  offset: 0, 0
-  index: -1
-castle-gate/frankie-walk-3
-  rotate: false
-  xy: 2013, 160
-  size: 24, 35
-  orig: 24, 35
-  offset: 0, 0
-  index: -1
-castle-gate/frankie-walk-4
-  rotate: false
-  xy: 2021, 97
-  size: 24, 35
-  orig: 24, 35
-  offset: 0, 0
-  index: -1
-castle-gate/frankie-walk-5
-  rotate: false
-  xy: 2021, 60
-  size: 24, 35
-  orig: 24, 35
+  xy: 2013, 134
+  size: 24, 32
+  orig: 24, 32
   offset: 0, 0
   index: -1
 castle-gate/goon-2-flip
@@ -146,7 +118,7 @@ cat-tree/background
   index: -1
 cat-tree/cat
   rotate: false
-  xy: 1856, 1569
+  xy: 1228, 903
   size: 22, 11
   orig: 22, 11
   offset: 0, 0
@@ -172,21 +144,7 @@ cat-tree/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-title/dot
-  rotate: false
-  xy: 704, 916
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-inside-antique/dot
-  rotate: false
-  xy: 704, 916
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-outsidehouse/dot
+wizard/dot
   rotate: false
   xy: 704, 916
   size: 1, 1
@@ -200,6 +158,13 @@ inside-house/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
+outsidehouse/dot
+  rotate: false
+  xy: 704, 916
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
 ego/dot
   rotate: false
   xy: 704, 916
@@ -214,14 +179,21 @@ dream/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-inside-jail/dot
+title/dot
   rotate: false
   xy: 704, 916
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
-wizard/dot
+inside-antique/dot
+  rotate: false
+  xy: 704, 916
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+inside-jail/dot
   rotate: false
   xy: 704, 916
   size: 1, 1
@@ -265,14 +237,21 @@ cat-tree/grandma-cry-4
   index: -1
 cat-tree/grandma-cry-5
   rotate: false
-  xy: 1978, 885
+  xy: 1988, 1219
+  size: 58, 40
+  orig: 58, 40
+  offset: 0, 0
+  index: -1
+cat-tree/grandma-cry-6
+  rotate: false
+  xy: 1978, 888
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/monocle
   rotate: false
-  xy: 1978, 876
+  xy: 1856, 1573
   size: 28, 7
   orig: 28, 7
   offset: 0, 0
@@ -286,7 +265,7 @@ cat-tree/tree-r
   index: -1
 close
   rotate: false
-  xy: 463, 4
+  xy: 444, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -305,6 +284,13 @@ space/cloud
   orig: 15, 15
   offset: 0, 0
   index: -1
+cursorr
+  rotate: false
+  xy: 462, 4
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 dbh
   rotate: false
   xy: 2, 1086
@@ -342,7 +328,7 @@ dream/case
   index: -1
 dream/cliff
   rotate: false
-  xy: 1944, 1748
+  xy: 1952, 1130
   size: 81, 87
   orig: 81, 87
   offset: 0, 0
@@ -384,21 +370,21 @@ dream/plaque3
   index: -1
 dream/shovel
   rotate: false
-  xy: 2027, 1771
+  xy: 2013, 347
   size: 19, 64
   orig: 19, 64
   offset: 0, 0
   index: -1
 dream/sign
   rotate: false
-  xy: 1999, 1688
+  xy: 1999, 1698
   size: 41, 58
   orig: 41, 58
   offset: 0, 0
   index: -1
 dream/sword
   rotate: false
-  xy: 2031, 20
+  xy: 1491, 442
   size: 15, 38
   orig: 15, 38
   offset: 0, 0
@@ -419,7 +405,7 @@ ego/axe-wood
   index: -1
 ego/base
   rotate: false
-  xy: 1491, 444
+  xy: 2021, 96
   size: 16, 36
   orig: 16, 36
   offset: 0, 0
@@ -475,7 +461,7 @@ ego/glad
   index: -1
 ego/hold-hand
   rotate: false
-  xy: 1491, 406
+  xy: 2021, 58
   size: 16, 36
   orig: 16, 36
   offset: 0, 0
@@ -489,7 +475,7 @@ ego/ida
   index: -1
 ego/idea
   rotate: false
-  xy: 1978, 927
+  xy: 1978, 930
   size: 54, 70
   orig: 54, 70
   offset: 0, 0
@@ -517,7 +503,7 @@ ego/shock
   index: -1
 ego/spear
   rotate: false
-  xy: 1952, 1127
+  xy: 1944, 1758
   size: 90, 100
   orig: 90, 100
   offset: 0, 0
@@ -571,6 +557,13 @@ ending-castle/ending-castle2-assets/foreground
   orig: 344, 109
   offset: 0, 0
   index: -1
+ending-castle/frankie-fall-1
+  rotate: false
+  xy: 1999, 1661
+  size: 40, 35
+  orig: 40, 35
+  offset: 0, 0
+  index: -1
 ending-castle/guard-1
   rotate: false
   xy: 2007, 512
@@ -620,14 +613,14 @@ held/dot
   orig: 1, 1
   offset: 0, 0
   index: -1
-space/dot
+outside-jail/dot
   rotate: false
   xy: 2007, 468
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
-outside-jail/dot
+space/dot
   rotate: false
   xy: 2007, 468
   size: 1, 1
@@ -657,46 +650,39 @@ inside-antique/beard
   index: -1
 inside-antique/bowl
   rotate: false
-  xy: 1944, 1733
+  xy: 2031, 1955
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
   index: -1
 inside-antique/bowl-0
   rotate: false
-  xy: 1944, 1733
+  xy: 2031, 1955
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
   index: -1
 inside-antique/bowl-1
   rotate: false
-  xy: 1960, 1733
+  xy: 1696, 4
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
   index: -1
 inside-antique/bowl-2
   rotate: false
-  xy: 1976, 1733
+  xy: 480, 7
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
   index: -1
 inside-antique/bowl-3
   rotate: false
-  xy: 481, 7
+  xy: 1712, 4
   size: 14, 13
   orig: 14, 13
   offset: 0, 0
   index: -1
-inside-antique/shopkeep
-  rotate: false
-  xy: 2027, 1748
-  size: 18, 21
-  orig: 18, 21
-  offset: 0, 0
-  index: -1
 inside-antique/shopkeep-talk
   rotate: false
   xy: 1560, 877
@@ -755,7 +741,7 @@ inside-cafeteria/knights-stand
   index: -1
 inside-cafeteria/ladder
   rotate: false
-  xy: 2013, 350
+  xy: 2013, 284
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
@@ -776,7 +762,7 @@ inside-cafeteria/ladder-guard-2
   index: -1
 inside-cafeteria/warriors
   rotate: false
-  xy: 1978, 999
+  xy: 1978, 1002
   size: 66, 126
   orig: 66, 126
   offset: 0, 0
@@ -797,7 +783,7 @@ inside-castle/background
   index: -1
 inside-castle/bookstack
   rotate: false
-  xy: 2013, 313
+  xy: 2013, 247
   size: 27, 35
   orig: 27, 35
   offset: 0, 0
@@ -818,7 +804,7 @@ inside-castle/hands-fight
   index: -1
 inside-castle/monocle
   rotate: false
-  xy: 2008, 876
+  xy: 1842, 1471
   size: 28, 7
   orig: 28, 7
   offset: 0, 0
@@ -860,14 +846,14 @@ inside-castle/sign-2
   index: -1
 inside-castle/sign3
   rotate: false
-  xy: 1999, 1666
+  xy: 1944, 1736
   size: 44, 20
   orig: 44, 20
   offset: 0, 0
   index: -1
 inside-castle/sign-3
   rotate: false
-  xy: 1999, 1666
+  xy: 1944, 1736
   size: 44, 20
   orig: 44, 20
   offset: 0, 0
@@ -881,7 +867,7 @@ inside-castle/trophy
   index: -1
 inside-castle/watch
   rotate: false
-  xy: 2021, 50
+  xy: 1952, 1219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -900,9 +886,16 @@ inside-house/candle-aura
   orig: 108, 27
   offset: 0, 0
   index: -1
+inside-house/flask
+  rotate: false
+  xy: 1491, 401
+  size: 16, 21
+  orig: 16, 21
+  offset: 0, 0
+  index: -1
 inside-house/frog-legs
   rotate: false
-  xy: 444, 4
+  xy: 1491, 424
   size: 17, 16
   orig: 17, 16
   offset: 0, 0
@@ -972,7 +965,7 @@ inside-stash/candle
   index: -1
 inside-stash/lid
   rotate: false
-  xy: 1952, 1118
+  xy: 1872, 1471
   size: 23, 7
   orig: 23, 7
   offset: 0, 0
@@ -986,7 +979,7 @@ outside-castle/background
   index: -1
 outside-castle/bird
   rotate: false
-  xy: 2044, 1893
+  xy: 540, 535
   size: 2, 2
   orig: 2, 2
   offset: 0, 0
@@ -1040,13 +1033,6 @@ outside-jail/candle-aura2
   orig: 540, 135
   offset: 0, 0
   index: -1
-outside-jail/closed-stash
-  rotate: false
-  xy: 1988, 1229
-  size: 52, 30
-  orig: 52, 30
-  offset: 0, 0
-  index: -1
 outside-jail/guard-sleep
   rotate: false
   xy: 324, 66
@@ -1063,7 +1049,7 @@ outside-jail/rope
   index: -1
 outside-jail/spear
   rotate: false
-  xy: 1842, 1497
+  xy: 2035, 1166
   size: 11, 51
   orig: 11, 51
   offset: 0, 0
@@ -1103,16 +1089,9 @@ outsidehouse/charcoal-4
   orig: 18, 18
   offset: 0, 0
   index: -1
-outsidehouse/door
-  rotate: false
-  xy: 1946, 1837
-  size: 96, 58
-  orig: 96, 58
-  offset: 0, 0
-  index: -1
 outsidehouse/sheep
   rotate: false
-  xy: 2013, 390
+  xy: 2013, 324
   size: 33, 21
   orig: 33, 21
   offset: 0, 0
@@ -1159,6 +1138,13 @@ pos
   orig: 290, 129
   offset: 0, 0
   index: -1
+safe-anim
+  rotate: false
+  xy: 1946, 1860
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
 space/Blergh
   rotate: false
   xy: 1899, 468
@@ -1217,14 +1203,14 @@ space/bloodclot-talk
   index: -1
 space/broken-jewel
   rotate: false
-  xy: 2036, 297
+  xy: 2036, 1844
   size: 10, 14
   orig: 10, 14
   offset: 0, 0
   index: -1
 talk-bg-2
   rotate: false
-  xy: 2013, 271
+  xy: 2013, 205
   size: 21, 40
   orig: 21, 40
   offset: 0, 0
@@ -1259,14 +1245,14 @@ title/quill
   index: -1
 title/save-indicator
   rotate: false
-  xy: 2039, 636
+  xy: 1990, 1749
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 title/save-indicator-active
   rotate: false
-  xy: 2039, 627
+  xy: 1913, 1471
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
@@ -1294,7 +1280,7 @@ wizard/disappear
   index: -1
 wizard/flame
   rotate: false
-  xy: 1992, 1736
+  xy: 1952, 1118
   size: 5, 10
   orig: 5, 10
   offset: 0, 0
@@ -1347,6 +1333,13 @@ behindhouse/house
   orig: 320, 240
   offset: 0, 0
   index: -1
+black
+  rotate: false
+  xy: 832, 43
+  size: 32, 24
+  orig: 32, 24
+  offset: 0, 0
+  index: -1
 castle-gate/frankie
   rotate: false
   xy: 2, 29
@@ -1354,37 +1347,58 @@ castle-gate/frankie
   orig: 312, 35
   offset: 0, 0
   index: -1
-castle-gate/frankie-walk-6
+castle-gate/frankie-walk-2
   rotate: false
   xy: 2022, 468
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
-castle-gate/frankie-walk-7
+castle-gate/frankie-walk-3
   rotate: false
   xy: 2022, 431
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
-castle-gate/frankie-walk-8
+castle-gate/frankie-walk-4
   rotate: false
   xy: 2022, 394
   size: 24, 35
   orig: 24, 35
   offset: 0, 0
   index: -1
-castle-gate/goon-2
+castle-gate/frankie-walk-5
   rotate: false
-  xy: 2022, 360
-  size: 24, 32
-  orig: 24, 32
+  xy: 2022, 357
+  size: 24, 35
+  orig: 24, 35
+  offset: 0, 0
+  index: -1
+castle-gate/frankie-walk-6
+  rotate: false
+  xy: 2022, 320
+  size: 24, 35
+  orig: 24, 35
+  offset: 0, 0
+  index: -1
+castle-gate/frankie-walk-7
+  rotate: false
+  xy: 2022, 283
+  size: 24, 35
+  orig: 24, 35
+  offset: 0, 0
+  index: -1
+castle-gate/frankie-walk-8
+  rotate: false
+  xy: 2022, 246
+  size: 24, 35
+  orig: 24, 35
   offset: 0, 0
   index: -1
 castle-gate/goon-2-talk
   rotate: false
-  xy: 2022, 326
+  xy: 2022, 212
   size: 24, 32
   orig: 24, 32
   offset: 0, 0
@@ -1417,13 +1431,6 @@ cloudy
   orig: 20, 20
   offset: 0, 0
   index: -1
-cursorr
-  rotate: false
-  xy: 2030, 737
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
 dawn
   rotate: false
   xy: 968, 1806
@@ -1636,14 +1643,21 @@ inside-antique/open-blinds
   index: -1
 inside-antique/portrait
   rotate: false
-  xy: 2030, 665
+  xy: 2030, 706
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+inside-antique/shopkeep
+  rotate: false
+  xy: 2022, 85
+  size: 18, 21
+  orig: 18, 21
+  offset: 0, 0
+  index: -1
 inside-antique/teddy
   rotate: false
-  xy: 2030, 629
+  xy: 2030, 670
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1720,7 +1734,7 @@ inside-cafeteria/glow
   index: -1
 inside-castle/books
   rotate: false
-  xy: 866, 48
+  xy: 614, 10
   size: 34, 19
   orig: 34, 19
   offset: 0, 0
@@ -1781,13 +1795,6 @@ inside-house/desk
   orig: 320, 240
   offset: 0, 0
   index: -1
-inside-house/flask
-  rotate: false
-  xy: 2030, 755
-  size: 16, 21
-  orig: 16, 21
-  offset: 0, 0
-  index: -1
 inside-house/glow
   rotate: false
   xy: 968, 1080
@@ -1846,7 +1853,7 @@ inside-jail/warden
   index: -1
 inside-jail/window-bent
   rotate: false
-  xy: 2022, 222
+  xy: 2022, 108
   size: 18, 29
   orig: 18, 29
   offset: 0, 0
@@ -1874,14 +1881,14 @@ outside-castle/brush-bl
   index: -1
 outside-castle/note
   rotate: false
-  xy: 2030, 719
+  xy: 2030, 760
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 outside-castle/peddler
   rotate: false
-  xy: 2022, 253
+  xy: 2022, 139
   size: 18, 36
   orig: 18, 36
   offset: 0, 0
@@ -1895,7 +1902,7 @@ outside-castle/walk-behind
   index: -1
 outside-jail/axe
   rotate: false
-  xy: 2022, 291
+  xy: 2022, 177
   size: 22, 33
   orig: 22, 33
   offset: 0, 0
@@ -1951,14 +1958,14 @@ outsidehouse/house
   index: -1
 outsidehouse/lamb
   rotate: false
-  xy: 614, 10
+  xy: 650, 10
   size: 26, 19
   orig: 26, 19
   offset: 0, 0
   index: -1
 outsidehouse/note
   rotate: false
-  xy: 2030, 701
+  xy: 2030, 742
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1972,14 +1979,14 @@ outsidehouse/sheep-walk
   index: -1
 pathfind-test
   rotate: false
-  xy: 2030, 683
+  xy: 2030, 724
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 save
   rotate: false
-  xy: 2030, 647
+  xy: 2030, 688
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2119,7 +2126,7 @@ title/logo
   index: -1
 white
   rotate: false
-  xy: 832, 43
+  xy: 866, 43
   size: 32, 24
   orig: 32, 24
   offset: 0, 0
@@ -2153,7 +2160,7 @@ castle-gate/Untitled
   index: -1
 castle-gate/goon-1
   rotate: false
-  xy: 381, 50
+  xy: 1291, 561
   size: 26, 33
   orig: 26, 33
   offset: 0, 0
@@ -2230,105 +2237,98 @@ castle-gate/throw-walkie-9
   index: -1
 cat-tree/grandma-cry-10
   rotate: false
-  xy: 571, 15
+  xy: 412, 79
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-11
   rotate: false
-  xy: 631, 15
+  xy: 1374, 449
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-12
   rotate: false
-  xy: 891, 34
+  xy: 571, 15
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-13
   rotate: false
-  xy: 1323, 390
+  xy: 631, 15
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-14
   rotate: false
-  xy: 1383, 373
+  xy: 1374, 407
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-15
   rotate: false
-  xy: 1443, 373
+  xy: 1374, 365
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-16
   rotate: false
-  xy: 1503, 373
+  xy: 1891, 687
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-17
   rotate: false
-  xy: 1563, 373
+  xy: 381, 37
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-18
   rotate: false
-  xy: 1583, 806
+  xy: 1572, 510
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-19
   rotate: false
-  xy: 1643, 806
+  xy: 1773, 494
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-20
   rotate: false
-  xy: 1703, 806
-  size: 58, 40
-  orig: 58, 40
-  offset: 0, 0
-  index: -1
-cat-tree/grandma-cry-6
-  rotate: false
-  xy: 1988, 982
+  xy: 1833, 494
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-7
   rotate: false
-  xy: 1988, 940
+  xy: 1988, 982
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-8
   rotate: false
-  xy: 1988, 898
+  xy: 1988, 940
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
   index: -1
 cat-tree/grandma-cry-9
   rotate: false
-  xy: 412, 79
+  xy: 1988, 898
   size: 58, 40
   orig: 58, 40
   offset: 0, 0
@@ -2370,35 +2370,35 @@ ego/cat-toy
   index: -1
 ego/frustrated-talk
   rotate: false
-  xy: 1229, 618
+  xy: 801, 162
   size: 96, 36
   orig: 96, 36
   offset: 0, 0
   index: -1
 ego/grow
   rotate: false
-  xy: 801, 162
+  xy: 907, 374
   size: 90, 36
   orig: 90, 36
   offset: 0, 0
   index: -1
 ego/grow-talk
   rotate: false
-  xy: 1278, 580
+  xy: 1853, 684
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 ego/hand-hold
   rotate: false
-  xy: 1545, 816
+  xy: 1951, 691
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 ending-castle/hand-hold
   rotate: false
-  xy: 1545, 816
+  xy: 1951, 691
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
@@ -2412,126 +2412,126 @@ ego/hold-up-to-window
   index: -1
 ego/jump-straight
   rotate: false
-  xy: 1159, 453
+  xy: 905, 324
   size: 90, 48
   orig: 90, 48
   offset: 0, 0
   index: -1
 ego/love-10
   rotate: false
-  xy: 1452, 487
+  xy: 571, 57
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-11
   rotate: false
-  xy: 1504, 487
+  xy: 623, 57
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-12
   rotate: false
-  xy: 1556, 487
+  xy: 1070, 55
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-13
   rotate: false
-  xy: 1389, 415
+  xy: 1166, 489
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-14
   rotate: false
-  xy: 1441, 415
+  xy: 1166, 417
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-15
   rotate: false
-  xy: 1493, 415
+  xy: 1218, 489
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-16
   rotate: false
-  xy: 1545, 415
+  xy: 1218, 417
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-17
   rotate: false
-  xy: 472, 63
+  xy: 1270, 489
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-18
   rotate: false
-  xy: 571, 57
+  xy: 1270, 417
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-19
   rotate: false
-  xy: 623, 57
+  xy: 1322, 514
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-20
   rotate: false
-  xy: 885, 205
+  xy: 1322, 442
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-21
   rotate: false
-  xy: 1597, 415
+  xy: 1374, 491
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-22
   rotate: false
-  xy: 891, 76
+  xy: 1426, 491
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-23
   rotate: false
-  xy: 691, 25
+  xy: 1322, 370
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-24
   rotate: false
-  xy: 743, 25
+  xy: 1434, 362
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-25
   rotate: false
-  xy: 795, 13
+  xy: 691, 25
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-26
   rotate: false
-  xy: 1763, 776
+  xy: 743, 25
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
@@ -2545,63 +2545,63 @@ ego/love-4
   index: -1
 ego/love-5
   rotate: false
-  xy: 1334, 539
+  xy: 1961, 731
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-6
   rotate: false
-  xy: 411, 121
+  xy: 1783, 612
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-7
   rotate: false
-  xy: 1989, 767
+  xy: 1835, 612
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-8
   rotate: false
-  xy: 1337, 432
+  xy: 411, 121
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/love-9
   rotate: false
-  xy: 1400, 487
+  xy: 472, 63
   size: 50, 70
   orig: 50, 70
   offset: 0, 0
   index: -1
 ego/poke
   rotate: false
-  xy: 1159, 401
+  xy: 899, 161
   size: 80, 50
   orig: 80, 50
   offset: 0, 0
   index: -1
 ego/reach
   rotate: false
-  xy: 905, 326
+  xy: 1779, 684
   size: 72, 36
   orig: 72, 36
   offset: 0, 0
   index: -1
 ego/scared
   rotate: false
-  xy: 1386, 559
+  xy: 1783, 574
   size: 72, 36
   orig: 72, 36
   offset: 0, 0
   index: -1
 ego/scared-walk
   rotate: false
-  xy: 1180, 580
+  xy: 1681, 662
   size: 96, 36
   orig: 96, 36
   offset: 0, 0
@@ -2622,7 +2622,7 @@ ego/squat
   index: -1
 ego/squat-talk
   rotate: false
-  xy: 1460, 559
+  xy: 1781, 536
   size: 72, 36
   orig: 72, 36
   offset: 0, 0
@@ -2657,7 +2657,7 @@ ego/throw
   index: -1
 ego/warden
   rotate: false
-  xy: 847, 42
+  xy: 1688, 305
   size: 42, 41
   orig: 42, 41
   offset: 0, 0
@@ -2669,233 +2669,226 @@ ending-castle/crowd-right
   orig: 116, 135
   offset: 0, 0
   index: -1
-ending-castle/frankie-fall-1
-  rotate: false
-  xy: 1812, 592
-  size: 40, 35
-  orig: 40, 35
-  offset: 0, 0
-  index: -1
 ending-castle/frankie-fall-10
   rotate: false
-  xy: 453, 26
+  xy: 1252, 380
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-11
   rotate: false
-  xy: 1105, 311
+  xy: 1163, 343
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-12
   rotate: false
-  xy: 1115, 348
+  xy: 1205, 343
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-2
   rotate: false
-  xy: 998, 389
+  xy: 1089, 201
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-3
   rotate: false
-  xy: 1040, 389
+  xy: 1997, 356
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-4
   rotate: false
-  xy: 989, 352
+  xy: 1142, 247
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-5
   rotate: false
-  xy: 1031, 352
+  xy: 1142, 210
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-6
   rotate: false
-  xy: 1073, 348
+  xy: 1070, 18
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-7
   rotate: false
-  xy: 979, 315
+  xy: 1112, 18
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-8
   rotate: false
-  xy: 1021, 315
+  xy: 1168, 380
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/frankie-fall-9
   rotate: false
-  xy: 1063, 311
+  xy: 1210, 380
   size: 40, 35
   orig: 40, 35
   offset: 0, 0
   index: -1
 ending-castle/warden-2
   rotate: false
-  xy: 409, 36
+  xy: 1081, 374
   size: 42, 41
   orig: 42, 41
   offset: 0, 0
   index: -1
 georgia/kick-1
   rotate: false
-  xy: 1649, 419
+  xy: 1951, 528
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-10
   rotate: false
-  xy: 1241, 355
+  xy: 1993, 483
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-11
   rotate: false
-  xy: 1157, 311
+  xy: 1993, 438
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-12
   rotate: false
-  xy: 1199, 311
+  xy: 1993, 393
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-13
   rotate: false
-  xy: 1241, 310
+  xy: 1989, 686
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-14
   rotate: false
-  xy: 1283, 345
+  xy: 1981, 641
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-15
   rotate: false
-  xy: 1325, 345
+  xy: 1998, 596
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-16
   rotate: false
-  xy: 1283, 300
+  xy: 1079, 329
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-17
   rotate: false
-  xy: 1325, 300
+  xy: 1084, 284
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-18
   rotate: false
-  xy: 1367, 328
+  xy: 1100, 239
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-19
   rotate: false
-  xy: 1409, 328
+  xy: 1121, 329
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-2
   rotate: false
-  xy: 1812, 674
+  xy: 1909, 468
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-4
   rotate: false
-  xy: 1812, 674
+  xy: 1909, 468
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-20
   rotate: false
-  xy: 1451, 328
+  xy: 1126, 284
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-3
   rotate: false
-  xy: 1812, 629
+  xy: 1951, 483
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-5
   rotate: false
-  xy: 1811, 547
+  xy: 1909, 423
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-6
   rotate: false
-  xy: 1082, 385
+  xy: 1951, 438
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-7
   rotate: false
-  xy: 896, 280
+  xy: 1909, 378
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-8
   rotate: false
-  xy: 1157, 356
+  xy: 1951, 393
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
   index: -1
 georgia/kick-9
   rotate: false
-  xy: 1199, 356
+  xy: 1993, 528
   size: 40, 43
   orig: 40, 43
   offset: 0, 0
@@ -3077,7 +3070,7 @@ inside-cafeteria/warriors-stand
   index: -1
 inside-castle/door
   rotate: false
-  xy: 1251, 452
+  xy: 998, 275
   size: 84, 49
   orig: 84, 49
   offset: 0, 0
@@ -3091,35 +3084,35 @@ inside-castle/roof
   index: -1
 inside-castle/walkie-talkie
   rotate: false
-  xy: 1545, 780
+  xy: 1989, 803
   size: 35, 34
   orig: 35, 34
   offset: 0, 0
   index: -1
 inside-house/candle
   rotate: false
-  xy: 1076, 584
+  xy: 1411, 563
   size: 102, 32
   orig: 102, 32
   offset: 0, 0
   index: -1
 inside-jail/chest-top
   rotate: false
-  xy: 1577, 601
+  xy: 1548, 354
   size: 44, 32
   orig: 44, 32
   offset: 0, 0
   index: -1
 inside-jail/chest-top-open
   rotate: false
-  xy: 1608, 487
+  xy: 1951, 359
   size: 44, 32
   orig: 44, 32
   offset: 0, 0
   index: -1
 inside-jail/crowbar
   rotate: false
-  xy: 1334, 504
+  xy: 1225, 561
   size: 64, 33
   orig: 64, 33
   offset: 0, 0
@@ -3140,7 +3133,7 @@ outside-castle/peddler-talk
   index: -1
 outside-castle/balloons
   rotate: false
-  xy: 1534, 559
+  xy: 1515, 559
   size: 60, 36
   orig: 60, 36
   offset: 0, 0
@@ -3173,6 +3166,13 @@ outside-castle/steer
   orig: 200, 35
   offset: 0, 0
   index: -1
+outside-jail/closed-stash
+  rotate: false
+  xy: 1664, 462
+  size: 52, 30
+  orig: 52, 30
+  offset: 0, 0
+  index: -1
 outsidehouse/cauldron
   rotate: false
   xy: 582, 433
@@ -3180,6 +3180,13 @@ outsidehouse/cauldron
   orig: 200, 38
   offset: 0, 0
   index: -1
+outsidehouse/door
+  rotate: false
+  xy: 1229, 596
+  size: 96, 58
+  orig: 96, 58
+  offset: 0, 0
+  index: -1
 outsidehouse/fg1
   rotate: false
   xy: 1415, 789
@@ -3189,7 +3196,7 @@ outsidehouse/fg1
   index: -1
 outsidehouse/fgtest
   rotate: false
-  xy: 1082, 430
+  xy: 891, 84
   size: 75, 75
   orig: 75, 75
   offset: 0, 0
@@ -3201,6 +3208,209 @@ outsidehouse/lamb-walk
   orig: 108, 28
   offset: 0, 0
   index: -1
+safe-song/safe-song-1
+  rotate: false
+  xy: 1076, 581
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-10
+  rotate: false
+  xy: 968, 53
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-11
+  rotate: false
+  xy: 1545, 811
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-12
+  rotate: false
+  xy: 1647, 811
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-13
+  rotate: false
+  xy: 1749, 811
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-14
+  rotate: false
+  xy: 1545, 774
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-15
+  rotate: false
+  xy: 1647, 774
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-16
+  rotate: false
+  xy: 1749, 774
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-17
+  rotate: false
+  xy: 1573, 737
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-18
+  rotate: false
+  xy: 1573, 700
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-19
+  rotate: false
+  xy: 1675, 737
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-2
+  rotate: false
+  xy: 896, 287
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-20
+  rotate: false
+  xy: 1675, 700
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-21
+  rotate: false
+  xy: 1579, 663
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-22
+  rotate: false
+  xy: 1579, 626
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-23
+  rotate: false
+  xy: 1681, 625
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-24
+  rotate: false
+  xy: 1579, 589
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-25
+  rotate: false
+  xy: 1681, 588
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-26
+  rotate: false
+  xy: 1577, 552
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-27
+  rotate: false
+  xy: 1679, 551
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-28
+  rotate: false
+  xy: 1859, 766
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-29
+  rotate: false
+  xy: 1859, 729
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-3
+  rotate: false
+  xy: 896, 250
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-4
+  rotate: false
+  xy: 885, 213
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-5
+  rotate: false
+  xy: 998, 238
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-6
+  rotate: false
+  xy: 987, 201
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-7
+  rotate: false
+  xy: 981, 164
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-8
+  rotate: false
+  xy: 981, 127
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
+safe-song/safe-song-9
+  rotate: false
+  xy: 968, 90
+  size: 100, 35
+  orig: 100, 35
+  offset: 0, 0
+  index: -1
 space/Untitled
   rotate: false
   xy: 1367, 740
@@ -3266,35 +3476,35 @@ space/bloodclot-head-talk-1
   index: -1
 space/bloodclot-head-talk-10
   rotate: false
-  xy: 1409, 597
+  xy: 1495, 597
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-11
   rotate: false
-  xy: 1493, 597
+  xy: 807, 85
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-12
   rotate: false
-  xy: 1250, 503
+  xy: 914, 412
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-13
   rotate: false
-  xy: 914, 412
+  xy: 998, 426
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-14
   rotate: false
-  xy: 998, 426
+  xy: 1082, 427
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
@@ -3315,42 +3525,42 @@ space/bloodclot-head-talk-3
   index: -1
 space/bloodclot-head-talk-4
   rotate: false
-  xy: 1082, 507
+  xy: 1082, 504
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-5
   rotate: false
-  xy: 1166, 503
+  xy: 1321, 663
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-6
   rotate: false
-  xy: 1321, 663
+  xy: 1405, 674
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-7
   rotate: false
-  xy: 1405, 674
+  xy: 1327, 586
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-8
   rotate: false
-  xy: 1489, 674
+  xy: 1411, 597
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
   index: -1
 space/bloodclot-head-talk-9
   rotate: false
-  xy: 807, 85
+  xy: 1489, 674
   size: 82, 75
   orig: 82, 75
   offset: 0, 0
@@ -3371,98 +3581,98 @@ space/susp
   index: -1
 talk-bg
   rotate: false
-  xy: 1493, 331
+  xy: 1622, 453
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 title/balloon
   rotate: false
-  xy: 847, 2
+  xy: 1486, 356
   size: 60, 30
   orig: 60, 30
   offset: 0, 0
   index: -1
 wizard/Untitled
   rotate: false
-  xy: 1327, 611
+  xy: 999, 374
   size: 80, 50
   orig: 80, 50
   offset: 0, 0
   index: -1
 wizard/cloud
   rotate: false
-  xy: 909, 2
+  xy: 1718, 462
   size: 40, 30
   orig: 40, 30
   offset: 0, 0
   index: -1
 wizard/experiment-10
   rotate: false
-  xy: 1676, 749
+  xy: 1857, 555
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-11
   rotate: false
-  xy: 1573, 692
+  xy: 1478, 502
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-12
   rotate: false
-  xy: 1620, 692
+  xy: 1525, 502
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-13
   rotate: false
-  xy: 1667, 692
+  xy: 1481, 445
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-14
   rotate: false
-  xy: 1577, 635
+  xy: 1528, 445
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-15
   rotate: false
-  xy: 1624, 635
+  xy: 1575, 453
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-16
   rotate: false
-  xy: 1671, 635
+  xy: 1486, 388
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-17
   rotate: false
-  xy: 1623, 578
+  xy: 1533, 388
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-18
   rotate: false
-  xy: 1670, 578
+  xy: 1580, 396
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-19
   rotate: false
-  xy: 1714, 692
+  xy: 1632, 495
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
@@ -3476,70 +3686,70 @@ wizard/experiment-2
   index: -1
 wizard/experiment-20
   rotate: false
-  xy: 1718, 635
+  xy: 1679, 494
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-21
   rotate: false
-  xy: 1717, 578
+  xy: 1726, 494
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-22
   rotate: false
-  xy: 1761, 719
+  xy: 1627, 396
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-23
   rotate: false
-  xy: 1765, 662
+  xy: 1674, 405
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-24
   rotate: false
-  xy: 1765, 605
+  xy: 1721, 405
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-25
   rotate: false
-  xy: 1764, 548
+  xy: 1768, 437
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-26
   rotate: false
-  xy: 1608, 521
+  xy: 1768, 380
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-27
   rotate: false
-  xy: 1655, 521
+  xy: 1815, 437
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-28
   rotate: false
-  xy: 1702, 521
+  xy: 1815, 380
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-29
   rotate: false
-  xy: 1654, 464
+  xy: 1862, 437
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
@@ -3553,112 +3763,112 @@ wizard/experiment-3
   index: -1
 wizard/experiment-30
   rotate: false
-  xy: 1701, 464
+  xy: 1862, 380
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-31
   rotate: false
-  xy: 1691, 407
+  xy: 1594, 339
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-32
   rotate: false
-  xy: 1670, 350
+  xy: 1641, 339
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-33
   rotate: false
-  xy: 1717, 350
+  xy: 1688, 348
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-34
   rotate: false
-  xy: 1738, 407
+  xy: 1083, 144
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-35
   rotate: false
-  xy: 1748, 464
+  xy: 1887, 627
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-36
   rotate: false
-  xy: 1764, 350
+  xy: 1904, 570
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-37
   rotate: false
-  xy: 1785, 407
+  xy: 1934, 630
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-38
   rotate: false
-  xy: 1811, 350
+  xy: 1951, 573
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-39
   rotate: false
-  xy: 1808, 719
+  xy: 1904, 513
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-4
   rotate: false
-  xy: 524, 21
+  xy: 1178, 561
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-5
   rotate: false
-  xy: 893, 148
+  xy: 1434, 434
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-6
   rotate: false
-  xy: 1815, 791
+  xy: 524, 21
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-7
   rotate: false
-  xy: 1623, 358
+  xy: 795, 28
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-8
   rotate: false
-  xy: 1582, 749
+  xy: 842, 28
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
   index: -1
 wizard/experiment-9
   rotate: false
-  xy: 1629, 749
+  xy: 889, 27
   size: 45, 55
   orig: 45, 55
   offset: 0, 0
@@ -3672,14 +3882,14 @@ wizard/magic-hands
   index: -1
 wizard/talk
   rotate: false
-  xy: 907, 364
+  xy: 997, 326
   size: 80, 46
   orig: 80, 46
   offset: 0, 0
   index: -1
 wizard/talk-angry
   rotate: false
-  xy: 1241, 400
+  xy: 1777, 722
   size: 80, 50
   orig: 80, 50
   offset: 0, 0
diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png
index 427c585e..93e9f604 100644
Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ
diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png
index d3ac7b2a..2a9ed3a9 100644
Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ
diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png
index bd69fa16..1f3141a3 100644
Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ
diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj
index 42098601..7302927d 100644
--- a/desktop/src-common/advent/actions.clj
+++ b/desktop/src-common/advent/actions.clj
@@ -12,6 +12,7 @@
             [advent.actions :as actions]
             [advent.screens.dialogue :as dialogue]
             [advent.utils :as utils]
+            [advent.screens.rooms :as rooms]
             [advent.tween :as tween]
             [advent.tween :as tween]
             [clojure.core.async :refer [put! <! <!! >! >!! chan go thread take! alts!!]])
@@ -283,7 +284,7 @@
                 (done? [this screen entities]
                        (animation! (find-animation (get-in entities [:room :entities target-id ]) anim)
                                    :is-animation-finished
-                                   (- (:total-time screen) (get-in entities [:room :entities target-id :anim-start]))))
+                                   (- (:total-time screen) (doto (get-in entities [:room :entities target-id :anim-start]) println))))
 
                 (terminate [this screen entities] 
                            (if continue?
@@ -964,3 +965,55 @@
       (actions/talk entities :ego (first msgs) :anim :squat-talk :stop? false)
       (Thread/sleep 200)
       (recur entities (rest msgs)))))
+
+(defn wait [entities time]
+  (let [initial-time (atom nil)]
+    (run-action entities
+                (begin [this screen entities]
+                       (reset! initial-time (:total-time screen))
+                       entities)
+
+                (continue [this screen entities] entities)
+
+                (done? [this screen entities]
+                       (> (* 1000 (- (:total-time screen)
+                                     @initial-time))
+                          time))
+
+                (terminate [this screen entities]
+                           entities)
+                (skip-type [this screen entities]
+                          :none))))
+
+(defn play-safe [entities]
+  (let [safe-song-anim (utils/make-anim-seq "safe-song/safe-song" [100 35] 0.05 (flatten
+                                                                                 [
+                                                                                  [1 2 3]
+                                                                                  (repeat 2 [
+                                                                                             [5 6 7 8 8 7 6 6 6 6 6]
+                                                                                             (map (partial + 4) [5 6 7 8 8 7 6 6 6 6 6]) 
+                                                                                             (map (partial + 8) [5 6 7 8 8 7 6 6 6 6 6])
+                                                                                             (map (partial + 12) [5 6 7 8 8 7 6 6 6 6 6])
+                                                                                             18 18 18 18
+                                                                                             (map (partial + 16) [5 6 7 8 8 7 6 6 6 6 6])
+                                                                                             (repeat 45 22)])
+                                                                                  
+                                                                                  [22 22 22 22 22 22 22 22  26 27 28]
+                                                                                  
+                                                                                  ]))]
+    (Thread/sleep 200)
+    (add-entity entities :safe-song
+                (rooms/make-entity :safe-song
+                                   (assoc (utils/get-texture "safe-song/safe-song-1")
+                                     :x 130
+                                     :y 120 
+                                     :baseline 241
+                                     :anim nil
+                                     :anim-start 0
+                                     :play safe-song-anim)))
+    
+    (begin-animation entities :safe-song :play)
+    (wait entities 100)
+    (play-sound entities "safe-sound.ogg" 0.1 false)
+    (wait entities 10000)
+    (remove-entity entities :safe-song)))
diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj
index e9994974..2fb39331 100644
--- a/desktop/src-common/advent/screens/items.clj
+++ b/desktop/src-common/advent/screens/items.clj
@@ -168,4 +168,5 @@
    :magic-slingshot {:name "The Slinger's Shot" :value :magic-slingshot :cursor :magic-slingshot}
    :shovel {:name "Shovel" :value :shovel :cursor :shovel}
    :broom {:name "Broom" :value :broom :cursor :broom}
-   :dream-sword {:name "Sword" :value :dream-sword :cursor :sword}})
+   :dream-sword {:name "Sword" :value :dream-sword :cursor :sword}
+   :tune {:name "A Safe's Sound" :value :tune :cursor :tune}})
diff --git a/desktop/src-common/advent/screens/rooms/behind_house.clj b/desktop/src-common/advent/screens/rooms/behind_house.clj
index 572a9492..378b9ebe 100644
--- a/desktop/src-common/advent/screens/rooms/behind_house.clj
+++ b/desktop/src-common/advent/screens/rooms/behind_house.clj
@@ -24,6 +24,10 @@
             (actions/walk-to entities :ego [158 110]))
    :cursor :left})
 
+(defn increment-safe-listens [entities]
+  (actions/update-state entities
+                        (fn [state] (assoc state :safe-listen-count (inc (:safe-listen-count state 0))))))
+
 (defn make [screen]
   (rooms/make :music {:day :town-2 :night :night}
               :name "Behind house"
@@ -62,10 +66,10 @@
                              (assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5)
                              (assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]
                        :night [(assoc (utils/get-texture "behindhouse/background.png") :x 0 :y 0 :baseline 0)
-                             (assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122)
-                             (assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240)
-                             (assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5)
-                             (assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]}
+                               (assoc (utils/get-texture "behindhouse/house.png") :x 0 :y 0 :baseline 122)
+                               (assoc (utils/get-texture "behindhouse/brush.png") :x 0 :y 0 :baseline 240)
+                               (assoc (utils/get-texture "behindhouse/fgleft.png") :x -10 :y 0 :baseline 240 :parallax 1.5)
+                               (assoc (utils/get-texture "behindhouse/fg2.png") :x (- 320 122) :y 0 :baseline 240 :parallax 1.5)]}
               :entities {:stick (assoc (utils/get-texture "behindhouse/stick.png")
                                   :x 26 :y 80 :baseline 160
                                   :script (actions/get-script entities
@@ -74,13 +78,16 @@
                                                               (actions/remove-entity entities :stick)
                                                               (actions/give entities :stick)
                                                               (actions/talk entities :ego "This stick might be useful.")))
+                         
                          :peeling (assoc (utils/get-texture "behindhouse/house-cover.png")
                                     :x 60 :y 92 :baseline 148
                                     :script (actions/get-script entities
                                                                 (cond (= :night (get-in @entities [:state :time]))
                                                                       (actions/talk entities :ego "The house is empty right now.")
 
-                                                                      (get-in @entities [:state :opened-crack?])
+                                                                      (and (get-in @entities [:state :opened-crack?])
+                                                                           (= 0 (get-in @entities [:state :safe-listen-count] 0)))
+
                                                                       (do (actions/walk-to entities :ego [70 80])
                                                                           (actions/play-animation entities :ego :start-squat :stop? false)
                                                                           (actions/talk entities :ego "I can see Gandarf the wizard inside." :animate? false :stop? false)
@@ -90,7 +97,23 @@
                                                                           (actions/play-animation entities :ego :end-squat)
                                                                           (actions/talk entities :ego "A lot of good it'll do me to know his password while he's still there.")
                                                                           (steam/set-achievement "SAFE_AND_SOUND")
-                                                                          )
+                                                                          (increment-safe-listens entities))
+
+                                                                      (and (get-in @entities [:state :opened-crack?])
+                                                                           (= 1 (get-in @entities [:state :safe-listen-count] 0)))
+
+                                                                      (do (actions/walk-to entities :ego [70 80])
+                                                                          (actions/talk entities :ego "I'll give it another listen.")
+                                                                          (actions/play-animation entities :ego :start-squat :stop? false)
+                                                                          (actions/talk entities :ego "It looks like Gandarf's opening his Magi-safe." :animate? false :stop? false)
+                                                                          (actions/play-sound entities "safe-sound.ogg" 0.1)
+                                                                          (actions/play-animation entities :ego :end-squat)
+                                                                          (actions/talk entities :ego "Ugh! Now I've got it stuck in my head!")
+                                                                          (increment-safe-listens entities)
+                                                                          (actions/give entities :tune))
+
+                                                                      (get-in @entities [:state :opened-crack?])
+                                                                      (actions/talk entities :ego "I've got the tune stuck in my head already.")
 
                                                                       :else
                                                                       (do (actions/walk-to entities :ego [80 80] :face :left)
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 55eb90e3..77de25d2 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -314,6 +314,17 @@ void main ()
 
     :camera
     (common/one-liner "It's some sort of magical device that captures images.")
+
+    :tune
+    (actions/get-script entities
+                        (if (get-in @entities [:room :entities :wizard])
+                          (do
+                            (actions/talk entities :ego "Better not hum it with Gandarf around!")
+                            (actions/talk entities :wizard "What's that, boy?")
+                            (actions/talk entities :ego "Oh... Erm... Nothing."))
+                          (do
+                            (actions/talk entities :ego "Ugh! I have Gandarf's MagicSafe 2000 tune stuck in my head.")
+                            (actions/play-safe entities))))
     
     :alarm-clock
     (common/one-liner "It's a magic device that tells the time.")
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index 20df8549..5b9a141a 100644
--- a/desktop/src-common/advent/utils.clj
+++ b/desktop/src-common/advent/utils.clj
@@ -27,7 +27,7 @@
   (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
     (log/info (:input-x screen) (:input-y screen) "->" x y)))
 
-(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :charcoal :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot :active-main :shovel :broom])
+(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope :crowbar :note-1 :ash :sack-lunch :flies :spear :monocle :feather :spell-component :money :charcoal :broken-clock :slingshot :camera :walkie-talkies :alarm-clock :walkie-talkie :flask-water :flask-water-stuff :flask-water-stuff-2 :note-2 :magic-slingshot :active-main :shovel :broom :tune])
 
 (def settings (atom {:music-volume 50.0
                      :sound-volume 75.0