diff --git a/brest/zorn/castle.upper.floor.two b/brest/zorn/castle.upper.floor.two
index e0ca0e975..f24f2479e 100644
--- a/brest/zorn/castle.upper.floor.two
+++ b/brest/zorn/castle.upper.floor.two
@@ -15,15 +15,39 @@ outdoor 1
 end
 arch brush
 end
+arch spikes_closed
+invisible 1
+connected 1987
+end
+arch spikes_moving
+invisible 1
+end
+arch food
+invisible 1
+end
 arch brush
 y 1
 end
+arch spikes_closed
+y 1
+connected 1987
+end
 arch brush
 y 2
 end
+arch altar_trigger
+name trigger the nasty events
+food 1
+y 2
+connected 12000
+end
 arch brush
 y 3
 end
+arch awall_1_4
+name alarm system
+y 3
+end
 arch brush
 y 4
 end
@@ -200,18 +224,47 @@ end
 arch brush
 x 1
 end
+arch awall_1_1
+name alarm system
+x 1
+end
 arch brush
 x 1
 y 1
 end
+arch awall_2_1_1
+name alarm system
+x 1
+y 1
+end
+arch magic_mouth
+name alarm goes off!
+msg
+YOU SUDDENLY HEAR A LOUD ALARM AND THE SOUNDS OF ACTIVITY!
+RUN! GET AWAY! RUN! GET AWAY! RUN! GET AWAY! RUN! GET AWAY!
+endmsg
+x 1
+y 2
+connected 12000
+end
 arch brush
 x 1
 y 2
 end
+arch awall_2_1_1
+name alarm system
+x 1
+y 2
+end
 arch brush
 x 1
 y 3
 end
+arch awall_3_1
+name alarm system
+x 1
+y 3
+end
 arch brush
 x 1
 y 4
@@ -445,18 +498,37 @@ end
 arch brush
 x 2
 end
+arch awall_1_1
+name alarm system
+x 2
+end
 arch brush
 x 2
 y 1
 end
+arch awall_2_1_1
+name alarm system
+x 2
+y 1
+end
 arch brush
 x 2
 y 2
 end
+arch awall_2_1_1
+name alarm system
+x 2
+y 2
+end
 arch brush
 x 2
 y 3
 end
+arch awall_2_2_4
+name alarm system
+x 2
+y 3
+end
 arch brush
 x 2
 y 4
@@ -3419,6 +3491,13 @@ arch woodfloor
 x 10
 y 17
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 10
+y 18
+connected 12000
+end
 arch woodfloor2
 x 10
 y 18
@@ -3589,6 +3668,15 @@ arch cobblestones2
 x 10
 y 26
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 10
+y 27
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 10
 y 27
@@ -3597,14 +3685,28 @@ arch stonefloor2
 x 10
 y 28
 end
-arch stonefloor2
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
 x 10
 y 29
+connected 12000
+lifesave 1
 end
 arch stonefloor2
 x 10
 y 30
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 10
+y 31
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 10
 y 31
@@ -3645,6 +3747,13 @@ arch woodfloor
 x 10
 y 39
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 10
+y 40
+connected 12000
+end
 arch woodfloor2
 x 10
 y 40
@@ -4673,6 +4782,13 @@ arch woodfloor2
 x 13
 y 20
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 13
+y 21
+connected 12000
+end
 arch woodfloor
 x 13
 y 21
@@ -4875,6 +4991,13 @@ arch woodfloor2
 x 13
 y 36
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 13
+y 37
+connected 12000
+end
 arch woodfloor
 x 13
 y 37
@@ -5230,6 +5353,15 @@ arch woodfloor2
 x 14
 y 13
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 14
+y 14
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 14
 y 14
@@ -5382,6 +5514,15 @@ arch woodfloor
 x 14
 y 43
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 14
+y 44
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 14
 y 44
@@ -5918,6 +6059,15 @@ arch woodfloor2
 x 16
 y 15
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 16
+y 16
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 16
 y 16
