diff --git a/navar_city/westgatehouse b/navar_city/westgatehouse
new file mode 100644
index 000000000..cd05ebf18
--- /dev/null
+++ b/navar_city/westgatehouse
@@ -0,0 +1,1651 @@
+arch map
+name Port of Navar, West Gate House
+region navar
+width 21
+height 13
+msg
+Created:  2011-09-18 Rick Tanner
+Modified: 2011-09-19 Rick Tanner
+endmsg
+outdoor 1
+end
+arch grass_only
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 45
+y 3
+end
+arch cobblestones2
+y 3
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 45
+y 4
+end
+arch cobblestones2
+y 4
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 46
+y 5
+end
+arch cobblestones2
+y 5
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 46
+y 6
+end
+arch cobblestones2
+y 6
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 46
+y 7
+end
+arch cobblestones2
+y 7
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 47
+y 8
+end
+arch cobblestones2
+y 8
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 47
+y 9
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch grass_only
+y 12
+end
+arch grass_only
+x 1
+end
+arch cobblestones2
+x 1
+y 1
+end
+arch cobblestones2
+x 1
+y 2
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 45
+x 1
+y 3
+end
+arch cobblestones2
+x 1
+y 3
+end
+arch cobblestones2
+x 1
+y 4
+end
+arch cobblestones2
+x 1
+y 5
+end
+arch light4
+x 1
+y 6
+end
+arch cobblestones2
+x 1
+y 6
+end
+arch cobblestones2
+x 1
+y 7
+end
+arch cobblestones2
+x 1
+y 8
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 47
+x 1
+y 9
+end
+arch cobblestones2
+x 1
+y 9
+end
+arch cobblestones2
+x 1
+y 10
+end
+arch cobblestones2
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 12
+end
+arch grass_only
+x 2
+end
+arch cobblestones2
+x 2
+y 1
+end
+arch cobblestones2
+x 2
+y 2
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 45
+x 2
+y 3
+end
+arch cobblestones2
+x 2
+y 3
+end
+arch cobblestones2
+x 2
+y 4
+end
+arch cobblestones2
+x 2
+y 5
+end
+arch light4
+x 2
+y 6
+end
+arch cobblestones2
+x 2
+y 6
+end
+arch cobblestones2
+x 2
+y 7
+end
+arch cobblestones2
+x 2
+y 8
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 7
+sp 47
+x 2
+y 9
+end
+arch cobblestones2
+x 2
+y 9
+end
+arch cobblestones2
+x 2
+y 10
+end
+arch cobblestones2
+x 2
+y 11
+end
+arch grass_only
+x 2
+y 12
+end
+arch grass_only
+x 3
+end
+arch cobblestones2
+x 3
+y 1
+end
+arch westcwall_2_2_2
+x 3
+y 1
+end
+arch cobblestones2
+x 3
+y 2
+end
+arch westcwall_2_1_1
+x 3
+y 2
+end
+arch cobblestones2
+x 3
+y 3
+end
+arch westcwall_3_2
+x 3
+y 3
+end
+arch cobblestones2
+x 3
+y 4
+end
+arch westcwall_1_2
+x 3
+y 4
+end
+arch cobblestones2
+x 3
+y 5
+end
+arch cobblestones2
+x 3
+y 6
+end
+arch cobblestones2
+x 3
+y 7
+end
+arch cobblestones2
+x 3
+y 8
+end
+arch westcwall_1_1
+x 3
+y 8
+end
+arch cobblestones2
+x 3
+y 9
+end
+arch westcwall_3_2
+x 3
+y 9
+end
+arch cobblestones2
+x 3
+y 10
+end
+arch westcwall_2_1_1
+x 3
+y 10
+end
+arch cobblestones2
+x 3
+y 11
+end
+arch westcwall_2_2_1
+x 3
+y 11
+end
+arch grass_only
+x 3
+y 12
+end
+arch grass_only
+x 4
+end
+arch cobblestones2
+x 4
+y 1
+end
+arch westcwall_2_1_2
+x 4
+y 1
+end
+arch cobblestones2
+x 4
+y 2
+end
+arch light1
+x 4
+y 3
+end
+arch cobblestones2
+x 4
+y 3
+end
+arch westcwall_win2
+x 4
+y 3
+end
+arch cobblestones2
+x 4
+y 4
+end
+arch brazier
+x 4
+y 4
+end
+arch cobblestones2
+x 4
+y 5
+end
+arch cobblestones2
+x 4
+y 6
+end
+arch cobblestones2
+x 4
+y 7
+end
+arch cobblestones2
+x 4
+y 8
+end
+arch brazier
+x 4
+y 8
+end
+arch light1
+x 4
+y 9
+end
+arch cobblestones2
+x 4
+y 9
+end
+arch westcwall_win2
+x 4
+y 9
+end
+arch cobblestones2
+x 4
+y 10
+end
+arch cobblestones2
+x 4
+y 11
+end
+arch westcwall_2_1_2
+x 4
+y 11
+end
+arch grass_only
+x 4
+y 12
+end
+arch grass_only
+x 5
+end
+arch cobblestones2
+x 5
+y 1
+end
+arch westcwall_2_1_2
+x 5
+y 1
+end
+arch cobblestones2
+x 5
+y 2
+end
+arch cobblestones2
+x 5
+y 3
+end
+arch westcwall_2_1_2
+x 5
+y 3
+end
+arch cobblestones2
+x 5
+y 4
+end
+arch guard
+x 5
+y 4
+end
+arch cobblestones2
+x 5
+y 5
+end
+arch cobblestones2
+x 5
+y 6
+end
+arch cobblestones2
+x 5
+y 7
+end
+arch cobblestones2
+x 5
+y 8
+end
+arch guard
+x 5
+y 8
+end
+arch cobblestones2
+x 5
+y 9
+end
+arch westcwall_2_1_2
+x 5
+y 9
+end
+arch cobblestones2
+x 5
+y 10
+end
+arch cobblestones2
+x 5
+y 11
+end
+arch westcwall_2_1_2
+x 5
+y 11
+end
+arch grass_only
+x 5
+y 12
+end
+arch grass_only
+x 6
+end
+arch cobblestones2
+x 6
+y 1
+end
+arch westcwall_2_1_2
+x 6
+y 1
+end
+arch cobblestones2
+x 6
+y 2
+end
+arch cobblestones2
+x 6
+y 3
+end
+arch westcwall_2_1_2
+x 6
+y 3
+end
+arch cobblestones2
+x 6
+y 4
+end
+arch westcwall_0
+x 6
+y 4
+end
+arch cobblestones2
+x 6
+y 5
+end
+arch light4
+x 6
+y 6
+end
+arch cobblestones2
+x 6
+y 6
+end
+arch cobblestones2
+x 6
+y 7
+end
+arch cobblestones2
+x 6
+y 8
+end
+arch westcwall_0
+x 6
+y 8
+end
+arch cobblestones2
+x 6
+y 9
+end
+arch westcwall_2_1_2
+x 6
+y 9
+end
+arch cobblestones2
+x 6
+y 10
+end
+arch cobblestones2
+x 6
+y 11
+end
+arch westcwall_2_1_2
+x 6
+y 11
+end
+arch grass_only
+x 6
+y 12
+end
+arch grass_only
+x 7
+end
+arch cobblestones2
+x 7
+y 1
+end
+arch westcwall_2_1_2
+x 7
+y 1
+end
+arch cobblestones2
+x 7
+y 2
+end
+arch cobblestones2
+x 7
+y 3
+end
+arch westcwall_2_1_2
+x 7
+y 3
+end
+arch cobblestones2
+x 7
+y 4
+end
+arch cobblestones2
+x 7
+y 5
+end
+arch cobblestones2
+x 7
+y 6
+end
+arch cobblestones2
+x 7
+y 7
+end
+arch cobblestones2
+x 7
+y 8
+end
+arch cobblestones2
+x 7
+y 9
+end
+arch westcwall_2_1_2
+x 7
+y 9
+end
+arch cobblestones2
+x 7
+y 10
+end
+arch cobblestones2
+x 7
+y 11
+end
+arch westcwall_2_1_2
+x 7
+y 11
+end
+arch grass_only
+x 7
+y 12
+end
+arch grass_only
+x 8
+end
+arch cobblestones2
+x 8
+y 1
+end
+arch westcwall_2_1_2
+x 8
+y 1
+end
+arch cobblestones2
+x 8
+y 2
+end
+arch light1
+x 8
+y 3
+end
+arch cobblestones2
+x 8
+y 3
+end
+arch westcwall_win2
+x 8
+y 3
+end
+arch cobblestones2
+x 8
+y 4
+end
+arch guard
+x 8
+y 4
+end
+arch cobblestones2
+x 8
+y 5
+end
+arch cobblestones2
+x 8
+y 6
+end
+arch cobblestones2
+x 8
+y 7
+end
+arch cobblestones2
+x 8
+y 8
+end
+arch guard
+x 8
+y 8
+end
+arch light1
+x 8
+y 9
+end
+arch cobblestones2
+x 8
+y 9
+end
+arch westcwall_win2
+x 8
+y 9
+end
+arch cobblestones2
+x 8
+y 10
+end
+arch cobblestones2
+x 8
+y 11
+end
+arch westcwall_2_1_2
+x 8
+y 11
+end
+arch grass_only
+x 8
+y 12
+end
+arch grass_only
+x 9
+end
+arch cobblestones2
+x 9
+y 1
+end
+arch westcwall_2_1_2
+x 9
+y 1
+end
+arch cobblestones2
+x 9
+y 2
+end
+arch cobblestones2
+x 9
+y 3
+end
+arch westcwall_2_1_2
+x 9
+y 3
+end
+arch cobblestones2
+x 9
+y 4
+end
+arch brazier
+x 9
+y 4
+end
+arch cobblestones2
+x 9
+y 5
+end
+arch cobblestones2
+x 9
+y 6
+end
+arch cobblestones2
+x 9
+y 7
+end
+arch cobblestones2
+x 9
+y 8
+end
+arch brazier
+x 9
+y 8
+end
+arch cobblestones2
+x 9
+y 9
+end
+arch westcwall_2_1_2
+x 9
+y 9
+end
+arch cobblestones2
+x 9
+y 10
+end
+arch cobblestones2
+x 9
+y 11
+end
+arch westcwall_2_1_2
+x 9
+y 11
+end
+arch grass_only
+x 9
+y 12
+end
+arch cobblestones2
+x 10
+end
+arch westcwall_2_1_1
+x 10
+end
+arch cobblestones2
+x 10
+y 1
+end
+arch westcwall_4
+x 10
+y 1
+end
+arch cobblestones2
+x 10
+y 2
+end
+arch westcwall_2_1_1
+x 10
+y 2
+end
+arch cobblestones2
+x 10
+y 3
+end
+arch westcwall_3_1
+x 10
+y 3
+end
+arch cobblestones2
+x 10
+y 4
+end
+arch westcwall_0
+x 10
+y 4
+end
+arch cobblestones2
+x 10
+y 5
+end
+arch light4
+x 10
+y 6
+end
+arch cobblestones2
+x 10
+y 6
+end
+arch cobblestones2
+x 10
+y 7
+end
+arch cobblestones2
+x 10
+y 8
+end
+arch westcwall_0
+x 10
+y 8
+end
+arch cobblestones2
+x 10
+y 9
+end
+arch westcwall_3_3
+x 10
+y 9
+end
+arch cobblestones2
+x 10
+y 10
+end
+arch westcwall_2_1_1
+x 10
+y 10
+end
+arch cobblestones2
+x 10
+y 11
+end
+arch westcwall_4
+x 10
+y 11
+end
+arch cobblestones2
+x 10
+y 12
+end
+arch westcwall_2_1_1
+x 10
+y 12
+end
+arch grass_only
+x 11
+end
+arch cobblestones2
+x 11
+y 1
+end
+arch westcwall_2_1_2
+x 11
+y 1
+end
+arch cobblestones2
+x 11
+y 2
+end
+arch cobblestones2
+x 11
+y 3
+end
+arch westcwall_2_1_2
+x 11
+y 3
+end
+arch cobblestones2
+x 11
+y 4
+end
+arch brazier
+x 11
+y 4
+end
+arch cobblestones2
+x 11
+y 5
+end
+arch cobblestones2
+x 11
+y 6
+end
+arch cobblestones2
+x 11
+y 7
+end
+arch cobblestones2
+x 11
+y 8
+end
+arch brazier
+x 11
+y 8
+end
+arch cobblestones2
+x 11
+y 9
+end
+arch westcwall_2_1_2
+x 11
+y 9
+end
+arch cobblestones2
+x 11
+y 10
+end
+arch cobblestones2
+x 11
+y 11
+end
+arch westcwall_2_1_2
+x 11
+y 11
+end
+arch grass_only
+x 11
+y 12
+end
+arch grass_only
+x 12
+end
+arch cobblestones2
+x 12
+y 1
+end
+arch westcwall_2_1_2
+x 12
+y 1
+end
+arch cobblestones2
+x 12
+y 2
+end
+arch light1
+x 12
+y 3
+end
+arch cobblestones2
+x 12
+y 3
+end
+arch westcwall_win2
+x 12
+y 3
+end
+arch cobblestones2
+x 12
+y 4
+end
+arch guard
+x 12
+y 4
+end
+arch cobblestones2
+x 12
+y 5
+end
+arch cobblestones2
+x 12
+y 6
+end
+arch cobblestones2
+x 12
+y 7
+end
+arch cobblestones2
+x 12
+y 8
+end
+arch guard
+x 12
+y 8
+end
+arch light1
+x 12
+y 9
+end
+arch cobblestones2
+x 12
+y 9
+end
+arch westcwall_win2
+x 12
+y 9
+end
+arch cobblestones2
+x 12
+y 10
+end
+arch cobblestones2
+x 12
+y 11
+end
+arch westcwall_2_1_2
+x 12
+y 11
+end
+arch grass_only
+x 12
+y 12
+end
+arch grass_only
+x 13
+end
+arch cobblestones2
+x 13
+y 1
+end
+arch westcwall_2_1_2
+x 13
+y 1
+end
+arch cobblestones2
+x 13
+y 2
+end
+arch cobblestones2
+x 13
+y 3
+end
+arch westcwall_2_1_2
+x 13
+y 3
+end
+arch cobblestones2
+x 13
+y 4
+end
+arch cobblestones2
+x 13
+y 5
+end
+arch cobblestones2
+x 13
+y 6
+end
+arch cobblestones2
+x 13
+y 7
+end
+arch cobblestones2
+x 13
+y 8
+end
+arch cobblestones2
+x 13
+y 9
+end
+arch westcwall_2_1_2
+x 13
+y 9
+end
+arch cobblestones2
+x 13
+y 10
+end
+arch cobblestones2
+x 13
+y 11
+end
+arch westcwall_2_1_2
+x 13
+y 11
+end
+arch grass_only
+x 13
+y 12
+end
+arch grass_only
+x 14
+end
+arch cobblestones2
+x 14
+y 1
+end
+arch westcwall_2_1_2
+x 14
+y 1
+end
+arch cobblestones2
+x 14
+y 2
+end
+arch cobblestones2
+x 14
+y 3
+end
+arch westcwall_2_1_2
+x 14
+y 3
+end
+arch cobblestones2
+x 14
+y 4
+end
+arch westcwall_0
+x 14
+y 4
+end
+arch cobblestones2
+x 14
+y 5
+end
+arch light4
+x 14
+y 6
+end
+arch cobblestones2
+x 14
+y 6
+end
+arch cobblestones2
+x 14
+y 7
+end
+arch cobblestones2
+x 14
+y 8
+end
+arch westcwall_0
+x 14
+y 8
+end
+arch cobblestones2
+x 14
+y 9
+end
+arch westcwall_2_1_2
+x 14
+y 9
+end
+arch cobblestones2
+x 14
+y 10
+end
+arch cobblestones2
+x 14
+y 11
+end
+arch westcwall_2_1_2
+x 14
+y 11
+end
+arch grass_only
+x 14
+y 12
+end
+arch grass_only
+x 15
+end
+arch cobblestones2
+x 15
+y 1
+end
+arch westcwall_2_1_2
+x 15
+y 1
+end
+arch cobblestones2
+x 15
+y 2
+end
+arch cobblestones2
+x 15
+y 3
+end
+arch westcwall_2_1_2
+x 15
+y 3
+end
+arch cobblestones2
+x 15
+y 4
+end
+arch guard
+x 15
+y 4
+end
+arch cobblestones2
+x 15
+y 5
+end
+arch cobblestones2
+x 15
+y 6
+end
+arch cobblestones2
+x 15
+y 7
+end
+arch cobblestones2
+x 15
+y 8
+end
+arch guard
+x 15
+y 8
+end
+arch cobblestones2
+x 15
+y 9
+end
+arch westcwall_2_1_2
+x 15
+y 9
+end
+arch cobblestones2
+x 15
+y 10
+end
+arch cobblestones2
+x 15
+y 11
+end
+arch westcwall_2_1_2
+x 15
+y 11
+end
+arch grass_only
+x 15
+y 12
+end
+arch grass_only
+x 16
+end
+arch cobblestones2
+x 16
+y 1
+end
+arch westcwall_2_1_2
+x 16
+y 1
+end
+arch cobblestones2
+x 16
+y 2
+end
+arch light1
+x 16
+y 3
+end
+arch cobblestones2
+x 16
+y 3
+end
+arch westcwall_win2
+x 16
+y 3
+end
+arch cobblestones2
+x 16
+y 4
+end
+arch brazier
+x 16
+y 4
+end
+arch cobblestones2
+x 16
+y 5
+end
+arch cobblestones2
+x 16
+y 6
+end
+arch cobblestones2
+x 16
+y 7
+end
+arch cobblestones2
+x 16
+y 8
+end
+arch brazier
+x 16
+y 8
+end
+arch light1
+x 16
+y 9
+end
+arch cobblestones2
+x 16
+y 9
+end
+arch westcwall_win2
+x 16
+y 9
+end
+arch cobblestones2
+x 16
+y 10
+end
+arch cobblestones2
+x 16
+y 11
+end
+arch westcwall_2_1_2
+x 16
+y 11
+end
+arch grass_only
+x 16
+y 12
+end
+arch grass_only
+x 17
+end
+arch cobblestones2
+x 17
+y 1
+end
+arch westcwall_2_2_3
+x 17
+y 1
+end
+arch cobblestones2
+x 17
+y 2
+end
+arch westcwall_2_1_1
+x 17
+y 2
+end
+arch cobblestones2
+x 17
+y 3
+end
+arch westcwall_3_4
+x 17
+y 3
+end
+arch cobblestones2
+x 17
+y 4
+end
+arch westcwall_1_2
+x 17
+y 4
+end
+arch cobblestones2
+x 17
+y 5
+end
+arch cobblestones2
+x 17
+y 6
+end
+arch cobblestones2
+x 17
+y 7
+end
+arch cobblestones2
+x 17
+y 8
+end
+arch westcwall_1_1
+x 17
+y 8
+end
+arch cobblestones2
+x 17
+y 9
+end
+arch westcwall_3_4
+x 17
+y 9
+end
+arch cobblestones2
+x 17
+y 10
+end
+arch westcwall_2_1_1
+x 17
+y 10
+end
+arch cobblestones2
+x 17
+y 11
+end
+arch westcwall_2_2_4
+x 17
+y 11
+end
+arch grass_only
+x 17
+y 12
+end
+arch grass_only
+x 18
+end
+arch cobblestones2
+x 18
+y 1
+end
+arch cobblestones2
+x 18
+y 2
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 45
+x 18
+y 3
+end
+arch cobblestones2
+x 18
+y 3
+end
+arch cobblestones2
+x 18
+y 4
+end
+arch cobblestones2
+x 18
+y 5
+end
+arch light4
+x 18
+y 6
+end
+arch cobblestones2
+x 18
+y 6
+end
+arch cobblestones2
+x 18
+y 7
+end
+arch cobblestones2
+x 18
+y 8
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 47
+x 18
+y 9
+end
+arch cobblestones2
+x 18
+y 9
+end
+arch cobblestones2
+x 18
+y 10
+end
+arch cobblestones2
+x 18
+y 11
+end
+arch grass_only
+x 18
+y 12
+end
+arch grass_only
+x 19
+end
+arch cobblestones2
+x 19
+y 1
+end
+arch cobblestones2
+x 19
+y 2
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 45
+x 19
+y 3
+end
+arch cobblestones2
+x 19
+y 3
+end
+arch cobblestones2
+x 19
+y 4
+end
+arch cobblestones2
+x 19
+y 5
+end
+arch light4
+x 19
+y 6
+end
+arch cobblestones2
+x 19
+y 6
+end
+arch cobblestones2
+x 19
+y 7
+end
+arch cobblestones2
+x 19
+y 8
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 47
+x 19
+y 9
+end
+arch cobblestones2
+x 19
+y 9
+end
+arch cobblestones2
+x 19
+y 10
+end
+arch cobblestones2
+x 19
+y 11
+end
+arch grass_only
+x 19
+y 12
+end
+arch grass_only
+x 20
+end
+arch cobblestones2
+x 20
+y 1
+end
+arch cobblestones2
+x 20
+y 2
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 45
+x 20
+y 3
+end
+arch cobblestones2
+x 20
+y 3
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 45
+x 20
+y 4
+end
+arch cobblestones2
+x 20
+y 4
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 46
+x 20
+y 5
+end
+arch cobblestones2
+x 20
+y 5
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 46
+x 20
+y 6
+end
+arch cobblestones2
+x 20
+y 6
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 46
+x 20
+y 7
+end
+arch cobblestones2
+x 20
+y 7
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 47
+x 20
+y 8
+end
+arch cobblestones2
+x 20
+y 8
+end
+arch invis_exit
+slaying ../world/world_122_116
+hp 11
+sp 47
+x 20
+y 9
+end
+arch cobblestones2
+x 20
+y 9
+end
+arch cobblestones2
+x 20
+y 10
+end
+arch cobblestones2
+x 20
+y 11
+end
+arch grass_only
+x 20
+y 12
+end
diff --git a/world/world_122_116 b/world/world_122_116
index 8280e03de..f33981fac 100644
--- a/world/world_122_116
+++ b/world/world_122_116
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2009-07-12 Andreas Kirschbaum
+Modified: 2011-09-19 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_122_115
@@ -3018,6 +3018,10 @@ arch cobblestones2
 x 8
 y 45
 end
