diff --git a/assets/10_Birthday_party_Shadowless_48x48.png b/assets/10_Birthday_party_Shadowless_48x48.png
deleted file mode 100644
index ab08fe3..0000000
Binary files a/assets/10_Birthday_party_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/11_Halloween_Shadowless_48x48.png b/assets/11_Halloween_Shadowless_48x48.png
deleted file mode 100644
index 5ef2f1c..0000000
Binary files a/assets/11_Halloween_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/12_Kitchen_Shadowless_48x48.png b/assets/12_Kitchen_Shadowless_48x48.png
deleted file mode 100644
index e586db1..0000000
Binary files a/assets/12_Kitchen_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/13_Conference_Hall_Shadowless_48x48.png b/assets/13_Conference_Hall_Shadowless_48x48.png
deleted file mode 100644
index d006e30..0000000
Binary files a/assets/13_Conference_Hall_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/14_Basement_Shadowless_48x48.png b/assets/14_Basement_Shadowless_48x48.png
deleted file mode 100644
index dc614d4..0000000
Binary files a/assets/14_Basement_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/15_Christmas_Shadowless_48x48.png b/assets/15_Christmas_Shadowless_48x48.png
deleted file mode 100644
index 0a962cb..0000000
Binary files a/assets/15_Christmas_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/16_Grocery_store_Shadowless_48x48.png b/assets/16_Grocery_store_Shadowless_48x48.png
deleted file mode 100644
index 993f8dd..0000000
Binary files a/assets/16_Grocery_store_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/18_Jail_Shadowless_48x48.png b/assets/18_Jail_Shadowless_48x48.png
deleted file mode 100644
index e3bb353..0000000
Binary files a/assets/18_Jail_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/19_Hospital_Shadowless_48x48.png b/assets/19_Hospital_Shadowless_48x48.png
deleted file mode 100644
index fd2127b..0000000
Binary files a/assets/19_Hospital_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/1_Generic_Shadowless_48x48.png b/assets/1_Generic_Shadowless_48x48.png
deleted file mode 100644
index 5d3d528..0000000
Binary files a/assets/1_Generic_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/20_Japanese_interiors_Shadowless_48x48.png b/assets/20_Japanese_interiors_Shadowless_48x48.png
deleted file mode 100644
index f07be8a..0000000
Binary files a/assets/20_Japanese_interiors_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/21_Clothing_Store_Shadowless_48x48.png b/assets/21_Clothing_Store_Shadowless_48x48.png
deleted file mode 100644
index a1823c7..0000000
Binary files a/assets/21_Clothing_Store_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/22_Museum_Shadowless_48x48.png b/assets/22_Museum_Shadowless_48x48.png
deleted file mode 100644
index 485ab87..0000000
Binary files a/assets/22_Museum_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/24_Ice_Cream_Shop_Shadowless_48x48.png b/assets/24_Ice_Cream_Shop_Shadowless_48x48.png
deleted file mode 100644
index f0cab6f..0000000
Binary files a/assets/24_Ice_Cream_Shop_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/25_Shooting_Range_Shadowless_48x48.png b/assets/25_Shooting_Range_Shadowless_48x48.png
deleted file mode 100644
index 15ee210..0000000
Binary files a/assets/25_Shooting_Range_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/26_Condominium_Shadowless_48x48.png b/assets/26_Condominium_Shadowless_48x48.png
deleted file mode 100644
index daf5ab0..0000000
Binary files a/assets/26_Condominium_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/2_LivingRoom_Shadowless_48x48.png b/assets/2_LivingRoom_Shadowless_48x48.png
deleted file mode 100644
index 2ea9590..0000000
Binary files a/assets/2_LivingRoom_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/3_Bathroom_Shadowless_48x48.png b/assets/3_Bathroom_Shadowless_48x48.png
deleted file mode 100644
index a4e75a3..0000000
Binary files a/assets/3_Bathroom_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/4_Bedroom_Shadowless_48x48.png b/assets/4_Bedroom_Shadowless_48x48.png
deleted file mode 100644
index faee855..0000000
Binary files a/assets/4_Bedroom_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/5_Classroom_and_library_Shadowless_48x48.png b/assets/5_Classroom_and_library_Shadowless_48x48.png
deleted file mode 100644
index 6906bf5..0000000
Binary files a/assets/5_Classroom_and_library_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/6_Music_and_sport_Shadowless_48x48.png b/assets/6_Music_and_sport_Shadowless_48x48.png
deleted file mode 100644
index a42980d..0000000
Binary files a/assets/6_Music_and_sport_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/7_Art_Shadowless_48x48.png b/assets/7_Art_Shadowless_48x48.png
deleted file mode 100644
index 37ac1e2..0000000
Binary files a/assets/7_Art_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/8_Gym_Shadowless_48x48.png b/assets/8_Gym_Shadowless_48x48.png
deleted file mode 100644
index 01a64a8..0000000
Binary files a/assets/8_Gym_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/9_Fishing_Shadowless_48x48.png b/assets/9_Fishing_Shadowless_48x48.png
deleted file mode 100644
index 43b8dca..0000000
Binary files a/assets/9_Fishing_Shadowless_48x48.png and /dev/null differ
diff --git a/assets/Interiors_48x48.png b/assets/Interiors_48x48.png
deleted file mode 100644
index d7ff93a..0000000
Binary files a/assets/Interiors_48x48.png and /dev/null differ
diff --git a/assets/Modern_Office_48x48.png b/assets/Modern_Office_48x48.png
deleted file mode 100644
index 1107ca3..0000000
Binary files a/assets/Modern_Office_48x48.png and /dev/null differ
diff --git a/assets/Room_Builder_48x48.png b/assets/Room_Builder_48x48.png
deleted file mode 100644
index 5bf5e84..0000000
Binary files a/assets/Room_Builder_48x48.png and /dev/null differ
diff --git a/assets/objects/bluetooth_scanner.png b/assets/objects/bluetooth_scanner.png
index cd0be1a..4f8e7f3 100644
Binary files a/assets/objects/bluetooth_scanner.png and b/assets/objects/bluetooth_scanner.png differ
diff --git a/assets/objects/book.png b/assets/objects/book.png
index 4b830be..700d5ce 100644
Binary files a/assets/objects/book.png and b/assets/objects/book.png differ
diff --git a/assets/objects/fingerprint_kit.png b/assets/objects/fingerprint_kit.png
index db802b0..1367cb9 100644
Binary files a/assets/objects/fingerprint_kit.png and b/assets/objects/fingerprint_kit.png differ
diff --git a/assets/objects/key.png b/assets/objects/key.png
index 165139b..6b8a158 100644
Binary files a/assets/objects/key.png and b/assets/objects/key.png differ
diff --git a/assets/objects/notes.png b/assets/objects/notes.png
index ea35827..8b2306c 100644
Binary files a/assets/objects/notes.png and b/assets/objects/notes.png differ
diff --git a/assets/objects/pc.png b/assets/objects/pc.png
index aa1385c..f1a5df2 100644
Binary files a/assets/objects/pc.png and b/assets/objects/pc.png differ
diff --git a/assets/objects/phone.png b/assets/objects/phone.png
index 865c1ac..435796c 100644
Binary files a/assets/objects/phone.png and b/assets/objects/phone.png differ
diff --git a/assets/objects/printer.png b/assets/objects/printer.png
index 691b4e4..94d5fb6 100644
Binary files a/assets/objects/printer.png and b/assets/objects/printer.png differ
diff --git a/assets/objects/safe.png b/assets/objects/safe.png
index 5be62b0..dd0889a 100644
Binary files a/assets/objects/safe.png and b/assets/objects/safe.png differ
diff --git a/assets/objects/suitcase.png b/assets/objects/suitcase.png
index bff2a8a..542640a 100644
Binary files a/assets/objects/suitcase.png and b/assets/objects/suitcase.png differ
diff --git a/assets/objects/switch.png b/assets/objects/switch.png
deleted file mode 100644
index dee32d9..0000000
Binary files a/assets/objects/switch.png and /dev/null differ
diff --git a/assets/objects/tablet.png b/assets/objects/tablet.png
index 2af66bc..b6c71ee 100644
Binary files a/assets/objects/tablet.png and b/assets/objects/tablet.png differ
diff --git a/assets/objects/workstation.png b/assets/objects/workstation.png
index 00ab468..edcc033 100644
Binary files a/assets/objects/workstation.png and b/assets/objects/workstation.png differ
diff --git a/assets/rooms/room_ceo.json b/assets/rooms/room_ceo.json
index 7b80de6..7f3b951 100644
--- a/assets/rooms/room_ceo.json
+++ b/assets/rooms/room_ceo.json
@@ -3,61 +3,17 @@
  "infinite":false,
  "layers":[
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            95, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 94,
-            79, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 94,
-            78, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 79,
-            94, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 95,
-            78, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 79,
-            94, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 79,
-            78, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 79,
-            94, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 2412, 79,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":11,
-         "id":2,
-         "name":"floor",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1282, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":11,
-         "id":11,
-         "name":"shadows",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[7742, 7820, 7820, 7820, 7820, 7820, 7820, 7820, 7820, 7670,
-            7743, 7896, 7896, 7896, 7896, 7896, 7896, 7896, 7896, 7746,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            7819, 0, 0, 0, 0, 0, 0, 0, 0, 7822,
-            1311, 1317, 1317, 1317, 1317, 1317, 1317, 1317, 1317, 1310],
+         "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+            11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+            21, 0, 0, 0, 0, 0, 0, 0, 0, 30,
+            31, 0, 0, 0, 0, 0, 0, 0, 0, 40,
+            41, 0, 0, 0, 0, 0, 0, 0, 0, 50,
+            51, 0, 0, 0, 0, 0, 0, 0, 0, 60,
+            41, 0, 0, 0, 0, 0, 0, 0, 0, 70,
+            51, 0, 0, 0, 0, 0, 0, 0, 0, 60,
+            61, 0, 0, 0, 0, 0, 0, 0, 0, 70,
+            71, 0, 0, 0, 0, 0, 0, 0, 0, 80,
+            81, 82, 83, 84, 85, 86, 87, 88, 89, 90],
          "height":11,
          "id":8,
          "name":"walls",