@@ -6054,6 +6204,15 @@ arch woodfloor
 x 16
 y 41
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 16
+y 42
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 16
 y 42
@@ -6561,6 +6720,13 @@ arch woodfloor2
 x 18
 y 9
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 18
+y 10
+connected 12000
+end
 arch woodfloor2
 x 18
 y 10
@@ -6735,6 +6901,15 @@ arch woodfloor2
 x 18
 y 17
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 18
+y 18
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 18
 y 18
@@ -6847,6 +7022,15 @@ arch woodfloor
 x 18
 y 39
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 18
+y 40
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 18
 y 40
@@ -6891,6 +7075,13 @@ arch woodfloor2
 x 18
 y 47
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 18
+y 48
+connected 12000
+end
 arch woodfloor2
 x 18
 y 48
@@ -7214,6 +7405,15 @@ arch woodfloor
 x 19
 y 21
 end
+arch gate_open_1
+name security gate
+x 19
+y 21
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 19
 y 22
@@ -7304,6 +7504,15 @@ arch woodfloor
 x 19
 y 37
 end
+arch gate_open_1
+name security gate
+x 19
+y 37
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 19
 y 38
@@ -7544,6 +7753,15 @@ arch woodfloor
 x 20
 y 21
 end
+arch gate_open_1
+name security gate
+x 20
+y 21
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 20
 y 22
@@ -7616,6 +7834,15 @@ arch woodfloor
 x 20
 y 37
 end
+arch gate_open_1
+name security gate
+x 20
+y 37
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 20
 y 38
@@ -7804,6 +8031,13 @@ arch woodfloor
 x 21
 y 12
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 21
+y 13
+connected 12000
+end
 arch woodfloor
 x 21
 y 13
@@ -8122,6 +8356,13 @@ arch woodfloor
 x 21
 y 44
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 21
+y 45
+connected 12000
+end
 arch woodfloor
 x 21
 y 45
@@ -10413,6 +10654,15 @@ arch stonefloor2
 x 27
 y 9
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 27
+y 10
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 27
 y 10
@@ -11145,6 +11395,15 @@ arch stonefloor2
 x 29
 y 9
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 29
+y 10
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 29
 y 10
@@ -11890,6 +12149,15 @@ arch stonefloor2
 x 31
 y 9
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 31
+y 10
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 31
 y 10
@@ -14320,6 +14588,13 @@ arch woodfloor
 x 37
 y 12
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 37
+y 13
+connected 12000
+end
 arch woodfloor
 x 37
 y 13
@@ -14638,6 +14913,13 @@ arch woodfloor
 x 37
 y 44
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 37
+y 45
+connected 12000
+end
 arch woodfloor
 x 37
 y 45
@@ -14959,6 +15241,15 @@ arch woodfloor
 x 38
 y 21
 end
+arch gate_open_1
+name security gate
+x 38
+y 21
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 38
 y 22
@@ -15031,6 +15322,15 @@ arch woodfloor
 x 38
 y 37
 end
+arch gate_open_1
+name security gate
+x 38
+y 37
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 38
 y 38
@@ -15276,6 +15576,15 @@ arch woodfloor
 x 39
 y 21
 end
+arch gate_open_1
+name security gate
+x 39
+y 21
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 39
 y 22
@@ -15366,6 +15675,15 @@ arch woodfloor
 x 39
 y 37
 end
+arch gate_open_1
+name security gate
+x 39
+y 37
+connected 12000
+no_pass 1
+no_magic 1
+damned 1
+end
 arch woodfloor2
 x 39
 y 38
@@ -15547,6 +15865,13 @@ arch woodfloor2
 x 40
 y 9
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 40
+y 10
+connected 12000
+end
 arch woodfloor2
 x 40
 y 10
@@ -15721,6 +16046,15 @@ arch woodfloor2
 x 40
 y 17
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 40
+y 18
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 40
 y 18
