42 files changed, 84 insertions, 54 deletions
diff --git a/data/maps/the_great/doors.txtpb b/data/maps/the_great/doors.txtpb
index 463eaba..abbbc11 100644
--- a/data/maps/the_great/doors.txtpb
+++ b/data/maps/the_great/doors.txtpb

@@ -49,6 +49,7 @@ doors {
  type: LOCATION_ONLY
  panels { room: "West Side" name: "ERASE" }
  location_room: "West Side"
+  location_name: "ERASE"
 }
 doors {
  name: "Control Center Purple Door"
@@ -65,7 +66,7 @@ doors {
 doors {
  name: "Control Center Red Door"
  type: CONTROL_CENTER_COLOR
-  receivers: "Components/Doors/Gates/Gate"
+  receivers: "Components/Doors/entry_18"
  control_center_color: "red"
 }
 doors {
@@ -98,7 +99,8 @@ doors {
 doors {
  name: "Savory Painting"
  type: STANDARD
-  move_paintings { room: "West Side" name: "EXTRAVAGANT" }
+  #move_paintings { room: "West Side" name: "EXTRAVAGANT" }
+  receivers: "Components/Paintings/unless/teleportListener"
  panels { room: "West Side" name: "SAVORY" }
  panels { room: "West Side" name: "FLAVORS" }
  location_room: "West Side"
@@ -141,6 +143,7 @@ doors {
  panels { room: "Pillar Room" name: "CAUGHT" }
  panels { room: "Pillar Room" name: "TEN" }
  location_room: "Pillar Room"
+  location_name: "Puzzles"
 }
 doors {
  name: "North Landscape Entrance"
@@ -224,7 +227,7 @@ doors {
  name: "Tower Entrance"
  type: ITEM_ONLY
  receivers: "Components/Doors/entry_25"
-  switches: "double_letters"
+  double_letters: true
 }
 doors {
  name: "Maze Out/South Door"
@@ -390,11 +393,13 @@ doors {
  name: "Big Y"
  type: STANDARD
  receivers: "Components/Doors/question_3"
+  receivers: "Components/Doors/question_12"
  panels { room: "Question Room What" name: "QUESTION" answer: "why" }
  panels { room: "Question Room How" name: "QUESTION" answer: "why" }
  panels { room: "Question Room When" name: "QUESTION" answer: "why" }
  panels { room: "Question Room Who" name: "QUESTION" answer: "why" }
  location_room: "Question Room Who"
+  location_name: "Whys"
 }
 doors {
  name: "Talented Entrance"
@@ -417,6 +422,7 @@ doors {
  panels { room: "Back Area" name: "Right Landscape Top" answer: "tell" }
  panels { room: "Back Area" name: "Right Landscape Left" answer: "eyes" }
  location_room: "Back Area"
+  location_name: "Landscapes Room Alternate Answers"
 }
 doors {
  name: "Nature Room Door"
@@ -465,9 +471,13 @@ doors {
 }
 doors {
  name: "Lavender Cube"
-  type: ITEM_ONLY
+  type: EVENT
  receivers: "Components/Doors/entry_28"
-  switches: "lavender_cubes"
+  panels {
+    map: "the_ancient"
+    room: "Inside"
+    name: "COLOR"
+  }
 }
 doors {
  name: "Zero Entrance"
@@ -492,3 +502,14 @@ doors {
  panels { room: "Back Area" name: "PAINTING" }
  location_room: "Back Area"
 }
+doors {
+  name: "Cyan Doors"
+  type: EVENT
+  receivers: "Panels/General/entry_7/teleportListener"
+  double_letters: true
+}
+doors {
+  name: "Partial Entrance"
+  type: EVENT
+  panels { room: "West Side" name: "CLUE" }
+}
diff --git a/data/maps/the_great/rooms/Back Area.txtpb b/data/maps/the_great/rooms/Back Area.txtpb
index 3701249..c1b8ab3 100644
--- a/data/maps/the_great/rooms/Back Area.txtpb
+++ b/data/maps/the_great/rooms/Back Area.txtpb

@@ -1,5 +1,5 @@
 name: "Back Area"
-display_name: "Back Area"
+panel_display_name: "Back Area"
 panels {
  name: "PLANT"
  path: "Panels/General/entry_14"
diff --git a/data/maps/the_great/rooms/Behind Question Area.txtpb b/data/maps/the_great/rooms/Behind Question Area.txtpb
index 88f800f..744d4c4 100644
--- a/data/maps/the_great/rooms/Behind Question Area.txtpb
+++ b/data/maps/the_great/rooms/Behind Question Area.txtpb

@@ -1,5 +1,5 @@
 name: "Behind Question Area"
-display_name: "Main Area"
+panel_display_name: "Question Room"
 panels {
  name: "DEW"
  path: "Panels/General/uc_4"
diff --git a/data/maps/the_great/rooms/Colorful Entrance.txtpb b/data/maps/the_great/rooms/Colorful Entrance.txtpb
index 5d7c9b2..cb7eb25 100644
--- a/data/maps/the_great/rooms/Colorful Entrance.txtpb
+++ b/data/maps/the_great/rooms/Colorful Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Colorful Entrance"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 ports {
  name: "COLORFUL"
  path: "Meshes/Blocks/Warps/worldport13"
diff --git a/data/maps/the_great/rooms/Daedalus Entrance.txtpb b/data/maps/the_great/rooms/Daedalus Entrance.txtpb
index 7e1d477..003a8a3 100644
--- a/data/maps/the_great/rooms/Daedalus Entrance.txtpb
+++ b/data/maps/the_great/rooms/Daedalus Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Daedalus Entrance"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 panels {
  name: "MISSING"
  path: "Panels/General/entry_2"
diff --git a/data/maps/the_great/rooms/East Landscape.txtpb b/data/maps/the_great/rooms/East Landscape.txtpb
index 84fc182..44ed2c5 100644
--- a/data/maps/the_great/rooms/East Landscape.txtpb
+++ b/data/maps/the_great/rooms/East Landscape.txtpb

@@ -1,5 +1,5 @@
 name: "East Landscape"
-display_name: "East Landscape"
+panel_display_name: "East Landscape"
 panels {
  name: "COLOR"
  path: "Panels/General/entry_10"
diff --git a/data/maps/the_great/rooms/G Room.txtpb b/data/maps/the_great/rooms/G Room.txtpb
index 218a9c1..f93c899 100644
--- a/data/maps/the_great/rooms/G Room.txtpb
+++ b/data/maps/the_great/rooms/G Room.txtpb

@@ -1,5 +1,5 @@
 name: "G Room"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 letters {
  key: "g"
  path: "Components/Collectables/g"
diff --git a/data/maps/the_great/rooms/Hive Entrance.txtpb b/data/maps/the_great/rooms/Hive Entrance.txtpb
index ba886b1..cd6ba68 100644
--- a/data/maps/the_great/rooms/Hive Entrance.txtpb
+++ b/data/maps/the_great/rooms/Hive Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Hive Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
  name: "LOST"
  path: "Panels/Hive Room/hive_1"
diff --git a/data/maps/the_great/rooms/Jail Part 1.txtpb b/data/maps/the_great/rooms/Jail Part 1.txtpb
index bd468bd..452841b 100644
--- a/data/maps/the_great/rooms/Jail Part 1.txtpb
+++ b/data/maps/the_great/rooms/Jail Part 1.txtpb

@@ -1,5 +1,5 @@
 name: "Jail Part 1"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
  name: "FLAP"
  path: "Panels/Throat/throat_1"
diff --git a/data/maps/the_great/rooms/Jail Part 2.txtpb b/data/maps/the_great/rooms/Jail Part 2.txtpb
index 1f54dd5..1a0c975 100644
--- a/data/maps/the_great/rooms/Jail Part 2.txtpb
+++ b/data/maps/the_great/rooms/Jail Part 2.txtpb

@@ -1,5 +1,5 @@
 name: "Jail Part 2"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
  name: "DIGEST"
  path: "Panels/Bowels3/bowels_1"
diff --git a/data/maps/the_great/rooms/Jubilant Entrance.txtpb b/data/maps/the_great/rooms/Jubilant Entrance.txtpb
index eaf9811..0700a6b 100644
--- a/data/maps/the_great/rooms/Jubilant Entrance.txtpb
+++ b/data/maps/the_great/rooms/Jubilant Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Jubilant Entrance"
-display_name: "West Side"
+panel_display_name: "West Side"
 ports {
  name: "JUBILANT"
  path: "Meshes/Blocks/Warps/worldport12"
diff --git a/data/maps/the_great/rooms/Magnet Room.txtpb b/data/maps/the_great/rooms/Magnet Room.txtpb
index 4cf6433..2d122a4 100644
--- a/data/maps/the_great/rooms/Magnet Room.txtpb
+++ b/data/maps/the_great/rooms/Magnet Room.txtpb

@@ -1,5 +1,5 @@
 name: "Magnet Room"
-display_name: "Magnet Room"
+panel_display_name: "Magnet Room"
 panels {
  name: "AIRPLANE"
  path: "Panels/Magnet Room/magnet_2"
diff --git a/data/maps/the_great/rooms/Main Area.txtpb b/data/maps/the_great/rooms/Main Area.txtpb
index 40c7fbb..82ec48c 100644
--- a/data/maps/the_great/rooms/Main Area.txtpb
+++ b/data/maps/the_great/rooms/Main Area.txtpb

@@ -1,5 +1,5 @@
 name: "Main Area"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 panels {
  name: "INTRO"
  path: "Panels/General/entry_8"
@@ -111,6 +111,7 @@ panels {
  answer: "high"
  symbols: SUN
  symbols: ZERO
+  required_door { name: "Cyan Doors" }
 }
 panels {
  name: "CURT"
diff --git a/data/maps/the_great/rooms/Maze Center.txtpb b/data/maps/the_great/rooms/Maze Center.txtpb
index f557eaa..97ff146 100644
--- a/data/maps/the_great/rooms/Maze Center.txtpb
+++ b/data/maps/the_great/rooms/Maze Center.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Center"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "POOR"
  path: "Panels/Maze/maze_7"
diff --git a/data/maps/the_great/rooms/Maze Cold Area.txtpb b/data/maps/the_great/rooms/Maze Cold Area.txtpb
index 5886ca8..70b311e 100644
--- a/data/maps/the_great/rooms/Maze Cold Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Cold Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Cold Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "COLD"
  path: "Panels/Maze/maze_11"
diff --git a/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb b/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb
index d6f265f..1540ee2 100644
--- a/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb
+++ b/data/maps/the_great/rooms/Maze Empty Vestibule.txtpb

@@ -1,2 +1,2 @@
 name: "Maze Empty Vestibule"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
diff --git a/data/maps/the_great/rooms/Maze In Area.txtpb b/data/maps/the_great/rooms/Maze In Area.txtpb
index 13597a0..8c556aa 100644
--- a/data/maps/the_great/rooms/Maze In Area.txtpb
+++ b/data/maps/the_great/rooms/Maze In Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze In Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "IN"
  path: "Panels/Maze/maze_3"
diff --git a/data/maps/the_great/rooms/Maze Moon Area.txtpb b/data/maps/the_great/rooms/Maze Moon Area.txtpb
index b515224..10af4a1 100644
--- a/data/maps/the_great/rooms/Maze Moon Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Moon Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Moon Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "MOON"
  path: "Panels/Maze/maze_9"
diff --git a/data/maps/the_great/rooms/Maze Off Area.txtpb b/data/maps/the_great/rooms/Maze Off Area.txtpb
index 2fe7bed..c577129 100644
--- a/data/maps/the_great/rooms/Maze Off Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Off Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Off Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "OFF"
  path: "Panels/Maze/maze_14"
diff --git a/data/maps/the_great/rooms/Maze Slice Area.txtpb b/data/maps/the_great/rooms/Maze Slice Area.txtpb
index d720501..f59d6e5 100644
--- a/data/maps/the_great/rooms/Maze Slice Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Slice Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Slice Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "SLICE"
  path: "Panels/Maze/maze_4"
diff --git a/data/maps/the_great/rooms/Maze Smooth Area.txtpb b/data/maps/the_great/rooms/Maze Smooth Area.txtpb
index 8145357..156e885 100644
--- a/data/maps/the_great/rooms/Maze Smooth Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Smooth Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Smooth Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "SMOOTH"
  path: "Panels/Maze/maze_5"
diff --git a/data/maps/the_great/rooms/Maze South Area.txtpb b/data/maps/the_great/rooms/Maze South Area.txtpb
index b3708db..e65778d 100644
--- a/data/maps/the_great/rooms/Maze South Area.txtpb
+++ b/data/maps/the_great/rooms/Maze South Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze South Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "SOUTH"
  path: "Panels/Maze/maze_2"
diff --git a/data/maps/the_great/rooms/Maze Start.txtpb b/data/maps/the_great/rooms/Maze Start.txtpb
index 1e89cbe..16a57f5 100644
--- a/data/maps/the_great/rooms/Maze Start.txtpb
+++ b/data/maps/the_great/rooms/Maze Start.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Start"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "OUT"
  path: "Panels/Maze/maze_1"
diff --git a/data/maps/the_great/rooms/Maze Tower.txtpb b/data/maps/the_great/rooms/Maze Tower.txtpb
index 6a815aa..44c30d7 100644
--- a/data/maps/the_great/rooms/Maze Tower.txtpb
+++ b/data/maps/the_great/rooms/Maze Tower.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Tower"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "FEEL"
  path: "Panels/Maze/maze_12"
diff --git a/data/maps/the_great/rooms/Maze Up Area.txtpb b/data/maps/the_great/rooms/Maze Up Area.txtpb
index 29f175b..0046cef 100644
--- a/data/maps/the_great/rooms/Maze Up Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Up Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Up Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "UP"
  path: "Panels/Maze/maze_15"
diff --git a/data/maps/the_great/rooms/Maze Wreck Area.txtpb b/data/maps/the_great/rooms/Maze Wreck Area.txtpb
index 6808fc2..5710df5 100644
--- a/data/maps/the_great/rooms/Maze Wreck Area.txtpb
+++ b/data/maps/the_great/rooms/Maze Wreck Area.txtpb

@@ -1,5 +1,5 @@
 name: "Maze Wreck Area"
-display_name: "Courtyard"
+panel_display_name: "Courtyard"
 panels {
  name: "WRECK"
  path: "Panels/Maze/maze_8"
diff --git a/data/maps/the_great/rooms/Nature Room.txtpb b/data/maps/the_great/rooms/Nature Room.txtpb
index 9f798f3..464d3a2 100644
--- a/data/maps/the_great/rooms/Nature Room.txtpb
+++ b/data/maps/the_great/rooms/Nature Room.txtpb

@@ -1,5 +1,5 @@
 name: "Nature Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
  name: "SEVERE"
  path: "Panels/General/nature_2"
diff --git a/data/maps/the_great/rooms/North Landscape.txtpb b/data/maps/the_great/rooms/North Landscape.txtpb
index 959f351..fb11c42 100644
--- a/data/maps/the_great/rooms/North Landscape.txtpb
+++ b/data/maps/the_great/rooms/North Landscape.txtpb

@@ -1,5 +1,5 @@
 name: "North Landscape"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
  name: "WEATHER"
  path: "Panels/General/platforms_1"
@@ -52,6 +52,7 @@ panels {
 keyholders {
  name: "X"
  path: "Components/KeyHolders/keyHolderX"
+  key: "x"
 }
 ports {
  name: "INVISIBLE"
diff --git a/data/maps/the_great/rooms/Outside Jail.txtpb b/data/maps/the_great/rooms/Outside Jail.txtpb
index ab30761..d6dfa71 100644
--- a/data/maps/the_great/rooms/Outside Jail.txtpb
+++ b/data/maps/the_great/rooms/Outside Jail.txtpb

@@ -1,5 +1,5 @@
 name: "Outside Jail"
-display_name: "Jail"
+panel_display_name: "Jail"
 panels {
  name: "GUT"
  path: "Panels/Head/head_1"
diff --git a/data/maps/the_great/rooms/Pillar Room.txtpb b/data/maps/the_great/rooms/Pillar Room.txtpb
index 01ff309..648b7b4 100644
--- a/data/maps/the_great/rooms/Pillar Room.txtpb
+++ b/data/maps/the_great/rooms/Pillar Room.txtpb

@@ -1,5 +1,5 @@
 name: "Pillar Room"
-display_name: "Pillar Room"
+panel_display_name: "Pillar Room"
 panels {
  name: "EYE"
  path: "Panels/Impressive/entry_2"
diff --git a/data/maps/the_great/rooms/Purple Room.txtpb b/data/maps/the_great/rooms/Purple Room.txtpb
index ff9bd9a..e505ca0 100644
--- a/data/maps/the_great/rooms/Purple Room.txtpb
+++ b/data/maps/the_great/rooms/Purple Room.txtpb

@@ -1,5 +1,5 @@
 name: "Purple Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
  name: "DAEDALUS"
  path: "Meshes/Blocks/Warps/worldport18"
diff --git a/data/maps/the_great/rooms/Question Room How.txtpb b/data/maps/the_great/rooms/Question Room How.txtpb
index 2f759b8..8f087d0 100644
--- a/data/maps/the_great/rooms/Question Room How.txtpb
+++ b/data/maps/the_great/rooms/Question Room How.txtpb

@@ -1,17 +1,18 @@
 name: "Question Room How"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/Questions/question_3"
  clue: "question"
  answer: "how"
  symbols: EXAMPLE
-  # "Panels/Question Proxies/question_3_proxied" <- this is just how again
+  proxies { answer: "how" path: "Panels/Question Proxies/question_3_proxied" }
  proxies { answer: "who" path: "Panels/Question Proxies/question_3_proxied2" }
  proxies { answer: "why" path: "Panels/Question Proxies/question_3_proxied3" }
  proxies { answer: "what" path: "Panels/Question Proxies/question_3_proxied4" }
  proxies { answer: "when" path: "Panels/Question Proxies/question_3_proxied5" }
  proxies { answer: "where" path: "Panels/Question Proxies/question_3_proxied6" }
+  display_name: "QUESTION (How)"
 }
 paintings {
  name: "WHY"
diff --git a/data/maps/the_great/rooms/Question Room What.txtpb b/data/maps/the_great/rooms/Question Room What.txtpb
index 9cfd667..a61ccef 100644
--- a/data/maps/the_great/rooms/Question Room What.txtpb
+++ b/data/maps/the_great/rooms/Question Room What.txtpb

@@ -1,15 +1,16 @@
 name: "Question Room What"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/Questions/question_4"
  clue: "question"
  answer: "what"
  symbols: EXAMPLE
-  proxies { answer: "why" path: "Panels/Question Proxies/question_4_proxied" }
+  proxies { answer: "what" path: "Panels/Question Proxies/question_4_proxied" }
-  proxies { answer: "who" path: "Panels/Question Proxies/question_4_proxied2" }
+  proxies { answer: "why" path: "Panels/Question Proxies/question_4_proxied2" }
-  proxies { answer: "where" path: "Panels/Question Proxies/question_4_proxied3" }
+  proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied3" }
  proxies { answer: "how" path: "Panels/Question Proxies/question_4_proxied4" }
-  # "Panels/Question Proxies/question_4_proxied5" <- this is just what again
+  proxies { answer: "who" path: "Panels/Question Proxies/question_4_proxied5" }
-  proxies { answer: "when" path: "Panels/Question Proxies/question_4_proxied6" }
+  proxies { answer: "where" path: "Panels/Question Proxies/question_4_proxied6" }
+  display_name: "QUESTION (What)"
 }
diff --git a/data/maps/the_great/rooms/Question Room When.txtpb b/data/maps/the_great/rooms/Question Room When.txtpb
index e046edd..b3ee2db 100644
--- a/data/maps/the_great/rooms/Question Room When.txtpb
+++ b/data/maps/the_great/rooms/Question Room When.txtpb

@@ -1,5 +1,5 @@
 name: "Question Room When"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/Questions/question_1"
@@ -8,10 +8,11 @@ panels {
  symbols: EXAMPLE
  proxies { answer: "when" path: "Panels/Question Proxies/question_1_proxied" }
  proxies { answer: "why" path: "Panels/Question Proxies/question_1_proxied2" }
-  # "Panels/Question Proxies/question_1_proxied3" <- this is just what again
+  proxies { answer: "what" path: "Panels/Question Proxies/question_1_proxied3" }
  proxies { answer: "who" path: "Panels/Question Proxies/question_1_proxied4" }
  proxies { answer: "how" path: "Panels/Question Proxies/question_1_proxied5" }
  proxies { answer: "where" path: "Panels/Question Proxies/question_1_proxied6" }
+  display_name: "QUESTION (When)"
 }
 paintings {
  name: "WHY"
diff --git a/data/maps/the_great/rooms/Question Room Who.txtpb b/data/maps/the_great/rooms/Question Room Who.txtpb
index cbaba4b..eb80882 100644
--- a/data/maps/the_great/rooms/Question Room Who.txtpb
+++ b/data/maps/the_great/rooms/Question Room Who.txtpb

@@ -1,5 +1,5 @@
 name: "Question Room Who"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/Questions/question_2"
@@ -7,9 +7,10 @@ panels {
  answer: "who"
  symbols: EXAMPLE
  proxies { answer: "why" path: "Panels/Question Proxies/question_2_proxied" }
-  # "Panels/Question Proxies/question_2_proxied2" <- this is just who again
+  proxies { answer: "who" path: "Panels/Question Proxies/question_2_proxied2" }
  proxies { answer: "where" path: "Panels/Question Proxies/question_2_proxied3" }
  proxies { answer: "how" path: "Panels/Question Proxies/question_2_proxied4" }
  proxies { answer: "what" path: "Panels/Question Proxies/question_2_proxied5" }
  proxies { answer: "when" path: "Panels/Question Proxies/question_2_proxied6" }
+  display_name: "QUESTION (Who)"
 }
diff --git a/data/maps/the_great/rooms/Salmon Room.txtpb b/data/maps/the_great/rooms/Salmon Room.txtpb
index 96efd1a..ecdef75 100644
--- a/data/maps/the_great/rooms/Salmon Room.txtpb
+++ b/data/maps/the_great/rooms/Salmon Room.txtpb

@@ -1,5 +1,5 @@
 name: "Salmon Room"
-display_name: "Main Area"
+panel_display_name: "Main Area"
 ports {
  name: "BETWEEN"
  path: "Meshes/Blocks/Warps/worldport11"
diff --git a/data/maps/the_great/rooms/Talented Entrance.txtpb b/data/maps/the_great/rooms/Talented Entrance.txtpb
index 038c7e7..7329853 100644
--- a/data/maps/the_great/rooms/Talented Entrance.txtpb
+++ b/data/maps/the_great/rooms/Talented Entrance.txtpb

@@ -1,5 +1,5 @@
 name: "Talented Entrance"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 ports {
  name: "TALENTED"
  path: "Meshes/Blocks/Warps/worldport14"
diff --git a/data/maps/the_great/rooms/Under Question Room.txtpb b/data/maps/the_great/rooms/Under Question Room.txtpb
index 249c0b4..db751bb 100644
--- a/data/maps/the_great/rooms/Under Question Room.txtpb
+++ b/data/maps/the_great/rooms/Under Question Room.txtpb

@@ -1,10 +1,12 @@
 name: "Under Question Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 panels {
  name: "QUESTION"
  path: "Panels/General/question_1"
  clue: "question"
  answer: "which"
  symbols: EXAMPLE
+  proxies { answer: "which" path: "Panels/General/question_1_proxy_1" }
  proxies { answer: "where" path: "Panels/General/question_1_proxy_2" }
+  display_name: "QUESTION (Where)"
 }
diff --git a/data/maps/the_great/rooms/West Side.txtpb b/data/maps/the_great/rooms/West Side.txtpb
index 4723213..8279e16 100644
--- a/data/maps/the_great/rooms/West Side.txtpb
+++ b/data/maps/the_great/rooms/West Side.txtpb

@@ -1,5 +1,5 @@
 name: "West Side"
-display_name: "West Side"
+panel_display_name: "West Side"
 panels {
  name: "ERASE"
  path: "Panels/General/entry_9"
@@ -76,4 +76,5 @@ ports {
  path: "Meshes/Blocks/Warps/worldport7"
  orientation: "east"
  # ER with this is weird; make sure to place on the surface
+  required_door { name: "Partial Entrance" }
 }
diff --git a/data/maps/the_great/rooms/Whole Room.txtpb b/data/maps/the_great/rooms/Whole Room.txtpb
index 2f5c855..daa174c 100644
--- a/data/maps/the_great/rooms/Whole Room.txtpb
+++ b/data/maps/the_great/rooms/Whole Room.txtpb

@@ -1,5 +1,5 @@
 name: "Whole Room"
-display_name: "North Landscape"
+panel_display_name: "North Landscape"
 panels {
  name: "VAULT"
  path: "Panels/Whole Room/whole_1"
diff --git a/data/maps/the_great/rooms/Y Room.txtpb b/data/maps/the_great/rooms/Y Room.txtpb
index b20420c..46c83ea 100644
--- a/data/maps/the_great/rooms/Y Room.txtpb
+++ b/data/maps/the_great/rooms/Y Room.txtpb

@@ -1,5 +1,5 @@
 name: "Y Room"
-display_name: "Question Room"
+panel_display_name: "Question Room"
 letters {
  key: "y"
  path: "Components/Collectables/y"
diff --git a/data/maps/the_great/rooms/Zero Room.txtpb b/data/maps/the_great/rooms/Zero Room.txtpb
index dcbe067..54675bf 100644
--- a/data/maps/the_great/rooms/Zero Room.txtpb
+++ b/data/maps/the_great/rooms/Zero Room.txtpb

@@ -1,5 +1,5 @@
 name: "Zero Room"
-display_name: "Zero Room"
+panel_display_name: "Zero Room"
 panels {
  name: "HERO"
  path: "Panels/General/zero_1"