@@ -69,20 +25,20 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 169, 199, 136, 199, 234, 235, 0, 0,
-            0, 0, 185, 215, 152, 215, 250, 251, 0, 0,
-            0, 0, 0, 231, 0, 231, 0, 0, 0, 0,
-            0, 323, 324, 325, 0, 0, 0, 0, 0, 0,
-            0, 339, 340, 341, 0, 0, 0, 0, 0, 0,
-            0, 355, 356, 357, 167, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 183, 0, 9464, 9465, 0, 0,
-            0, 0, 0, 0, 0, 0, 9480, 9481, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+            11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+            21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+            31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+            41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+            51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+            61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+            71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+            61, 72, 73, 74, 75, 76, 77, 78, 79, 70,
+            71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+            81, 82, 83, 84, 85, 86, 87, 88, 89, 90],
          "height":11,
-         "id":3,
-         "name":"props",
+         "id":12,
+         "name":"ROOM",
          "opacity":1,
          "type":"tilelayer",
          "visible":true,
@@ -91,96 +47,8 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 295, 296, 0,
-            0, 0, 0, 0, 0, 0, 0, 311, 312, 0,
-            0, 0, 0, 0, 0, 596, 66, 67, 69, 0,
-            0, 0, 0, 0, 0, 773, 98, 99, 101, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 117, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":11,
-         "id":4,
-         "name":"tables",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 239, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":11,
-         "id":6,
-         "name":"devices",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 212, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 196, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":11,
-         "id":5,
-         "name":"props",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 252, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 268, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":11,
-         "id":10,
-         "name":"props",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 10750, 0, 0, 0, 0, 0, 0, 10750, 0,
-            0, 10766, 0, 0, 0, 0, 0, 0, 10766, 0,
+         "data":[0, 101, 0, 0, 0, 0, 0, 0, 101, 0,
+            0, 102, 0, 0, 0, 0, 0, 0, 102, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -206,7 +74,6 @@
          "name":"Object Layer 1",
          "objects":[
                 {
-                 "gid":207,
                  "height":48,
                  "id":1,
                  "name":"pc",
@@ -220,11 +87,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":333,
-                 "y":286
+                 "x":301.362753036437,
+                 "y":184.247773279352
                 }, 
                 {
-                 "gid":207,
                  "height":48,
                  "id":3,
                  "name":"pc",
@@ -238,11 +104,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":358,
-                 "y":155
+                 "x":374.246153846154,
+                 "y":186.637246963563
                 }, 
                 {
-                 "gid":196,
                  "height":48,
                  "id":23,
                  "name":"photo",
@@ -250,11 +115,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":384,
-                 "y":288
+                 "x":336.971659919028,
+                 "y":197.363562753036
                 }, 
                 {
-                 "gid":761,
                  "height":48,
                  "id":24,
                  "name":"suitcase",
@@ -262,11 +126,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":192,
-                 "y":97.2102111566341
+                 "x":144.116599190283,
+                 "y":60.4425998206017
                 }, 
                 {
-                 "gid":10016,
                  "height":48,
                  "id":25,
                  "name":"key",
@@ -274,11 +137,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":241.036243302868,
-                 "y":287.220926567917
+                 "x":197.428146136876,
+                 "y":179.483274746055
                 }, 
                 {
-                 "gid":12041,
                  "height":48,
                  "id":26,
                  "name":"safe",
@@ -286,8 +148,8 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":384,
-                 "y":240
+                 "x":329.276113360324,
+                 "y":40.7708502024292
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -295,7 +157,7 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":12,
+ "nextlayerid":13,
  "nextobjectid":27,
  "orientation":"orthogonal",
  "renderorder":"right-down",
@@ -303,60 +165,30 @@
  "tileheight":48,
  "tilesets":[
         {
-         "columns":16,
+         "columns":10,
          "firstgid":1,
-         "image":"images\/Modern_Office_Revamped\/Modern_Office_48x48.png",
-         "imageheight":2544,
-         "imagewidth":768,
+         "image":"room_ceo_l.png",
+         "imageheight":480,
+         "imagewidth":480,
          "margin":0,
-         "name":"Modern_Office_48x48",
+         "name":"room_ceo_l",
          "spacing":0,
-         "tilecount":848,
+         "tilecount":100,
          "tileheight":48,
          "tilewidth":48
         }, 
         {
-         "columns":76,
-         "firstgid":849,
-         "image":"images\/1_Interiors\/48x48\/Room_Builder_48x48.png",
-         "imageheight":5232,
-         "imagewidth":3648,
+         "columns":1,
+         "firstgid":101,
+         "image":"..\/tiles\/door.png",
+         "imageheight":96,
+         "imagewidth":48,
          "margin":0,
-         "name":"Room_Builder_48x48",
+         "name":"door",
          "spacing":0,
-         "tilecount":8284,
+         "tilecount":2,
          "tileheight":48,
          "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":9133,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/11_Halloween_Shadowless_48x48.png",
-         "imageheight":2928,
-         "imagewidth":768,
-         "margin":0,
-         "name":"11_Halloween_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":976,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":10109,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/1_Generic_Shadowless_48x48.png",
-         "imageheight":3744,
-         "imagewidth":768,
-         "margin":0,
-         "name":"1_Generic_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":1248,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "firstgid":11357,
-         "source":"11_Halloween_Shadowless_48x48.tsx"
         }],
  "tilewidth":48,
  "type":"map",
diff --git a/assets/rooms/room_closet.json b/assets/rooms/room_closet.json
index bb85240..84cf3c1 100644
--- a/assets/rooms/room_closet.json
+++ b/assets/rooms/room_closet.json
@@ -3,55 +3,15 @@
  "infinite":false,
  "layers":[
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            95, 3403, 3403, 3404, 3403, 3403, 3403, 3403, 3404, 94,
-            79, 3403, 3404, 3404, 3479, 3479, 3479, 3403, 3404, 94,
-            78, 3403, 3404, 3480, 3479, 3480, 3480, 3403, 3404, 79,
-            94, 3403, 3403, 3404, 3479, 3480, 3480, 3403, 3404, 95,
-            78, 3403, 3403, 3403, 3403, 3403, 3403, 3404, 3404, 79,
-            94, 3479, 3479, 3479, 3479, 3479, 3479, 3480, 3480, 79,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":2,
-         "name":"floor",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1282, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":10,
-         "name":"shadows",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[1838, 1838, 1838, 1838, 1838, 1838, 1838, 1838, 1838, 1839,
-            1914, 1914, 1914, 1914, 1914, 1914, 1914, 1914, 1914, 1915,
-            1235, 0, 0, 0, 0, 0, 0, 0, 0, 1392,
-            1235, 0, 0, 0, 0, 0, 0, 0, 0, 1392,
-            1235, 0, 0, 0, 0, 0, 0, 0, 0, 1392,
-            1235, 0, 0, 0, 0, 0, 0, 0, 0, 1392,
-            1235, 0, 0, 0, 0, 0, 0, 0, 0, 1392,
-            1235, 0, 0, 0, 0, 0, 0, 0, 0, 1392,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+            11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+            21, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            31, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            41, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            51, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            61, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            71, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            81, 82, 83, 84, 85, 86, 87, 88, 89, 90],
          "height":9,
          "id":1,
          "name":"walls",
@@ -63,18 +23,18 @@
          "y":0
         }, 
         {
-         "data":[5539, 5692, 5692, 5692, 5692, 5692, 5692, 5692, 5693, 5542,
-            5615, 5768, 5768, 5768, 5768, 5768, 5768, 5768, 5769, 5618,
-            5691, 0, 0, 0, 0, 0, 0, 0, 0, 5694,
-            5691, 0, 0, 0, 0, 0, 0, 0, 0, 5694,
-            5691, 0, 0, 0, 0, 0, 0, 0, 0, 5694,
-            5691, 0, 0, 0, 0, 0, 0, 0, 0, 5694,
-            5691, 0, 0, 0, 0, 0, 0, 0, 0, 5694,
-            5691, 0, 0, 0, 0, 0, 0, 0, 0, 5694,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+            11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+            21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+            31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+            41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+            51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+            61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+            71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+            81, 82, 83, 84, 85, 86, 87, 88, 89, 90],
          "height":9,
-         "id":8,
-         "name":"walls",
+         "id":11,
+         "name":"ROOM",
          "opacity":1,
          "type":"tilelayer",
          "visible":true,
@@ -83,88 +43,8 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":4,
-         "name":"tables",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":6,
-         "name":"devices",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 23192, 23193, 0, 0, 0, 0,
-            0, 0, 0, 0, 23208, 23209, 0, 0, 0, 0,
-            0, 0, 0, 0, 23224, 23225, 0, 0, 0, 0,
-            0, 0, 0, 0, 23243, 23244, 0, 0, 0, 0,
-            0, 0, 0, 0, 23259, 23260, 0, 0, 0, 0,
-            1311, 1317, 1317, 1317, 1317, 1317, 1317, 1317, 1317, 1310],
-         "height":9,
-         "id":5,
-         "name":"props",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 23078, 0, 0, 0, 0, 0, 22912, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 22928, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 23157, 0, 0, 23156, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 23243, 23244, 0, 23267, 0, 0,
-            0, 0, 0, 23156, 23259, 23260, 23157, 0, 0, 0,
-            0, 0, 12641, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":3,
-         "name":"props",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 24494, 0, 0, 0, 0, 0, 0, 24494, 0,
-            0, 24510, 0, 0, 0, 0, 0, 0, 24510, 0,
+         "data":[0, 101, 0, 0, 0, 0, 0, 0, 101, 0,
+            0, 102, 0, 0, 0, 0, 0, 0, 102, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -188,7 +68,6 @@
          "name":"Object Layer 1",
          "objects":[
                 {
-                 "gid":207,
                  "height":48,
                  "id":1,
                  "name":"pc",
@@ -202,11 +81,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":334.315789473684,
-                 "y":103.052631578947
+                 "x":302.834008097166,
+                 "y":128.937651821862
                 }, 
                 {
-                 "gid":17485,
                  "height":48,
                  "id":3,
                  "name":"notes",
@@ -214,11 +92,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":386.947368421053,
-                 "y":181.473684210526
+                 "x":153.982186234818,
+                 "y":212.255870445344
                 }, 
                 {
-                 "gid":23760,
                  "height":48,
                  "id":4,
                  "name":"key",
@@ -226,11 +103,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":108.700983227299,
-                 "y":116.168883747831
+                 "x":332.571428571429,
+                 "y":39.9130133024869
                 }, 
                 {
-                 "gid":25513,
                  "height":48,
                  "id":5,
                  "name":"book",
@@ -238,11 +114,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":71.5002891844997,
-                 "y":174.468478889532
+                 "x":214.217698091382,
+                 "y":221.341353383459
                 }, 
                 {
-                 "gid":25785,
                  "height":48,
                  "id":6,
                  "name":"safe",
@@ -250,8 +125,8 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":192,
-                 "y":96
+                 "x":99.6534412955466,
+                 "y":35.8348178137652
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -259,7 +134,7 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":11,
+ "nextlayerid":12,
  "nextobjectid":7,
  "orientation":"orthogonal",
  "renderorder":"right-down",
@@ -267,73 +142,30 @@
  "tileheight":48,
  "tilesets":[
         {
-         "columns":16,
+         "columns":10,
          "firstgid":1,
-         "image":"images\/Modern_Office_Revamped\/Modern_Office_48x48.png",
-         "imageheight":2544,
-         "imagewidth":768,
+         "image":"room_spooky_basement_l.png",
+         "imageheight":480,
+         "imagewidth":480,
          "margin":0,
-         "name":"Modern_Office_48x48",
+         "name":"room_spooky_basement_l",
          "spacing":0,
-         "tilecount":848,
+         "tilecount":100,
          "tileheight":48,
          "tilewidth":48
         }, 
         {
-         "columns":76,
-         "firstgid":849,
-         "image":"images\/1_Interiors\/48x48\/Room_Builder_48x48.png",
-         "imageheight":5232,
-         "imagewidth":3648,
+         "columns":1,
+         "firstgid":101,
+         "image":"..\/tiles\/door.png",
+         "imageheight":96,
+         "imagewidth":48,
          "margin":0,
-         "name":"Room_Builder_48x48",
+         "name":"door",
          "spacing":0,
-         "tilecount":8284,
+         "tilecount":2,
          "tileheight":48,
          "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":9133,
-         "image":"images\/1_Interiors\/48x48\/Interiors_48x48.png",
-         "imageheight":41232,
-         "imagewidth":768,
-         "margin":0,
-         "name":"Interiors_48x48",
-         "spacing":0,
-         "tilecount":13744,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":22877,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/11_Halloween_Shadowless_48x48.png",
-         "imageheight":2928,
-         "imagewidth":768,
-         "margin":0,
-         "name":"11_Halloween_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":976,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":23853,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/1_Generic_Shadowless_48x48.png",
-         "imageheight":3744,
-         "imagewidth":768,
-         "margin":0,
-         "name":"1_Generic_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":1248,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "firstgid":25101,
-         "source":"11_Halloween_Shadowless_48x48.tsx"
         }],
  "tilewidth":48,
  "type":"map",
diff --git a/assets/rooms/room_office.json b/assets/rooms/room_office.json
index b79f272..e092352 100644
--- a/assets/rooms/room_office.json
+++ b/assets/rooms/room_office.json
@@ -1,55 +1,18 @@
 { "compressionlevel":-1,
- "height":8,
+ "height":9,
  "infinite":false,
  "layers":[
         {
-         "data":[0, 79, 0, 0, 0, 0, 0, 0, 79, 0,
-            0, 79, 0, 0, 0, 0, 0, 0, 79, 0,
-            0, 79, 78, 79, 79, 79, 78, 79, 95, 0,
-            0, 79, 94, 95, 79, 94, 94, 95, 79, 0,
-            0, 78, 94, 79, 79, 79, 94, 94, 79, 0,
-            0, 94, 94, 94, 79, 94, 79, 94, 94, 0,
-            0, 79, 78, 79, 94, 79, 95, 79, 79, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
-         "id":2,
-         "name":"floor",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1282, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
-         "id":10,
-         "name":"shadow",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[6595, 6748, 6748, 6748, 6748, 6748, 6748, 6748, 6749, 6598,
-            6671, 6824, 6824, 6824, 6824, 6824, 6824, 6824, 6825, 6674,
-            6747, 0, 0, 0, 0, 0, 0, 0, 0, 6750,
-            6747, 0, 0, 0, 0, 0, 0, 0, 0, 6750,
-            6747, 0, 0, 0, 0, 0, 0, 0, 0, 6750,
-            6747, 0, 0, 0, 0, 0, 0, 0, 0, 6750,
-            6747, 0, 0, 0, 0, 0, 0, 0, 0, 6750,
-            1311, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1310],
-         "height":8,
+         "data":[11645, 11646, 11647, 11648, 11649, 11650, 11651, 11652, 11653, 11654,
+            11655, 11656, 11657, 11658, 11659, 11660, 11661, 11662, 11663, 11664,
+            11665, 0, 0, 0, 0, 0, 0, 0, 0, 11674,
+            11675, 11676, 11677, 0, 0, 0, 0, 11682, 11683, 11684,
+            11685, 11686, 11687, 0, 0, 0, 0, 11692, 11693, 11694,
+            11695, 11696, 11697, 0, 0, 0, 0, 11702, 11703, 11704,
+            11705, 0, 0, 0, 0, 0, 0, 0, 0, 11714,
+            11715, 0, 0, 0, 0, 0, 0, 0, 0, 11724,
+            11725, 11726, 11727, 11728, 11729, 11730, 11731, 11732, 11733, 11734],
+         "height":9,
          "id":1,
          "name":"walls",
          "opacity":1,
@@ -60,92 +23,17 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 248, 201, 0, 0, 9226, 9227, 0, 0,
-            0, 0, 216, 217, 0, 0, 9242, 9243, 0, 0,
-            0, 0, 232, 233, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
-         "id":3,
-         "name":"props",
-         "opacity":0.97,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 417, 418, 419, 420, 421, 422, 423, 0, 0,
-            0, 433, 434, 435, 436, 437, 438, 439, 0, 0,
-            0, 449, 450, 451, 452, 453, 454, 455, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
-         "id":11,
-         "name":"tables2",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 456, 457, 458, 456, 457, 458, 9, 0,
-            0, 0, 456, 457, 458, 456, 457, 458, 25, 0,
-            0, 0, 472, 473, 474, 472, 473, 474, 41, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
-         "id":4,
-         "name":"tables",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 143, 144, 0, 123, 0, 0, 0,
-            0, 0, 0, 0, 429, 0, 0, 464, 0, 0,
-            0, 0, 0, 444, 445, 0, 479, 480, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
-         "id":6,
-         "name":"devices",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 10041, 0, 0, 10040, 0, 0, 0, 0,
-            0, 0, 10057, 0, 0, 10056, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
-         "id":5,
+         "data":[11645, 11646, 11647, 11648, 11649, 11650, 11651, 11652, 11653, 11654,
+            11655, 11656, 11657, 11658, 11659, 11660, 11661, 11662, 11663, 11664,
+            11665, 11666, 11667, 11668, 11669, 11670, 11671, 11672, 11673, 11674,
+            11675, 11676, 11677, 11678, 11679, 11680, 11681, 11682, 11683, 11684,
+            11685, 11686, 11687, 11688, 11689, 11690, 11691, 11692, 11693, 11694,
+            11695, 11696, 11697, 11698, 11699, 11700, 11701, 11702, 11703, 11704,
+            11705, 11706, 11707, 11708, 11709, 11710, 11711, 11712, 11713, 11714,
+            11715, 11716, 11717, 11718, 11719, 11720, 11721, 11722, 11723, 11724,
+            11725, 11726, 11727, 11728, 11729, 11730, 11731, 11732, 11733, 11734],
+         "height":9,
+         "id":13,
          "name":"props",
          "opacity":1,
          "type":"tilelayer",
@@ -155,15 +43,16 @@
          "y":0
         }, 
         {
-         "data":[0, 11038, 0, 0, 0, 0, 0, 0, 11038, 0,
-            0, 11054, 0, 0, 0, 0, 0, 0, 11054, 0,
+         "data":[0, 12993, 0, 0, 0, 0, 0, 0, 12993, 0,
+            0, 12994, 0, 0, 0, 0, 0, 0, 12994, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":8,
+         "height":9,
          "id":9,
          "name":"doors",
          "opacity":1,
@@ -179,7 +68,6 @@
          "name":"Object Layer 1",
          "objects":[
                 {
-                 "gid":207,
                  "height":48,
                  "id":1,
                  "name":"pc",
@@ -193,11 +81,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":381.631578947368,
-                 "y":174.368421052632
+                 "x":389.6719453501,
+                 "y":138.213476168298
                 }, 
                 {
-                 "gid":428,
                  "height":48,
                  "id":3,
                  "name":"pc",
@@ -205,11 +92,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":287,
-                 "y":196
+                 "x":388.487657196088,
+                 "y":227.346374786523
                 }, 
                 {
-                 "gid":428,
                  "height":48,
                  "id":4,
                  "name":"pc",
@@ -217,11 +103,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":145,
-                 "y":193
+                 "x":49.3170315168452,
+                 "y":228.817730166123
                 }, 
                 {
-                 "gid":242,
                  "height":48,
                  "id":5,
                  "name":"notes",
@@ -229,11 +114,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":382,
-                 "y":224
+                 "x":317.792889302903,
+                 "y":137.602856699271
                 }, 
                 {
-                 "gid":226,
                  "height":48,
                  "id":6,
                  "name":"notes",
@@ -241,11 +125,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":320,
-                 "y":149
+                 "x":79.528644620401,
+                 "y":140.339854059928
                 }, 
                 {
-                 "gid":156,
                  "height":48,
                  "id":7,
                  "name":"phone",
@@ -253,11 +136,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":99,
-                 "y":217
+                 "x":49.3437354448067,
+                 "y":139.094395280236
                 }, 
                 {
-                 "gid":212,
                  "height":48,
                  "id":10,
                  "name":"photo",
@@ -265,11 +147,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":183,
-                 "y":219
+                 "x":352.440149045179,
+                 "y":140.326812606738
                 }, 
                 {
-                 "gid":793,
                  "height":48,
                  "id":11,
                  "name":"suitcase",
@@ -277,11 +158,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":48,
-                 "y":192
+                 "x":326.793044558298,
+                 "y":56.1217202297777
                 }, 
                 {
-                 "gid":12528,
                  "height":48,
                  "id":12,
                  "name":"key",
@@ -289,11 +169,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":248.064777327935,
-                 "y":138.933487565067
+                 "x":351.592800926755,
+                 "y":276.858654464617
                 }, 
                 {
-                 "gid":12329,
                  "height":48,
                  "id":13,
                  "name":"safe",
@@ -301,12 +180,11 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":192,
-                 "y":96
+                 "x":113.75128085701,
+                 "y":36.7545412203075
                 },
             
                 {
-                 "gid":11940,
                  "height":48,
                  "id":14,
                  "name":"book",
@@ -314,9 +192,9 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":100.927703875072,
-                 "y":101.732793522267
-                },
+                 "x":256.307303316152,
+                 "y":38.0159793629749
+                }, 
                 {
                  "height":48,
                  "id":15,
@@ -325,41 +203,38 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":390,
-                 "y":144
-                },
+                 "x":269.273404750815,
+                 "y":173.063809967396
+                }, 
                 {
-                 "height": 48,
-                 "id": 16,
-                 "name": "spoofing_kit",
-                 "rotation": 0,
-                 "type": "",
-                 "visible": true,
-                 "width": 48,
-                 "x": 340,
-                 "y": 144
-                },
+                 "height":48,
+                 "id":16,
+                 "name":"spoofing_kit",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":48,
+                 "x":163.475857786058,
+                 "y":235.729855612483
+                }, 
                 {
-                 "height": 48,
-                 "id": 17,
-                 "name": "lockpick",
-                 "rotation": 0,
-                 "type": "",
-                 "visible": true,
-                 "width": 48,
-                 "x": 330,
-                 "y": 144
-                }
-
-                
-               ],
+                 "height":48,
+                 "id":17,
+                 "name":"lockpick",
+                 "rotation":0,
+                 "type":"",
+                 "visible":true,
+                 "width":48,
+                 "x":268.518863530508,
+                 "y":251.312529110387
+                }],
          "opacity":1,
          "type":"objectgroup",
          "visible":true,
          "x":0,
          "y":0
         }],
- "nextlayerid":12,
+ "nextlayerid":14,
  "nextobjectid":18,
  "orientation":"orthogonal",
  "renderorder":"right-down",
@@ -369,7 +244,7 @@
         {
          "columns":16,
          "firstgid":1,
-         "image":"images\/Modern_Office_Revamped\/Modern_Office_48x48.png",
+         "image":"..\/Modern_Office_48x48.png",
          "imageheight":2544,
          "imagewidth":768,
          "margin":0,
@@ -382,7 +257,7 @@
         {
          "columns":76,
          "firstgid":849,
-         "image":"images\/1_Interiors\/48x48\/Room_Builder_48x48.png",
+         "image":"..\/Room_Builder_48x48.png",
          "imageheight":5232,
          "imagewidth":3648,
          "margin":0,
@@ -395,7 +270,7 @@
         {
          "columns":16,
          "firstgid":9133,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/5_Classroom_and_library_Shadowless_48x48.png",
+         "image":"..\/5_Classroom_and_library_Shadowless_48x48.png",
          "imageheight":1632,
          "imagewidth":768,
          "margin":0,
@@ -408,7 +283,7 @@
         {
          "columns":16,
          "firstgid":9677,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/18_Jail_Shadowless_48x48.png",
+         "image":"..\/18_Jail_Shadowless_48x48.png",
          "imageheight":2160,
          "imagewidth":768,
          "margin":0,
@@ -421,7 +296,7 @@
         {
          "columns":16,
          "firstgid":10397,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/1_Generic_Shadowless_48x48.png",
+         "image":"..\/1_Generic_Shadowless_48x48.png",
          "imageheight":3744,
          "imagewidth":768,
          "margin":0,
@@ -432,8 +307,43 @@
          "tilewidth":48
         }, 
         {
+         "columns":10,
          "firstgid":11645,
-         "source":"11_Halloween_Shadowless_48x48.tsx"
+         "image":"room_office_l.png",
+         "imageheight":480,
+         "imagewidth":480,
+         "margin":0,
+         "name":"room_office_l",
+         "spacing":0,
+         "tilecount":100,
+         "tileheight":48,
+         "tilewidth":48
+        }, 
+        {
+         "columns":16,
+         "firstgid":11745,
+         "image":"..\/1_Generic_Shadowless_48x48.png",
+         "imageheight":3744,
+         "imagewidth":768,
+         "margin":0,
+         "name":"1_Generic_Shadowless_48x48",
+         "spacing":0,
+         "tilecount":1248,
+         "tileheight":48,
+         "tilewidth":48
+        }, 
+        {
+         "columns":1,
+         "firstgid":12993,
+         "image":"..\/tiles\/door.png",
+         "imageheight":96,
+         "imagewidth":48,
+         "margin":0,
+         "name":"door",
+         "spacing":0,
+         "tilecount":2,
+         "tileheight":48,
+         "tilewidth":48
         }],
  "tilewidth":48,
  "type":"map",
diff --git a/assets/rooms/room_reception.json b/assets/rooms/room_reception.json
index 265cd2b..3b9381f 100644
--- a/assets/rooms/room_reception.json
+++ b/assets/rooms/room_reception.json
@@ -3,55 +3,15 @@
  "infinite":false,
  "layers":[
         {
-         "data":[0, 3932, 0, 0, 0, 0, 0, 0, 3932, 0,
-            0, 3932, 0, 0, 0, 0, 0, 0, 3932, 0,
-            0, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 0,
-            0, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 0,
-            0, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 0,
-            0, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 0,
-            0, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 0,
-            0, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 3932, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":2,
-         "name":"floor",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1282, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":10,
-         "name":"shadow",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[5531, 5684, 5684, 5684, 5684, 5684, 5684, 5684, 5685, 5611,
-            5607, 5760, 5760, 5760, 5760, 5760, 5760, 5760, 5761, 5610,
-            5683, 0, 0, 0, 0, 0, 0, 0, 0, 5686,
-            5683, 0, 0, 0, 0, 0, 0, 0, 0, 5686,
-            5683, 0, 0, 0, 0, 0, 0, 0, 0, 5686,
-            5683, 0, 0, 0, 0, 0, 0, 0, 0, 5686,
-            5683, 0, 0, 0, 0, 0, 0, 0, 0, 5686,
-            5683, 0, 0, 0, 0, 0, 0, 0, 0, 5686,
-            1311, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1310],
+         "data":[3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+            13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+            23, 0, 0, 26, 27, 28, 29, 0, 0, 32,
+            33, 0, 0, 0, 0, 0, 0, 0, 0, 42,
+            43, 0, 0, 0, 0, 0, 0, 0, 0, 52,
+            53, 0, 0, 0, 0, 0, 0, 0, 0, 62,
+            63, 0, 0, 0, 0, 0, 0, 0, 0, 72,
+            73, 0, 0, 0, 0, 0, 0, 0, 0, 82,
+            83, 84, 85, 86, 87, 88, 89, 90, 91, 92],
          "height":9,
          "id":8,
          "name":"walls",
@@ -63,18 +23,18 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 26260, 0, 0, 0, 26260, 0, 0, 26260, 0,
-            0, 26276, 25169, 0, 25168, 26276, 0, 0, 26276, 0,
-            0, 26292, 25185, 0, 25184, 26292, 0, 0, 26292, 0,
-            0, 0, 0, 0, 17760, 18799, 0, 0, 18798, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+            13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+            23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+            33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+            43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+            53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+            63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+            73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+            83, 84, 85, 86, 87, 88, 89, 90, 91, 92],
          "height":9,
-         "id":5,
-         "name":"props",
+         "id":12,
+         "name":"ROOM",
          "opacity":1,
          "type":"tilelayer",
          "visible":true,
@@ -83,70 +43,8 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 22930, 0, 0, 22933, 0, 0, 0,
-            0, 0, 0, 22946, 22947, 22948, 22949, 0, 0, 0,
-            0, 0, 0, 22962, 22963, 22964, 22965, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":4,
-         "name":"tables",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":6,
-         "name":"devices",
-         "offsetx":0,
-         "offsety":-48,
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 25565, 25566, 0, 0, 0,
-            0, 0, 0, 0, 0, 25581, 25582, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 18767, 0,
-            0, 26260, 17745, 0, 17744, 0, 0, 0, 0, 0,
-            0, 26276, 25169, 0, 25168, 26275, 0, 0, 26275, 0,
-            0, 26292, 25185, 0, 25184, 26291, 0, 0, 26291, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":3,
-         "name":"props",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 26030, 0, 0, 0, 0, 0, 0, 26030, 0,
-            0, 26046, 0, 0, 0, 0, 0, 0, 26046, 0,
+         "data":[0, 1, 0, 0, 0, 0, 0, 0, 1, 0,
+            0, 2, 0, 0, 0, 0, 0, 0, 2, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -170,7 +68,6 @@
          "name":"Object Layer 1",
          "objects":[
                 {
-                 "gid":207,
                  "height":48,
                  "id":1,
                  "name":"pc",
@@ -184,11 +81,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":142.6316,
-                 "y":94.2802807017544
+                 "x":120.211047827175,
+                 "y":49.4391763561042
                 }, 
                 {
-                 "gid":156,
                  "height":48,
                  "id":3,
                  "name":"phone",
@@ -196,11 +92,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":290.421052631579,
-                 "y":121.719298245614
+                 "x":320.848944866127,
+                 "y":48.8525036839323
                 }, 
                 {
-                 "gid":13138,
                  "height":48,
                  "id":8,
                  "name":"key",
@@ -208,11 +103,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":192.421052631579,
-                 "y":96.4210526315789
+                 "x":194.022520643924,
+                 "y":49.9784802735841
                 }, 
                 {
-                 "gid":242,
                  "height":48,
                  "id":10,
                  "name":"notes",
@@ -220,9 +114,9 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":236.666666666667,
-                 "y":168.666666666667
-                },
+                 "x":244.67400672839,
+                 "y":62.9697778519203
+                }, 
                 {
                  "height":48,
                  "id":11,
@@ -231,9 +125,9 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":430,
-                 "y":380
-                },
+                 "x":381.155225623488,
+                 "y":188.624572524814
+                }, 
                 {
                  "height":48,
                  "id":12,
@@ -242,9 +136,9 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":380,
-                 "y":166
-                },
+                 "x":287.11485528401,
+                 "y":194.025690216031
+                }, 
                 {
                  "height":48,
                  "id":13,
@@ -253,17 +147,16 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":320,
-                 "y":166
-                }
-         ],
+                 "x":143.838518642089,
+                 "y":191.623488197514
+                }],
          "opacity":1,
          "type":"objectgroup",
          "visible":true,
          "x":0,
          "y":0
         }],
- "nextlayerid":12,
+ "nextlayerid":13,
  "nextobjectid":14,
  "orientation":"orthogonal",
  "renderorder":"right-down",
@@ -271,93 +164,28 @@
  "tileheight":48,
  "tilesets":[
         {
-         "columns":16,
+         "columns":1,
          "firstgid":1,
-         "image":"images\/Modern_Office_Revamped\/Modern_Office_48x48.png",
-         "imageheight":2544,
-         "imagewidth":768,
+         "image":"..\/tiles\/door.png",
+         "imageheight":96,
+         "imagewidth":48,
          "margin":0,
-         "name":"Modern_Office_48x48",
+         "name":"door",
          "spacing":0,
-         "tilecount":848,
+         "tilecount":2,
          "tileheight":48,
          "tilewidth":48
         }, 
         {
-         "columns":76,
-         "firstgid":849,
-         "image":"images\/1_Interiors\/48x48\/Room_Builder_48x48.png",
-         "imageheight":5232,
-         "imagewidth":3648,
+         "columns":10,
+         "firstgid":3,
+         "image":"room_reception_l.png",
+         "imageheight":480,
+         "imagewidth":480,
          "margin":0,
-         "name":"Room_Builder_48x48",
+         "name":"room_reception_l",
          "spacing":0,
-         "tilecount":8284,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":9133,
-         "image":"images\/1_Interiors\/48x48\/Interiors_48x48.png",
-         "imageheight":41232,
-         "imagewidth":768,
-         "margin":0,
-         "name":"Interiors_48x48",
-         "spacing":0,
-         "tilecount":13744,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":22877,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/19_Hospital_Shadowless_48x48.png",
-         "imageheight":5280,
-         "imagewidth":768,
-         "margin":0,
-         "name":"19_Hospital_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":1760,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":24637,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/18_Jail_Shadowless_48x48.png",
-         "imageheight":2160,
-         "imagewidth":768,
-         "margin":0,
-         "name":"18_Jail_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":720,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":25357,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/1_Generic_Shadowless_48x48.png",
-         "imageheight":3744,
-         "imagewidth":768,
-         "margin":0,
-         "name":"1_Generic_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":1248,
-         "tileheight":48,
-         "tilewidth":48
-        }, 
-        {
-         "columns":16,
-         "firstgid":26605,
-         "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/11_Halloween_Shadowless_48x48.png",
-         "imageheight":2928,
-         "imagewidth":768,
-         "margin":0,
-         "name":"11_Halloween_Shadowless_48x48",
-         "spacing":0,
-         "tilecount":976,
+         "tilecount":100,
          "tileheight":48,
          "tilewidth":48
         }],
diff --git a/assets/rooms/room_servers.json b/assets/rooms/room_servers.json
index 4571608..ae5da17 100644
--- a/assets/rooms/room_servers.json
+++ b/assets/rooms/room_servers.json
@@ -17,41 +17,21 @@
          "name":"floor",
          "opacity":1,
          "type":"tilelayer",
-         "visible":true,
+         "visible":false,
          "width":10,
          "x":0,
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1282, 1283, 1283, 1283, 1283, 1283, 1283, 1283, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 1358, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":10,
-         "name":"shadow",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[8207, 8360, 8361, 8360, 8361, 8360, 8361, 8360, 8361, 8210,
-            8283, 8436, 8437, 8436, 8437, 8436, 8437, 8436, 8437, 8286,
-            8359, 0, 0, 0, 0, 0, 0, 0, 0, 8362,
-            8359, 0, 0, 0, 0, 0, 0, 0, 0, 8362,
-            8359, 0, 0, 0, 0, 0, 0, 0, 0, 8362,
-            8359, 0, 0, 0, 0, 0, 0, 0, 0, 8362,
-            8359, 0, 0, 0, 0, 0, 0, 0, 0, 8362,
-            8359, 0, 0, 0, 0, 0, 0, 0, 0, 8362,
-            1311, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1310],
+         "data":[1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081,
+            1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091,
+            1092, 0, 0, 1085, 1086, 1087, 1088, 0, 0, 1101,
+            1102, 0, 0, 1095, 1096, 1097, 1098, 0, 0, 1111,
+            1112, 0, 0, 1105, 1106, 1107, 1108, 0, 0, 1121,
+            1122, 0, 0, 0, 0, 0, 0, 0, 0, 1131,
+            1132, 0, 0, 0, 0, 0, 0, 0, 0, 1141,
+            1142, 0, 0, 0, 0, 0, 0, 0, 0, 1151,
+            1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161],
          "height":9,
          "id":8,
          "name":"walls",
@@ -63,18 +43,18 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 9439, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 9455, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "data":[1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081,
+            1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091,
+            1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101,
+            1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111,
+            1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121,
+            1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131,
+            1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141,
+            1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, 1150, 1151,
+            1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161],
          "height":9,
-         "id":4,
-         "name":"tables",
+         "id":11,
+         "name":"ROOM",
          "opacity":1,
          "type":"tilelayer",
          "visible":true,
@@ -83,48 +63,8 @@
          "y":0
         }, 
         {
-         "data":[0, 0, 9461, 9462, 9461, 9462, 9462, 9462, 0, 0,
-            0, 0, 9477, 9478, 9477, 9478, 9478, 9478, 0, 0,
-            0, 0, 9493, 9494, 9493, 9494, 9494, 9494, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 9465, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 9481, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":5,
-         "name":"props",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 9461, 9462, 9462, 9461, 9462, 9462, 0, 0,
-            0, 0, 9477, 9478, 9478, 9477, 9478, 9478, 0, 0,
-            0, 0, 9493, 9494, 9494, 9493, 9494, 9494, 0, 0,
-            0, 0, 9461, 9462, 9461, 9462, 9462, 9462, 0, 0,
-            0, 0, 9477, 9478, 9477, 9478, 9478, 9478, 0, 0,
-            0, 0, 9493, 9494, 9493, 9494, 9494, 9494, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":9,
-         "id":3,
-         "name":"props",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":10,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 10493, 0, 0, 0, 0, 0, 0, 10493, 0,
-            0, 10509, 0, 0, 0, 0, 0, 0, 10509, 0,
+         "data":[0, 1070, 0, 0, 0, 0, 0, 0, 1070, 0,
+            0, 1071, 0, 0, 0, 0, 0, 0, 1071, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
             0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -148,7 +88,6 @@
          "name":"Object Layer 1",
          "objects":[
                 {
-                 "gid":207,
                  "height":48,
                  "id":1,
                  "name":"pc",
@@ -162,11 +101,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":372.460677644607,
-                 "y":141.580610734758
+                 "x":325.58780315068,
+                 "y":145.07858644326
                 }, 
                 {
-                 "gid":11984,
                  "height":48,
                  "id":5,
                  "name":"key",
@@ -174,11 +112,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":336.327112602223,
-                 "y":236.707066470958
+                 "x":120.851808958498,
+                 "y":177.241479426424
                 }, 
                 {
-                 "gid":11785,
                  "height":48,
                  "id":7,
                  "name":"safe",
@@ -186,11 +123,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":240,
-                 "y":192
+                 "x":416.297975708502,
+                 "y":277.350607287449
                 }, 
                 {
-                 "gid":11513,
                  "height":48,
                  "id":8,
                  "name":"book",
@@ -198,11 +134,10 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":306.132103166282,
-                 "y":220.603061438457
+                 "x":242.468945271545,
+                 "y":282.867029049793
                 }, 
                 {
-                 "gid":156,
                  "height":48,
                  "id":9,
                  "name":"phone",
@@ -210,8 +145,8 @@
                  "type":"",
                  "visible":true,
                  "width":48,
-                 "x":420.202138813168,
-                 "y":83.0480184525058
+                 "x":198.43047889414,
+                 "y":282.432633837121
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -219,7 +154,7 @@
          "x":0,
          "y":0
         }],
- "nextlayerid":11,
+ "nextlayerid":12,
  "nextobjectid":10,
  "orientation":"orthogonal",
  "renderorder":"right-down",
@@ -235,52 +170,78 @@
          "margin":0,
          "name":"Modern_Office_48x48",
          "spacing":0,
-         "tilecount":848,
+         "tilecount":0,
          "tileheight":48,
          "tilewidth":48
         }, 
         {
          "columns":76,
-         "firstgid":849,
+         "firstgid":96,
          "image":"images\/1_Interiors\/48x48\/Room_Builder_48x48.png",
          "imageheight":5232,
          "imagewidth":3648,
          "margin":0,
          "name":"Room_Builder_48x48",
          "spacing":0,
-         "tilecount":8284,
+         "tilecount":0,
          "tileheight":48,
          "tilewidth":48
         }, 
         {
          "columns":16,
-         "firstgid":9133,
+         "firstgid":96,
          "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/18_Jail_Shadowless_48x48.png",
          "imageheight":2160,
          "imagewidth":768,
          "margin":0,
          "name":"18_Jail_Shadowless_48x48",
          "spacing":0,
-         "tilecount":720,
+         "tilecount":0,
          "tileheight":48,
          "tilewidth":48
         }, 
         {
          "columns":16,
-         "firstgid":9853,
+         "firstgid":96,
          "image":"images\/1_Interiors\/48x48\/Theme_Sorter_Shadowless_48x48\/1_Generic_Shadowless_48x48.png",
          "imageheight":3744,
          "imagewidth":768,
          "margin":0,
          "name":"1_Generic_Shadowless_48x48",
          "spacing":0,
-         "tilecount":1248,
+         "tilecount":0,
          "tileheight":48,
          "tilewidth":48
         }, 
         {
-         "firstgid":11101,
+         "firstgid":96,
          "source":"11_Halloween_Shadowless_48x48.tsx"
+        }, 
+        {
+         "columns":1,
+         "firstgid":1070,
+         "image":"..\/tiles\/door.png",
+         "imageheight":96,
+         "imagewidth":48,
+         "margin":0,
+         "name":"door",
+         "spacing":0,
+         "tilecount":2,
+         "tileheight":48,
+         "tilewidth":48
+        }, 
+        {
+         "columns":10,
+         "firstgid":1072,
+         "image":"room_server_l.png",
+         "imageheight":480,
+         "imagewidth":480,
+         "margin":0,
+         "name":"room_server_l",
+         "spacing":0,
+         "tilecount":100,
+         "tileheight":48,
+         "tilewidth":48
         }],
  "tilewidth":48,
  "type":"map",
diff --git a/index.html b/index.html
index 2d8e836..63398a8 100644
--- a/index.html
+++ b/index.html
@@ -1517,14 +1517,21 @@
             this.load.tilemapTiledJSON('room_ceo', 'assets/rooms/room_ceo.json');
             this.load.tilemapTiledJSON('room_closet', 'assets/rooms/room_closet.json');
             this.load.tilemapTiledJSON('room_servers', 'assets/rooms/room_servers.json');
-            this.load.image('Modern_Office_48x48', 'assets/Modern_Office_48x48.png');
-            this.load.image('Room_Builder_48x48', 'assets/Room_Builder_48x48.png');
-            this.load.image('19_Hospital_Shadowless_48x48', 'assets/19_Hospital_Shadowless_48x48.png');
-            this.load.image('18_Jail_Shadowless_48x48', 'assets/18_Jail_Shadowless_48x48.png');
-            this.load.image('1_Generic_Shadowless_48x48', 'assets/1_Generic_Shadowless_48x48.png');
-            this.load.image('11_Halloween_Shadowless_48x48', 'assets/11_Halloween_Shadowless_48x48.png');
-            this.load.image('5_Classroom_and_library_Shadowless_48x48', 'assets/5_Classroom_and_library_Shadowless_48x48.png');
-            
+
+            // this.load.image('Modern_Office_48x48', 'assets/Modern_Office_48x48.png');
+            // this.load.image('Room_Builder_48x48', 'assets/Room_Builder_48x48.png');
+            // this.load.image('19_Hospital_Shadowless_48x48', 'assets/19_Hospital_Shadowless_48x48.png');
+            // this.load.image('18_Jail_Shadowless_48x48', 'assets/18_Jail_Shadowless_48x48.png');
+            // this.load.image('1_Generic_Shadowless_48x48', 'assets/1_Generic_Shadowless_48x48.png');
+            // this.load.image('11_Halloween_Shadowless_48x48', 'assets/11_Halloween_Shadowless_48x48.png');
+            // this.load.image('5_Classroom_and_library_Shadowless_48x48', 'assets/5_Classroom_and_library_Shadowless_48x48.png');
+
+            this.load.image('room_reception_l', 'assets/rooms/room_reception_l.png');
+            this.load.image('room_office_l', 'assets/rooms/room_office_l.png');
+            this.load.image('room_server_l', 'assets/rooms/room_server_l.png');
+            this.load.image('room_ceo_l', 'assets/rooms/room_ceo_l.png');
+            this.load.image('room_spooky_basement_l', 'assets/rooms/room_spooky_basement_l.png');
+            this.load.image('door', 'assets/tiles/door.png');
             // Load object sprites
             this.load.image('pc', 'assets/objects/pc.png');
             this.load.image('key', 'assets/objects/key.png');
@@ -1542,9 +1549,10 @@
             this.load.image('tablet', 'assets/objects/tablet.png');
             this.load.image('fingerprint_kit', 'assets/objects/fingerprint_kit.png');
             this.load.image('lockpick', 'assets/objects/lockpick.png');
+            this.load.image('spoofing_kit', 'assets/objects/spoofing_kit.png');
 
-            this.load.json('gameScenarioJSON', 'assets/scenarios/biometric_breach.json');
-            //this.load.json('gameScenarioJSON', 'assets/scenarios/ceo_exfil.json');
+            //this.load.json('gameScenarioJSON', 'assets/scenarios/biometric_breach.json');
+            this.load.json('gameScenarioJSON', 'assets/scenarios/ceo_exfil.json');
             gameScenario = this.cache.json.get('gameScenarioJSON');
         }
 
@@ -6543,4 +6551,4 @@
 
     </script>
 </body>
-</html> 
\ No newline at end of file
+</html>