@@ -15833,6 +16167,15 @@ arch woodfloor
 x 40
 y 39
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 40
+y 40
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 40
 y 40
@@ -15877,6 +16220,13 @@ arch woodfloor2
 x 40
 y 47
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 40
+y 48
+connected 12000
+end
 arch woodfloor2
 x 40
 y 48
@@ -16518,6 +16868,15 @@ arch woodfloor2
 x 42
 y 15
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 42
+y 16
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 42
 y 16
@@ -16654,6 +17013,15 @@ arch woodfloor
 x 42
 y 41
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 42
+y 42
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 42
 y 42
@@ -17190,6 +17558,15 @@ arch woodfloor2
 x 44
 y 13
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 44
+y 14
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 44
 y 14
@@ -17342,6 +17719,15 @@ arch woodfloor
 x 44
 y 43
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 44
+y 44
+connected 12000
+lifesave 1
+end
 arch woodfloor2
 x 44
 y 44
@@ -17563,6 +17949,13 @@ arch woodfloor2
 x 45
 y 20
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 45
+y 21
+connected 12000
+end
 arch woodfloor
 x 45
 y 21
@@ -17765,6 +18158,13 @@ arch woodfloor2
 x 45
 y 36
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 45
+y 37
+connected 12000
+end
 arch woodfloor
 x 45
 y 37
@@ -18793,6 +19193,13 @@ arch woodfloor
 x 48
 y 17
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 48
+y 18
+connected 12000
+end
 arch woodfloor2
 x 48
 y 18
@@ -18963,6 +19370,15 @@ arch cobblestones2
 x 48
 y 26
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 48
+y 27
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 48
 y 27
@@ -18971,6 +19387,15 @@ arch stonefloor2
 x 48
 y 28
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 48
+y 29
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 48
 y 29
@@ -18979,6 +19404,15 @@ arch stonefloor2
 x 48
 y 30
 end
+arch creator
+name random encounter 1
+slaying Zorn Security Guard
+other_arch deathshead
+x 48
+y 31
+connected 12000
+lifesave 1
+end
 arch stonefloor2
 x 48
 y 31
@@ -19019,6 +19453,13 @@ arch woodfloor
 x 48
 y 39
 end
+arch duplicator
+name alarm bed remover
+other_arch bed_1
+x 48
+y 40
+connected 12000
+end
 arch woodfloor2
 x 48
 y 40
@@ -21909,14 +22350,28 @@ end
 arch brush
 x 56
 end
+arch awall_1_1
+name alarm system
+x 56
+end
 arch brush
 x 56
 y 1
 end
+arch awall_2_1_1
+name alarm system
+x 56
+y 1
+end
 arch brush
 x 56
 y 2
 end
+arch awall_2_2_1
+name alarm system
+x 56
+y 2
+end
 arch brush
 x 56
 y 3
@@ -22154,14 +22609,36 @@ end
 arch brush
 x 57
 end
+arch awall_1_1
+name alarm system
+x 57
+end
+arch magic_mouth
+msg
+You hear a click and a subtle ticking sound as if a timer has started. You get the feeling that staying here for very long might be a bad idea.
+endmsg
+x 57
+y 1
+connected 1987
+end
 arch brush
 x 57
 y 1
 end
+arch awall_2_1_1
+name alarm system
+x 57
+y 1
+end
 arch brush
 x 57
 y 2
 end
+arch awall_3_1
+name alarm system
+x 57
+y 2
+end
 arch brush
 x 57
 y 3
@@ -22399,14 +22876,33 @@ end
 arch brush
 x 58
 end
+arch spikes_moving
+x 58
+end
+arch food
+x 58
+end
 arch brush
 x 58
 y 1
 end
+arch altar_trigger
+name start timer
+exp 59900
+food 1
+x 58
+y 1
+connected 1987
+end
 arch brush
 x 58
 y 2
 end
+arch awall_1_3
+name alarm system
+x 58
+y 2
+end
 arch brush
 x 58
 y 3