+arch westcwall_2_2_2
+x 8
+y 45
+end
 arch dungeon_magic
 x 8
 y 46
@@ -3026,6 +3030,13 @@ arch cobblestones2
 x 8
 y 46
 end
+arch westguard_house_1
+slaying ../navar_city/westgatehouse
+hp 1
+sp 6
+x 8
+y 46
+end
 arch dungeon_magic
 x 8
 y 47
@@ -3034,6 +3045,10 @@ arch cobblestones2
 x 8
 y 47
 end
+arch westcwall_2_2_1
+x 8
+y 47
+end
 arch dungeon_magic
 x 8
 y 48
@@ -3359,10 +3374,6 @@ arch westcwall_2_1_1
 x 9
 y 44
 end
-arch westcwall_1_1
-x 9
-y 44
-end
 arch dungeon_magic
 x 9
 y 45
@@ -3371,7 +3382,7 @@ arch cobblestones2
 x 9
 y 45
 end
-arch westcityport_b
+arch westcwall_4
 x 9
 y 45
 end
@@ -3383,7 +3394,14 @@ arch cobblestones2
 x 9
 y 46
 end
-arch westcityport_b
+arch westguard_house_1
+x 9
+y 46
+type 0
+move_block all
+is_floor 1
+end
+arch westguard_house_2
 x 9
 y 46
 end
@@ -3395,7 +3413,7 @@ arch cobblestones2
 x 9
 y 47
 end
-arch westcityport_b
+arch westcwall_4
 x 9
 y 47
 end
@@ -3411,10 +3429,6 @@ arch westcwall_2_1_1
 x 9
 y 48
 end
-arch westcwall_1_1
-x 9
-y 48
-end
 arch dungeon_magic
 x 9
 y 49
@@ -3742,6 +3756,10 @@ arch cobblestones2
 x 10
 y 45
 end
+arch westcwall_2_2_3
+x 10
+y 45
+end
 arch dungeon_magic
 x 10
 y 46
@@ -3750,6 +3768,13 @@ arch cobblestones2
 x 10
 y 46
 end
+arch westguard_house_2
+slaying ../navar_city/westgatehouse
+hp 19
+sp 6
+x 10
+y 46
+end
 arch dungeon_magic
 x 10
 y 47
@@ -3758,6 +3783,10 @@ arch cobblestones2
 x 10
 y 47
 end
+arch westcwall_2_2_4
+x 10
+y 47
+end
 arch dungeon_magic
 x 10
 y 48