diff --git a/ShelterViewer.Shared/Data/rooms.json b/ShelterViewer.Shared/Data/rooms.json
index d1271ea..69523b5 100644
--- a/ShelterViewer.Shared/Data/rooms.json
+++ b/ShelterViewer.Shared/Data/rooms.json
@@ -12,6 +12,18 @@
       "level": 1,
       "size": [ 6 ]
     },
+    {
+      "name": "Vault Door (level 2)",
+      "type": "Entrance",
+      "level": 2,
+      "size": [ 6 ]
+    },
+    {
+      "name": "Vault Door (level 3)",
+      "type": "Entrance",
+      "level": 3,
+      "size": [ 6 ]
+    },
     {
       "name": "Elevator",
       "type": "Elevator",
@@ -24,6 +36,18 @@
       "level": 1,
       "size": [ 6 ]
     },
+    {
+      "name": "Overseer's Control Station",
+      "type": "Overseer",
+      "level": 2,
+      "size": [ 6 ]
+    },
+    {
+      "name": "Overseer's Command Center",
+      "type": "Overseer",
+      "level": 3,
+      "size": [ 6 ]
+    },
     {
       "name": "Diner",
       "type": "Cafeteria",
diff --git a/ShelterViewer.Shared/Models/Room.cs b/ShelterViewer.Shared/Models/Room.cs
index 30d2f24..13745e6 100644
--- a/ShelterViewer.Shared/Models/Room.cs
+++ b/ShelterViewer.Shared/Models/Room.cs
@@ -41,7 +41,7 @@ public class Room
 
     // Added for ShelterViewer.Web.Client
     public string? Name { get; set; }
-    public int? Level { get; set; }
+    public int? Level { get; set; } // Do we need two???
     public string? Trait { get; set; }
     public int[]? Size { get; set; }
     public string[]? OutputType { get; set; }
diff --git a/ShelterViewer.Shared/Pages/RoomMap.razor b/ShelterViewer.Shared/Pages/RoomMap.razor
index 477caa6..d9fe2a2 100644
--- a/ShelterViewer.Shared/Pages/RoomMap.razor
+++ b/ShelterViewer.Shared/Pages/RoomMap.razor
@@ -16,7 +16,7 @@
     <MudStack Row="true">
         @foreach(Room room in item.Value.OrderBy(c => c.col))
         {
-            <MudText>@room.row @room.col @room.type</MudText>
+            <MudText>@room.row @room.col @room.Name</MudText>
         }
     </MudStack>
 }
diff --git a/ShelterViewer.Shared/Pages/Rooms.razor b/ShelterViewer.Shared/Pages/Rooms.razor
index 0074fd9..68449bf 100644
--- a/ShelterViewer.Shared/Pages/Rooms.razor
+++ b/ShelterViewer.Shared/Pages/Rooms.razor
@@ -11,8 +11,9 @@
     <Columns>
         <PropertyColumn Property="x => x.Name" Title="Name" />
         <PropertyColumn Property="x => x.type" Title="Type" />
-        <PropertyColumn Property="x => x._class" Title="Class" />
-        
+        <PropertyColumn Property="x => x.level" Title="Room Level" />
+        <PropertyColumn Property="x => x.Trait" Title="Room trait" />
+        <PropertyColumn Property="x => x.mergeLevel" Title="Merge Level" />
         <PropertyColumn Property="x => x.dwellers.Count()" Title="Number Dwellers" />
         <TemplateColumn T="Room" CellClass="d-flex justify-end">
             <CellTemplate>
diff --git a/ShelterViewer.Shared/Services/VaultServices/VaultService.cs b/ShelterViewer.Shared/Services/VaultServices/VaultService.cs
index 5942dde..afbf8c3 100644
--- a/ShelterViewer.Shared/Services/VaultServices/VaultService.cs
+++ b/ShelterViewer.Shared/Services/VaultServices/VaultService.cs
@@ -132,7 +132,7 @@ private void ProcessRooms()
     {
         foreach (var room in VaultData!.Vault.rooms)
         {
-            var roomType = _roomTypes.FirstOrDefault(r => r.Type == room.type);
+            var roomType = _roomTypes.FirstOrDefault(r => r.Type == room.type && r.Level == room.level);
             if (roomType != null)
             {
                 room.Name = roomType.Name;
diff --git a/ShelterViewer.Web.Client/wwwroot/data/rooms.json b/ShelterViewer.Web.Client/wwwroot/data/rooms.json
index d1271ea..69523b5 100644
--- a/ShelterViewer.Web.Client/wwwroot/data/rooms.json
+++ b/ShelterViewer.Web.Client/wwwroot/data/rooms.json
@@ -12,6 +12,18 @@
       "level": 1,
       "size": [ 6 ]
     },
+    {
+      "name": "Vault Door (level 2)",
+      "type": "Entrance",
+      "level": 2,
+      "size": [ 6 ]
+    },
+    {
+      "name": "Vault Door (level 3)",
+      "type": "Entrance",
+      "level": 3,
+      "size": [ 6 ]
+    },
     {
       "name": "Elevator",
       "type": "Elevator",
@@ -24,6 +36,18 @@
       "level": 1,
       "size": [ 6 ]
     },
+    {
+      "name": "Overseer's Control Station",
+      "type": "Overseer",
+      "level": 2,
+      "size": [ 6 ]
+    },
+    {
+      "name": "Overseer's Command Center",
+      "type": "Overseer",
+      "level": 3,
+      "size": [ 6 ]
+    },
     {
       "name": "Diner",
       "type": "Cafeteria",
diff --git a/ShelterViewer/Resources/Raw/rooms.json b/ShelterViewer/Resources/Raw/rooms.json
index d1271ea..69523b5 100644
--- a/ShelterViewer/Resources/Raw/rooms.json
+++ b/ShelterViewer/Resources/Raw/rooms.json
@@ -12,6 +12,18 @@
       "level": 1,
       "size": [ 6 ]
     },
+    {
+      "name": "Vault Door (level 2)",
+      "type": "Entrance",
+      "level": 2,
+      "size": [ 6 ]
+    },
+    {
+      "name": "Vault Door (level 3)",
+      "type": "Entrance",
+      "level": 3,
+      "size": [ 6 ]
+    },
     {
       "name": "Elevator",
       "type": "Elevator",
@@ -24,6 +36,18 @@
       "level": 1,
       "size": [ 6 ]
     },
+    {
+      "name": "Overseer's Control Station",
+      "type": "Overseer",
+      "level": 2,
+      "size": [ 6 ]
+    },
+    {
+      "name": "Overseer's Command Center",
+      "type": "Overseer",
+      "level": 3,
+      "size": [ 6 ]
+    },
     {
       "name": "Diner",
       "type": "Cafeteria",