diff --git a/game_ui.lua b/game_ui.lua
deleted file mode 100644
index 7242112..0000000
--- a/game_ui.lua
+++ /dev/null
@@ -1,88 +0,0 @@
--- Player-facing HUD drawn into gameCanvas. Keeping it here (rather than in
--- the editor sidebar) means its RGB circles use the same screen blend as the
--- room, so their overlaps are the real additive colour combinations.
-local GameUI = {}
-
-local channelColor = {
-	red = {1, 0, 0},
-	green = {0, 1, 0},
-	blue = {0, 0, 1},
-}
-
-local vennSize = 32
-local vennLayout = {
-	red = {x = 12, y = 10},
-	green = {x = 20, y = 10},
-	blue = {x = 16, y = 18},
-}
-
-local function drawDottedCircle(x, y, radius, color, dotRadius)
-	local dots = math.max(14, math.floor((2 * math.pi * radius) / (dotRadius * 4)))
-	love.graphics.setColor(color[1], color[2], color[3], 1)
-	for index = 0, dots - 1 do
-		local angle = index / dots * math.pi * 2
-		love.graphics.circle("fill", x + math.cos(angle) * radius, y + math.sin(angle) * radius, dotRadius)
-	end
-end
-
-function GameUI.init()
-	uiVennCanvas = love.graphics.newCanvas(vennSize, vennSize)
-	uiVennCanvas:setFilter("nearest", "nearest")
-end
-
-function GameUI.drawBacking()
-	if not gameUiBox then return end
-	love.graphics.setBlendMode("alpha")
-	love.graphics.setColor(0, 0, 0, 1)
-	love.graphics.rectangle("fill", gameUiBox.x, gameUiBox.y, gameUiBox.w, gameUiBox.h)
-end
-
-function GameUI.drawVennOverlay()
-	if not gameUiBox or not uiVennCanvas then return end
-	local cellSize = width / gridWidth
-	local sidebarWidth = cellSize * 2
-	if gameUiBox.w < sidebarWidth then return end
-
-	love.graphics.setBlendMode("screen")
-	love.graphics.setColor(1, 1, 1, 1)
-	local scale = cellSize / 22
-	local vennWidth = vennSize * scale
-	local left = gameUiBox.x + (gameUiBox.w - vennWidth) / 2
-	love.graphics.draw(uiVennCanvas, left, cellSize * 1.1, 0, scale, scale)
-end
-
-function GameUI.drawColorVenn(room)
-	if not room or not gameUiBox then return end
-	GameUI.drawBacking()
-
-	local cellSize = width / gridWidth
-	local sidebarWidth = cellSize * 2
-	if gameUiBox.w < sidebarWidth or not uiVennCanvas then return end
-
-	love.graphics.setCanvas(uiVennCanvas)
-	love.graphics.clear(0, 0, 0, 0)
-	love.graphics.setBlendMode("screen")
-	local radius = 9
-	local dotRadius = 1
-	local active = {}
-	for _, color in ipairs(room:getActiveColors()) do active[color] = true end
-
-	for _, color in ipairs({"red", "green", "blue"}) do
-		if room.player[color] then
-			local layout = vennLayout[color]
-			local x, y = layout.x, layout.y
-			local rgb = channelColor[color]
-			if active[color] then
-				love.graphics.setColor(rgb[1], rgb[2], rgb[3], 1)
-				love.graphics.circle("fill", x, y, radius)
-			else
-				drawDottedCircle(x, y, radius, rgb, dotRadius)
-			end
-		end
-	end
-
-	love.graphics.setCanvas(gameCanvas)
-	GameUI.drawVennOverlay()
-end
-
-return GameUI
diff --git a/level_editor/editor.lua b/level_editor/editor.lua
index 7c957cf..b55c092 100644
--- a/level_editor/editor.lua
+++ b/level_editor/editor.lua
@@ -1138,10 +1138,10 @@ local function openWorldRoom(cellX, cellY)
 end
 
 function editorMouseHandler(x, y, button)
-	if x >= sideBarBox.x and x < sideBarBox.x + sideBarBox.w then
+	if x > width then
 		-- map from real window coords into the sidebar's fixed virtual space
 		-- (same transform used to scale the sidebar canvas up in love.draw)
-		x = (x - sideBarBox.x) * sb.w / sideBarBox.w
+		x = (x - width) * sb.w / sideBarBox.w
 		y = y * sb.h / sideBarBox.h
 
 		if editorView == "room" then
diff --git a/main.lua b/main.lua
index f2c8ec2..c8877ba 100644
--- a/main.lua
+++ b/main.lua
@@ -15,7 +15,6 @@ require "room"
 require "world"
 require "world_seed"
 require "shaders"
-GameUI = require "game_ui"
 require "level_editor/editor"
 
 -- Ink dialogue: ship the pre-parsed book (LÖVE has no lpeg to parse .ink at
@@ -111,7 +110,6 @@ function love.draw()
 	else
 		currentRoom:draw()
 	end
-	GameUI.drawColorVenn(currentRoom)
 
 	love.graphics.setCanvas(finalCanvas)
 	love.graphics.clear()
@@ -160,10 +158,6 @@ function love.draw()
 	love.graphics.setBlendMode("alpha")
 	love.graphics.setColor(1, 1, 1, 1)
 	love.graphics.draw(finalCanvas, 0, 0)
-	GameUI.drawBacking()
-	GameUI.drawVennOverlay()
-	love.graphics.setBlendMode("alpha")
-	love.graphics.setColor(1, 1, 1, 1)
 	if DEBUG then love.graphics.draw(sideBarCanvas, sideBarBox.x, sideBarBox.y) end
 	love.graphics.print("Current FPS: "..tostring(love.timer.getFPS( )), 10, 10)
 	PerfProfiler:draw()
@@ -271,7 +265,7 @@ end
 function love.wheelmoved(dx, dy)
 	if not DEBUG then return end
 	-- Scroll the editor's asset/folder list when the cursor is over the sidebar.
-	if editorView == "room" and love.mouse.getX() >= sideBarBox.x then
+	if editorView == "room" and love.mouse.getX() > width then
 		editorScrollRoomList(dy)
 	end
 end
@@ -310,10 +304,7 @@ function _computeDimensions()
 		height = width
 	end
 
-	local availableWidth = love.graphics.getWidth() - width
-	local hudWidth = math.min(availableWidth, width / (gridWidth or 11) * 2)
-	gameUiBox = {x = width, y = 0, w = hudWidth, h = height}
-	sideBarBox = {x = gameUiBox.x + gameUiBox.w, y = 0, w = availableWidth - gameUiBox.w, h = height}
+	sideBarBox = {x = width, y = 0, w = love.graphics.getWidth() - width, h = height}
 
 	-- The editor sidebar is authored in a fixed virtual space and scaled up to
 	-- fill the real panel, so every element keeps the same size relative to the
@@ -342,7 +333,6 @@ function _initCanvases()
 	porousRoomCanvas = love.graphics.newCanvas()
 	sideBarCanvas = love.graphics.newCanvas(math.max(1, sideBarBox.w), math.max(1, sideBarBox.h))
 	sideBarCanvas:setFilter("nearest", "nearest") -- never average when sampled
-	GameUI.init()
 end
 
 function _initGridVars()
diff --git a/rooms/jorge2.sav b/rooms/jorge2.sav
index e892228..e669fcb 100644
--- a/rooms/jorge2.sav
+++ b/rooms/jorge2.sav
@@ -1,1389 +1,1389 @@
 {
+wires={
+},
 objects={
 	{
-		color="blue",
-		y=8,
+		color="red",
+		x=4,
 		class="slime_woman",
-		x=4
+		y=8
 	},
 	{
-		color="blue",
-		y=7,
+		color="red",
+		x=4,
 		class="slime_woman",
-		x=4
+		y=7
 	},
 	{
-		color="blue",
-		y=6,
+		color="red",
+		x=4,
 		class="slime_woman",
-		x=4
+		y=6
 	},
 	{
-		color="blue",
-		y=3,
+		color="red",
+		x=4,
 		class="slime_woman",
-		x=4
+		y=3
 	},
 	{
-		color="blue",
-		y=2,
+		color="red",
+		x=4,
 		class="slime_woman",
-		x=4
+		y=2
 	},
 	{
-		color="blue",
-		y=2,
+		color="red",
+		x=5,
 		class="slime_woman",
-		x=5
+		y=2
 	},
 	{
-		color="blue",
-		y=2,
+		color="red",
+		x=6,
 		class="slime_woman",
-		x=6
+		y=2
 	},
 	{
-		color="blue",
-		y=2,
+		color="red",
+		x=7,
 		class="slime_woman",
-		x=7
+		y=2
 	},
 	{
-		color="blue",
-		y=2,
+		color="red",
+		x=8,
 		class="slime_woman",
-		x=8
+		y=2
 	},
 	{
-		color="blue",
-		y=4,
+		color="red",
+		x=6,
 		class="slime_woman",
-		x=6
+		y=4
 	},
 	{
-		color="blue",
-		y=3,
+		color="red",
+		x=1,
 		class="slime_woman",
-		x=1
+		y=3
 	},
 	{
-		color="blue",
-		y=3,
+		color="red",
+		x=2,
 		class="slime_woman",
-		x=2
+		y=3
 	},
 	{
-		color="blue",
-		y=1,
+		color="red",
+		x=3,
 		class="slime_woman",
-		x=3
+		y=1
 	},
 	{
-		color="blue",
-		y=1,
+		color="red",
+		x=2,
 		class="slime_woman",
-		x=2
+		y=1
 	},
 	{
-		color="blue",
-		y=1,
+		color="red",
+		x=1,
 		class="slime_woman",
-		x=1
+		y=1
 	},
 	{
-		color="blue",
-		y=7,
+		color="red",
+		x=6,
 		class="slime_woman",
-		x=6
+		y=7
 	},
 	{
-		color="blue",
-		y=8,
+		color="red",
+		x=6,
 		class="slime_woman",
-		x=6
+		y=8
 	},
 	{
-		color="blue",
-		y=5,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="blue",
-		y=10,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=2
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=10,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=9,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=8,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=7,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=6,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=5,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=4,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=3,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="blue",
-		y=2,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="blue",
-		y=2,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=1,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=2,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=3,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=3,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="blue",
-		y=6,
-		class="door",
-		x=11
-	},
-	{
-		color="blue",
-		y=2,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=3,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=4,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=5,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=4,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=4,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=5,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=7,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=8,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=9,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=10,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=10,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=11,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=10,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=9,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=8,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="blue",
-		y=8,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=8,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="blue",
-		y=8,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="blue",
-		y=6,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="blue",
-		y=5,
+		color="red",
+		x=6,
 		class="box_2x2_01-11",
-		x=6
+		y=4
 	},
 	{
-		color="blue",
-		y=5,
+		color="red",
+		x=8,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="red",
+		x=10,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=9,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=8,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=7,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=6,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=5,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=4,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=3,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="red",
+		x=3,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=2,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=9
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=6
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="red",
+		x=1,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="red",
+		x=3,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=4,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=5,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=6,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=7,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=8,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=8,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="red",
+		x=9,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="red",
+		x=9,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=10,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=11,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="red",
+		x=10,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="red",
+		x=10,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="red",
+		x=9,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="red",
+		x=8,
 		class="box",
-		x=6
+		y=3
 	},
 	{
 		color="red",
-		y=8,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="red",
-		y=7,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="red",
-		y=6,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="red",
-		y=3,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="red",
-		y=4,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="red",
-		y=3,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=3,
-		class="slime_woman",
-		x=2
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=2
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=7,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="red",
-		y=8,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="red",
-		y=5,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="red",
-		y=10,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=2
-	},
-	{
-		color="red",
-		y=11,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=10,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=9,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=8,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=7,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=6,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=5,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=4,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=3,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="red",
-		y=1,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="red",
-		y=2,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="red",
-		y=3,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="red",
-		y=3,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="red",
-		y=6,
+		x=11,
 		class="door",
-		x=11
+		y=6
 	},
 	{
 		color="red",
-		y=2,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=2
 	},
 	{
 		color="red",
-		y=3,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=3
 	},
 	{
 		color="red",
-		y=4,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=4
 	},
 	{
 		color="red",
-		y=5,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=5
 	},
 	{
 		color="red",
-		y=4,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=4
 	},
 	{
 		color="red",
-		y=4,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=4
 	},
 	{
 		color="red",
-		y=5,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=5
 	},
 	{
 		color="red",
-		y=7,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=7
 	},
 	{
 		color="red",
-		y=8,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=8
 	},
 	{
 		color="red",
-		y=9,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=9
 	},
 	{
 		color="red",
-		y=10,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=10
 	},
 	{
 		color="red",
-		y=10,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=10
 	},
 	{
 		color="red",
-		y=11,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=11
 	},
 	{
 		color="red",
-		y=10,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=10
 	},
 	{
 		color="red",
-		y=9,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=9
 	},
 	{
 		color="red",
-		y=8,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=8
 	},
 	{
 		color="red",
-		y=8,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=8
 	},
 	{
 		color="red",
-		y=8,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=8
 	},
 	{
 		color="red",
-		y=8,
+		x=9,
 		class="slime_woman",
-		x=9
+		y=8
 	},
 	{
 		color="red",
-		y=6,
+		x=8,
 		class="slime_woman",
-		x=8
+		y=6
 	},
 	{
-		color="red",
-		y=5,
+		color="green",
+		x=4,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="green",
+		x=4,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="green",
+		x=4,
+		class="slime_woman",
+		y=6
+	},
+	{
+		color="green",
+		x=4,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="green",
+		x=4,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=5,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=6,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=7,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=8,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=6,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="green",
+		x=2,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="green",
+		x=3,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=2,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=6,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="green",
+		x=6,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="green",
+		x=6,
 		class="box_2x2_01-11",
-		x=6
+		y=4
 	},
 	{
-		color="red",
-		y=5,
+		color="green",
+		x=8,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="green",
+		x=10,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=9,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=8,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=7,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=6,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=5,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=4,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=3,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="green",
+		x=3,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=2,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=9
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=6
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="green",
+		x=1,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="green",
+		x=3,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=4,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=5,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=6,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=7,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=8,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=8,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=9,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=9,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=10,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=11,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="green",
+		x=10,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="green",
+		x=10,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="green",
+		x=9,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="green",
+		x=8,
 		class="box",
-		x=6
+		y=3
 	},
 	{
 		color="green",
-		y=8,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="green",
-		y=7,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="green",
-		y=6,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="green",
-		y=3,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="green",
-		y=4,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="green",
-		y=3,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=3,
-		class="slime_woman",
-		x=2
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=2
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=7,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="green",
-		y=8,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="green",
-		y=5,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="green",
-		y=10,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=2
-	},
-	{
-		color="green",
-		y=11,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=10,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=9,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=8,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=7,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=6,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=5,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=4,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=3,
-		class="slime_woman",
-		x=1
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=3
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=4
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=5
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=6
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=7
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=8
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="green",
-		y=1,
-		class="slime_woman",
-		x=11
-	},
-	{
-		color="green",
-		y=2,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="green",
-		y=3,
-		class="slime_woman",
-		x=10
-	},
-	{
-		color="green",
-		y=3,
-		class="slime_woman",
-		x=9
-	},
-	{
-		color="green",
-		y=6,
+		x=11,
 		class="door",
-		x=11
+		y=6
 	},
 	{
 		color="green",
-		y=2,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=2
 	},
 	{
 		color="green",
-		y=3,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=3
 	},
 	{
 		color="green",
-		y=4,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=4
 	},
 	{
 		color="green",
-		y=5,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=5
 	},
 	{
 		color="green",
-		y=4,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=4
 	},
 	{
 		color="green",
-		y=4,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=4
 	},
 	{
 		color="green",
-		y=5,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=5
 	},
 	{
 		color="green",
-		y=7,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=7
 	},
 	{
 		color="green",
-		y=8,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=8
 	},
 	{
 		color="green",
-		y=9,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=9
 	},
 	{
 		color="green",
-		y=10,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=10
 	},
 	{
 		color="green",
-		y=10,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=10
 	},
 	{
 		color="green",
-		y=11,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=11
 	},
 	{
 		color="green",
-		y=10,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=10
 	},
 	{
 		color="green",
-		y=9,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=9
 	},
 	{
 		color="green",
-		y=8,
+		x=11,
 		class="slime_woman",
-		x=11
+		y=8
 	},
 	{
 		color="green",
-		y=8,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=8
 	},
 	{
 		color="green",
-		y=8,
+		x=10,
 		class="slime_woman",
-		x=10
+		y=8
 	},
 	{
 		color="green",
-		y=8,
+		x=9,
 		class="slime_woman",
-		x=9
+		y=8
 	},
 	{
 		color="green",
-		y=6,
+		x=8,
 		class="slime_woman",
-		x=8
+		y=6
 	},
 	{
-		color="green",
-		y=5,
+		color="blue",
+		x=4,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=4,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="blue",
+		x=4,
+		class="slime_woman",
+		y=6
+	},
+	{
+		color="blue",
+		x=4,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="blue",
+		x=4,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=5,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=6,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=7,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=8,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=6,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="blue",
+		x=2,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="blue",
+		x=3,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=2,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=6,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="blue",
+		x=6,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=6,
 		class="box_2x2_01-11",
-		x=6
+		y=4
 	},
 	{
-		color="green",
-		y=5,
+		color="blue",
+		x=8,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=9,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=8,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=7,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=6,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=5,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=4,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=3,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="blue",
+		x=3,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=2,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=9
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=6
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="blue",
+		x=1,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="blue",
+		x=3,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=4,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=5,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=6,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=7,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=8,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=8,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=9,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=9,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=1
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="blue",
+		x=9,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="blue",
+		x=8,
 		class="box",
-		x=6
+		y=3
 	},
 	{
 		color="blue",
-		y=3,
-		class="switch",
-		x=8
+		x=11,
+		class="door",
+		y=6
 	},
 	{
 		color="blue",
-		y=4,
-		class="switch",
-		x=7
+		x=11,
+		class="slime_woman",
+		y=2
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=3
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=4
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=5
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=7
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=9
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=11
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=10
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=9
+	},
+	{
+		color="blue",
+		x=11,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=10,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=9,
+		class="slime_woman",
+		y=8
+	},
+	{
+		color="blue",
+		x=8,
+		class="slime_woman",
+		y=6
 	},
 	{
 		color="red",
-		y=3,
+		x=8,
 		class="switch",
-		x=8
+		y=3
 	},
 	{
 		color="red",
-		y=4,
+		x=7,
 		class="switch",
-		x=7
+		y=4
 	},
 	{
 		color="green",
-		y=3,
+		x=8,
 		class="switch",
-		x=8
+		y=3
 	},
 	{
 		color="green",
-		y=4,
+		x=7,
 		class="switch",
-		x=7
+		y=4
 	},
 	{
-		y=9,
-		class="jorge",
-		x=9
+		color="blue",
+		x=8,
+		class="switch",
+		y=3
 	},
 	{
-		y=9,
-		class="jorge",
-		x=9
+		color="blue",
+		x=7,
+		class="switch",
+		y=4
 	},
 	{
-		y=9,
+		x=9,
 		class="jorge",
-		x=9
+		y=9
+	},
+	{
+		x=9,
+		class="jorge",
+		y=9
+	},
+	{
+		x=9,
+		class="jorge",
+		y=9
 	}
-},
-wires={
 }
 }
\ No newline at end of file
diff --git a/rooms/room_09_13.sav b/rooms/room_09_13.sav
index 2165a00..d396bf8 100644
--- a/rooms/room_09_13.sav
+++ b/rooms/room_09_13.sav
@@ -1,196 +1,217 @@
 {
 objects={
 	{
-		class="wired_door",
-		y=8,
-		circuit="wire_6a7bdb2a_0001",
-		color="red",
-		x=9
-	},
-	{
-		class="wired_door",
-		y=8,
-		circuit="wire_6a7bdb2a_0001",
 		color="green",
-		x=9
+		x=3,
+		y=7,
+		active=true,
+		class="player"
 	},
 	{
-		class="box",
-		color="green",
-		y=8,
-		x=5
-	},
-	{
-		class="wired_door",
-		y=8,
-		circuit="wire_6a7bdb2a_0001",
 		color="blue",
-		x=9
+		x=3,
+		y=7,
+		active=true,
+		class="player"
 	},
 	{
-		class="wired_door",
+		color="red",
+		x=3,
+		y=7,
+		active=true,
+		class="player"
+	},
+	{
+		color="green",
+		x=9,
+		y=8,
+		circuit="wire_6a7bdb2a_0001",
+		class="wired_door"
+	},
+	{
+		color="green",
+		x=5,
+		y=8,
+		class="box"
+	},
+	{
+		color="blue",
+		x=9,
+		y=8,
+		circuit="wire_6a7bdb2a_0001",
+		class="wired_door"
+	},
+	{
+		color="blue",
+		x=7,
 		y=4,
 		circuit="wire_6a7bd969_000a",
-		color="blue",
-		x=7
+		class="wired_door"
+	},
+	{
+		color="red",
+		x=9,
+		y=8,
+		circuit="wire_6a7bdb2a_0001",
+		class="wired_door"
 	},
 	{
-		class="wired_switch",
 		color="green",
+		x=5,
 		y=7,
-		x=5
+		class="wired_switch"
 	}
 },
 wires={
 	{
+		edges=12,
 		x=1,
 		y=3,
-		circuit="wire_6a7bd969_000a",
-		edges=12
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=3,
 		x=1,
 		y=4,
-		circuit="wire_6a7bd969_000a",
-		edges=3
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=10,
 		x=2,
 		y=4,
-		circuit="wire_6a7bd969_000a",
-		edges=10
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=10,
 		x=3,
 		y=4,
-		circuit="wire_6a7bd969_000a",
-		edges=10
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=10,
 		x=4,
 		y=4,
-		circuit="wire_6a7bd969_000a",
-		edges=10
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=10,
 		x=5,
 		y=4,
-		circuit="wire_6a7bd969_000a",
-		edges=10
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=10,
 		x=6,
 		y=4,
-		circuit="wire_6a7bd969_000a",
-		edges=10
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=8,
 		x=7,
 		y=4,
-		circuit="wire_6a7bd969_000a",
-		edges=8
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=4,
 		x=7,
 		y=4,
-		circuit="wire_6a7bdf16_0001",
-		edges=4
+		circuit="wire_6a7bdf16_0001"
 	},
 	{
+		edges=5,
 		x=7,
 		y=5,
-		circuit="wire_6a7bdf16_0001",
-		edges=5
+		circuit="wire_6a7bdf16_0001"
 	},
 	{
+		edges=6,
 		x=5,
 		y=6,
-		circuit="wire_6a7bdf16_0001",
-		edges=6
+		circuit="wire_6a7bdf16_0001"
 	},
 	{
+		edges=10,
 		x=6,
 		y=6,
-		circuit="wire_6a7bdf16_0001",
-		edges=10
+		circuit="wire_6a7bdf16_0001"
 	},
 	{
+		edges=9,
 		x=7,
 		y=6,
-		circuit="wire_6a7bdf16_0001",
-		edges=9
+		circuit="wire_6a7bdf16_0001"
 	},
 	{
+		edges=0,
 		x=5,
 		y=7,
-		circuit="wire_6a7bd969_000a",
-		edges=0
+		circuit="wire_6a7bd969_000a"
 	},
 	{
+		edges=1,
 		x=5,
 		y=7,
-		circuit="wire_6a7bdf16_0001",
-		edges=1
+		circuit="wire_6a7bdf16_0001"
 	},
 	{
+		edges=4,
 		x=9,
 		y=8,
-		circuit="wire_6a7bdb2a_0001",
-		edges=4
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=1,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=2,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=3,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=4,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=5,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=6,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=7,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=10,
 		x=8,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=10
+		circuit="wire_6a7bdb2a_0001"
 	},
 	{
+		edges=9,
 		x=9,
 		y=9,
-		circuit="wire_6a7bdb2a_0001",
-		edges=9
+		circuit="wire_6a7bdb2a_0001"
 	}
 }
 }
\ No newline at end of file
diff --git a/rooms/room_12_14.sav b/rooms/room_12_14.sav
deleted file mode 100644
index 75c9d70..0000000
--- a/rooms/room_12_14.sav
+++ /dev/null
@@ -1,796 +0,0 @@
-{
-objects={
-	{
-		color="green",
-		active=true,
-		x=1,
-		y=6,
-		class="player"
-	},
-	{
-		color="blue",
-		active=true,
-		x=1,
-		y=6,
-		class="player"
-	},
-	{
-		color="red",
-		active=true,
-		x=1,
-		y=6,
-		class="player"
-	},
-	{
-		x=11,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=11,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=7,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=11,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=6,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=5,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=4,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=3,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=2,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=10,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=9,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=8,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=7,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=5,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=4,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=3,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=2,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=2,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=3,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=4,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=5,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=6,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=7,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="green",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=11,
-		color="green",
-		y=4,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="green",
-		y=2,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="green",
-		y=4,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="green",
-		y=4,
-		class="static_wall"
-	},
-	{
-		color="green",
-		circuit="wire_6a7ca485_0005",
-		x=9,
-		y=3,
-		class="wired_door"
-	},
-	{
-		x=5,
-		color="green",
-		y=6,
-		class="box"
-	},
-	{
-		x=8,
-		color="green",
-		y=6,
-		class="box"
-	},
-	{
-		x=11,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=11,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=7,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=11,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=6,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=5,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=4,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=3,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=2,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=10,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=9,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=8,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=7,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=5,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=4,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=3,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=2,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=2,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=3,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=4,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=5,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=6,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=7,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="blue",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=6,
-		color="blue",
-		y=7,
-		class="box"
-	},
-	{
-		x=11,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=11,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=7,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=11,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=6,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=5,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=4,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=3,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=2,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=11,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=10,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=9,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=8,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=7,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=5,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=4,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=3,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=2,
-		class="static_wall"
-	},
-	{
-		x=1,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=2,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=3,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=4,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=5,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=6,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=7,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=8,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=9,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="red",
-		y=1,
-		class="static_wall"
-	},
-	{
-		x=10,
-		color="green",
-		y=3,
-		class="wired_switch"
-	},
-	{
-		x=4,
-		color="blue",
-		y=3,
-		class="wired_switch"
-	}
-},
-wires={
-	{
-		edges=6,
-		x=4,
-		y=2,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=12,
-		x=5,
-		y=2,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=1,
-		x=4,
-		y=3,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=3,
-		x=5,
-		y=3,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=10,
-		x=6,
-		y=3,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=10,
-		x=7,
-		y=3,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=10,
-		x=8,
-		y=3,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=8,
-		x=9,
-		y=3,
-		circuit="wire_6a7ca485_0005"
-	},
-	{
-		edges=2,
-		x=10,
-		y=3,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		edges=12,
-		x=11,
-		y=3,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		edges=5,
-		x=11,
-		y=4,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		edges=5,
-		x=11,
-		y=5,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		edges=6,
-		x=10,
-		y=6,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		edges=9,
-		x=11,
-		y=6,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		edges=3,
-		x=10,
-		y=7,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		edges=10,
-		x=11,
-		y=7,
-		circuit="wire_6a7ca47f_0004"
-	}
-}
-}
\ No newline at end of file
diff --git a/rooms/room_13_14.sav b/rooms/room_13_14.sav
index 0a2ea53..c23f293 100644
--- a/rooms/room_13_14.sav
+++ b/rooms/room_13_14.sav
@@ -1,1192 +1,1165 @@
 {
-objects={
-	{
-		x=7,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=7,
-		color="red"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=6,
-		color="red"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=2,
-		color="red"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=6,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=4,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=3,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=2,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=1,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=2,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=3,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=4,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=5,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=6,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=8,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=9,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=10,
-		color="red"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=2,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=3,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=4,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=6,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=11,
-		color="red"
-	},
-	{
-		class="wired_door",
-		color="red",
-		x=6,
-		y=4,
-		circuit="wire_6a7be789_0002"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=3,
-		color="red"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=2,
-		color="red"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=2,
-		color="red"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=3,
-		color="red"
-	},
-	{
-		class="wired_door",
-		color="red",
-		x=11,
-		y=5,
-		circuit="wire_6a7c19b9_0002"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=3,
-		color="red"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=4,
-		color="red"
-	},
-	{
-		class="wired_door",
-		color="red",
-		x=1,
-		y=7,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=7,
-		color="green"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=6,
-		color="green"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=2,
-		color="green"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=6,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=4,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=3,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=2,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=1,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=2,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=3,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=4,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=5,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=6,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=8,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=9,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=10,
-		color="green"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=2,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=3,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=4,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=6,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=11,
-		color="green"
-	},
-	{
-		class="wired_door",
-		color="green",
-		x=6,
-		y=4,
-		circuit="wire_6a7be789_0002"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=3,
-		color="green"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=2,
-		color="green"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=2,
-		color="green"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=3,
-		color="green"
-	},
-	{
-		class="wired_door",
-		color="green",
-		x=11,
-		y=5,
-		circuit="wire_6a7c19b9_0002"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=3,
-		color="green"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=4,
-		color="green"
-	},
-	{
-		class="wired_door",
-		color="green",
-		x=1,
-		y=7,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=7,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=6,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=2,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=6,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=4,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=3,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=2,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=1,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=2,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=3,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=4,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=5,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=6,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=8,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=9,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=10,
-		color="blue"
-	},
-	{
-		x=1,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=2,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=3,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=4,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=6,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=8,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=9,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		x=10,
-		class="static_wall",
-		y=11,
-		color="blue"
-	},
-	{
-		class="wired_door",
-		color="blue",
-		x=6,
-		y=4,
-		circuit="wire_6a7be789_0002"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=3,
-		color="blue"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=2,
-		color="blue"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=2,
-		color="blue"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=3,
-		color="blue"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=3,
-		color="blue"
-	},
-	{
-		x=5,
-		class="static_wall",
-		y=2,
-		color="blue"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=2,
-		color="blue"
-	},
-	{
-		x=7,
-		class="static_wall",
-		y=3,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=10,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=9,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=8,
-		color="blue"
-	},
-	{
-		x=2,
-		class="static_wall",
-		y=4,
-		color="blue"
-	},
-	{
-		x=4,
-		class="static_wall",
-		y=4,
-		color="blue"
-	},
-	{
-		class="wired_door",
-		color="blue",
-		x=3,
-		y=4,
-		circuit="wire_6a7bec68_0012"
-	},
-	{
-		class="wired_door",
-		color="blue",
-		x=11,
-		y=5,
-		circuit="wire_6a7c19b9_0002"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=3,
-		color="blue"
-	},
-	{
-		x=11,
-		class="static_wall",
-		y=4,
-		color="blue"
-	},
-	{
-		x=3,
-		class="box",
-		y=2,
-		color="blue"
-	},
-	{
-		class="wired_door",
-		color="blue",
-		x=1,
-		y=7,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
-		x=3,
-		class="wired_switch",
-		y=7,
-		color="blue"
-	},
-	{
-		x=6,
-		class="wired_switch",
-		y=2,
-		color="red"
-	},
-	{
-		x=6,
-		class="wired_switch",
-		y=2,
-		color="green"
-	},
-	{
-		x=6,
-		class="wired_switch",
-		y=7,
-		color="blue"
-	}
-},
 wires={
 	{
-		edges=0,
 		x=6,
 		y=2,
+		edges=0,
 		circuit="wire_6a7be7c5_0004"
 	},
 	{
-		edges=2,
 		x=6,
 		y=2,
+		edges=2,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=10,
 		x=7,
 		y=2,
+		edges=10,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=10,
 		x=8,
 		y=2,
+		edges=10,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=12,
 		x=9,
 		y=2,
+		edges=12,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=5,
 		x=9,
 		y=3,
+		edges=5,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=4,
 		x=3,
 		y=4,
+		edges=4,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=4,
 		x=6,
 		y=4,
+		edges=4,
 		circuit="wire_6a7be789_0002"
 	},
 	{
-		edges=5,
 		x=9,
 		y=4,
+		edges=5,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=3,
 		x=3,
 		y=5,
+		edges=3,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=12,
 		x=4,
 		y=5,
+		edges=12,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=5,
 		x=6,
 		y=5,
+		edges=5,
 		circuit="wire_6a7be789_0002"
 	},
 	{
-		edges=3,
 		x=9,
 		y=5,
+		edges=3,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=10,
 		x=10,
 		y=5,
+		edges=10,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=8,
 		x=11,
 		y=5,
+		edges=8,
 		circuit="wire_6a7c19b9_0002"
 	},
 	{
-		edges=5,
 		x=4,
 		y=6,
+		edges=5,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=5,
 		x=6,
 		y=6,
+		edges=5,
 		circuit="wire_6a7be789_0002"
 	},
 	{
-		edges=8,
-		x=1,
+		x=3,
 		y=7,
-		circuit="wire_6a7ca47f_0004"
-	},
-	{
 		edges=4,
-		x=3,
-		y=7,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=5,
 		x=4,
 		y=7,
+		edges=5,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=1,
 		x=6,
 		y=7,
+		edges=1,
 		circuit="wire_6a7be789_0002"
 	},
 	{
-		edges=5,
 		x=3,
 		y=8,
+		edges=5,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=3,
 		x=4,
 		y=8,
+		edges=3,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=10,
 		x=5,
 		y=8,
+		edges=10,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=10,
 		x=6,
 		y=8,
+		edges=10,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=10,
 		x=7,
 		y=8,
+		edges=10,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=10,
 		x=8,
 		y=8,
+		edges=10,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=10,
 		x=9,
 		y=8,
+		edges=10,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=10,
 		x=10,
 		y=8,
+		edges=10,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=10,
 		x=11,
 		y=8,
+		edges=10,
 		circuit="wire_6a7bec68_0012"
 	},
 	{
-		edges=5,
 		x=3,
 		y=9,
+		edges=5,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=3,
 		x=3,
 		y=10,
+		edges=3,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=4,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=5,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=6,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=7,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=8,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=9,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=10,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	},
 	{
-		edges=10,
 		x=11,
 		y=10,
+		edges=10,
 		circuit="wire_6a7be918_000b"
 	}
+},
+objects={
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=10
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=7,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=6,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=2,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=10
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=6
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=4
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=3
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=2
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=1,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=2,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=3,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=4,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=5,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=6,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=8,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=9,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=10,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=2
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=3
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=4
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=6
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=11,
+		x=10
+	},
+	{
+		x=6,
+		y=4,
+		class="wired_door",
+		color="red",
+		circuit="wire_6a7be789_0002"
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=3,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=2,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=2,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=3,
+		x=7
+	},
+	{
+		x=11,
+		y=5,
+		class="wired_door",
+		color="red",
+		circuit="wire_6a7c19b9_0002"
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=3,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="red",
+		y=4,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=10
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=7,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=6,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=2,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=10
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=6
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=4
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=3
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=2
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=1,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=2,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=3,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=4,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=5,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=6,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=8,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=9,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=10,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=2
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=3
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=4
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=6
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=11,
+		x=10
+	},
+	{
+		x=6,
+		y=4,
+		class="wired_door",
+		color="green",
+		circuit="wire_6a7be789_0002"
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=3,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=2,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=2,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=3,
+		x=7
+	},
+	{
+		x=11,
+		y=5,
+		class="wired_door",
+		color="green",
+		circuit="wire_6a7c19b9_0002"
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=3,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="green",
+		y=4,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=10
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=7,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=6,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=2,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=10
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=6
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=4
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=3
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=2
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=1,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=2,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=3,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=4,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=5,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=6,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=8,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=9,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=10,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=1
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=2
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=3
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=4
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=6
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=8
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=9
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=11,
+		x=10
+	},
+	{
+		x=6,
+		y=4,
+		class="wired_door",
+		color="blue",
+		circuit="wire_6a7be789_0002"
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=3,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=2,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=2,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=3,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=3,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=2,
+		x=5
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=2,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=3,
+		x=7
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=10,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=9,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=8,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=4,
+		x=2
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=4,
+		x=4
+	},
+	{
+		x=3,
+		y=4,
+		class="wired_door",
+		color="blue",
+		circuit="wire_6a7bec68_0012"
+	},
+	{
+		x=11,
+		y=5,
+		class="wired_door",
+		color="blue",
+		circuit="wire_6a7c19b9_0002"
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=3,
+		x=11
+	},
+	{
+		class="static_wall",
+		color="blue",
+		y=4,
+		x=11
+	},
+	{
+		class="box",
+		color="blue",
+		y=2,
+		x=3
+	},
+	{
+		class="wired_switch",
+		color="blue",
+		y=7,
+		x=3
+	},
+	{
+		class="wired_switch",
+		color="red",
+		y=2,
+		x=6
+	},
+	{
+		class="wired_switch",
+		color="green",
+		y=2,
+		x=6
+	},
+	{
+		class="wired_switch",
+		color="blue",
+		y=7,
+		x=6
+	}
 }
 }
\ No newline at end of file
diff --git a/rooms/room_14_14.sav b/rooms/room_14_14.sav
index 0758234..e2983e1 100644
--- a/rooms/room_14_14.sav
+++ b/rooms/room_14_14.sav
@@ -1,1071 +1,1101 @@
 {
 objects={
 	{
-		color="blue",
-		y=11,
+		x=1,
 		class="static_wall",
-		x=1
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=2,
 		class="static_wall",
-		x=2
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=3,
 		class="static_wall",
-		x=3
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=4,
 		class="static_wall",
-		x=4
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=5,
 		class="static_wall",
-		x=5
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=6,
 		class="static_wall",
-		x=6
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=7,
 		class="static_wall",
-		x=7
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=8,
 		class="static_wall",
-		x=8
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=9,
 		class="static_wall",
-		x=9
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=10,
 		class="static_wall",
-		x=10
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
-		y=11,
+		x=11,
 		class="static_wall",
-		x=11
+		y=11,
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=10,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=9,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=8,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=7,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=5,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=3,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=4,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=3,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
 		y=1,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="blue",
+		x=10,
+		class="static_wall",
 		y=1,
-		class="static_wall",
-		x=10
+		color="red"
 	},
 	{
-		color="blue",
+		x=9,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=9
+		color="red"
 	},
 	{
-		color="blue",
+		x=8,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=8
+		color="red"
 	},
 	{
-		color="blue",
+		x=7,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=7
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=7,
 		class="static_wall",
-		x=7
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=6,
 		class="static_wall",
-		x=6
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=5,
 		class="static_wall",
-		x=5
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=4,
 		class="static_wall",
-		x=4
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=3,
 		class="static_wall",
-		x=3
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=2,
 		class="static_wall",
-		x=2
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=1,
 		class="static_wall",
-		x=1
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=2,
 		class="static_wall",
-		x=2
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=3,
 		class="static_wall",
-		x=3
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=4,
 		class="static_wall",
-		x=4
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=5,
 		class="static_wall",
-		x=5
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=6,
 		class="static_wall",
-		x=6
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=7,
 		class="static_wall",
-		x=7
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=8,
 		class="static_wall",
-		x=8
+		y=1,
+		color="red"
 	},
 	{
-		color="blue",
-		y=1,
+		x=9,
 		class="static_wall",
-		x=9
+		y=1,
+		color="red"
 	},
 	{
 		class="wired_door",
+		color="red",
 		x=11,
-		color="blue",
-		circuit="wire_6a7be918_000b",
-		y=6
-	},
-	{
-		color="blue",
-		y=2,
-		class="static_wall",
-		x=1
-	},
-	{
-		color="blue",
-		y=4,
-		class="box",
-		x=9
-	},
-	{
-		color="blue",
-		y=4,
-		class="box",
-		x=3
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=1
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=2
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=3
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=4
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=5
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=6
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=7
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=8
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=9
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=10
-	},
-	{
-		color="red",
-		y=11,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=10,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=9,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=8,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=7,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=5,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=2,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=3,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=4,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=3,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=2,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=10
-	},
-	{
-		color="red",
-		y=2,
-		class="static_wall",
-		x=9
-	},
-	{
-		color="red",
-		y=2,
-		class="static_wall",
-		x=8
-	},
-	{
-		color="red",
-		y=2,
-		class="static_wall",
-		x=7
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=7
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=6
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=5
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=4
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=3
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=2
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=1
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=2
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=3
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=4
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=5
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=6
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=7
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=8
-	},
-	{
-		color="red",
-		y=1,
-		class="static_wall",
-		x=9
-	},
-	{
-		class="wired_door",
-		x=11,
-		color="red",
-		circuit="wire_6a7be918_000b",
-		y=6
-	},
-	{
-		color="red",
-		y=2,
-		class="static_wall",
-		x=1
-	},
-	{
-		color="red",
 		y=6,
-		class="box_1x2_1-1",
-		x=6
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		color="green",
-		y=11,
+		x=1,
 		class="static_wall",
-		x=1
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=2
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=3
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=4
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=5
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=6
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=7
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=8
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=9
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=10
-	},
-	{
-		color="green",
-		y=11,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="green",
-		y=10,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="green",
-		y=9,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="green",
-		y=8,
-		class="static_wall",
-		x=11
-	},
-	{
-		color="green",
 		y=7,
-		class="static_wall",
-		x=11
+		color="red"
 	},
 	{
-		color="green",
+		x=1,
+		class="static_wall",
+		y=6,
+		color="red"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=2,
+		color="red"
+	},
+	{
+		x=6,
+		class="box_1x2_1-1",
+		y=6,
+		color="red"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=2,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=3,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=4,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=5,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=6,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=7,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=8,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=9,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=10,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=11,
+		color="green"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=10,
+		color="green"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=9,
+		color="green"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=8,
+		color="green"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=7,
+		color="green"
+	},
+	{
+		x=11,
+		class="static_wall",
 		y=5,
-		class="static_wall",
-		x=11
+		color="green"
 	},
 	{
-		color="green",
+		x=11,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=11
+		color="green"
 	},
 	{
-		color="green",
+		x=11,
+		class="static_wall",
 		y=3,
-		class="static_wall",
-		x=11
+		color="green"
 	},
 	{
-		color="green",
+		x=11,
+		class="static_wall",
 		y=4,
-		class="static_wall",
-		x=11
+		color="green"
 	},
 	{
-		color="green",
+		x=11,
+		class="static_wall",
 		y=3,
-		class="static_wall",
-		x=11
+		color="green"
 	},
 	{
-		color="green",
+		x=11,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=11
+		color="green"
 	},
 	{
-		color="green",
+		x=11,
+		class="static_wall",
 		y=1,
-		class="static_wall",
-		x=11
+		color="green"
 	},
 	{
-		color="green",
+		x=10,
+		class="static_wall",
 		y=1,
-		class="static_wall",
-		x=10
+		color="green"
 	},
 	{
-		color="green",
+		x=9,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=9
+		color="green"
 	},
 	{
-		color="green",
+		x=8,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=8
+		color="green"
 	},
 	{
-		color="green",
+		x=7,
+		class="static_wall",
 		y=2,
-		class="static_wall",
-		x=7
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=7,
 		class="static_wall",
-		x=7
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=6,
 		class="static_wall",
-		x=6
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=5,
 		class="static_wall",
-		x=5
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=4,
 		class="static_wall",
-		x=4
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=3,
 		class="static_wall",
-		x=3
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=2,
 		class="static_wall",
-		x=2
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=1,
 		class="static_wall",
-		x=1
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=2,
 		class="static_wall",
-		x=2
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=3,
 		class="static_wall",
-		x=3
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=4,
 		class="static_wall",
-		x=4
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=5,
 		class="static_wall",
-		x=5
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=6,
 		class="static_wall",
-		x=6
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=7,
 		class="static_wall",
-		x=7
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=8,
 		class="static_wall",
-		x=8
+		y=1,
+		color="green"
 	},
 	{
-		color="green",
-		y=1,
+		x=9,
 		class="static_wall",
-		x=9
+		y=1,
+		color="green"
 	},
 	{
 		class="wired_door",
+		color="green",
 		x=11,
-		color="green",
-		circuit="wire_6a7be918_000b",
-		y=6
-	},
-	{
-		color="green",
-		y=2,
-		class="static_wall",
-		x=1
-	},
-	{
-		color="green",
 		y=6,
+		circuit="wire_6a7be918_000b"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=7,
+		color="green"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=6,
+		color="green"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=2,
+		color="green"
+	},
+	{
+		x=6,
 		class="box_1x2_1-1",
-		x=6
+		y=6,
+		color="green"
 	},
 	{
-		color="red",
+		x=1,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=2,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=3,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=4,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=5,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=6,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=7,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=8,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=9,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=10,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=11,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=10,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=9,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
 		y=8,
-		class="wired_switch",
-		x=6
+		color="blue"
 	},
 	{
-		color="blue",
+		x=11,
+		class="static_wall",
+		y=7,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=5,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=2,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=3,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
 		y=4,
-		class="wired_switch",
-		x=9
+		color="blue"
 	},
 	{
+		x=11,
+		class="static_wall",
+		y=3,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=2,
+		color="blue"
+	},
+	{
+		x=11,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=10,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=9,
+		class="static_wall",
+		y=2,
+		color="blue"
+	},
+	{
+		x=8,
+		class="static_wall",
+		y=2,
+		color="blue"
+	},
+	{
+		x=7,
+		class="static_wall",
+		y=2,
+		color="blue"
+	},
+	{
+		x=7,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=6,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=5,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=4,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=3,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=2,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=2,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=3,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=4,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=5,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=6,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=7,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=8,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		x=9,
+		class="static_wall",
+		y=1,
+		color="blue"
+	},
+	{
+		class="wired_door",
 		color="blue",
-		y=4,
-		class="wired_switch",
-		x=3
+		x=11,
+		y=6,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		color="green",
+		x=1,
+		class="static_wall",
+		y=7,
+		color="blue"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=6,
+		color="blue"
+	},
+	{
+		x=1,
+		class="static_wall",
+		y=2,
+		color="blue"
+	},
+	{
+		x=9,
+		class="box",
+		y=4,
+		color="blue"
+	},
+	{
+		x=3,
+		class="box",
+		y=4,
+		color="blue"
+	},
+	{
+		x=6,
+		class="wired_switch",
 		y=8,
+		color="red"
+	},
+	{
+		x=9,
 		class="wired_switch",
-		x=6
+		y=4,
+		color="blue"
+	},
+	{
+		x=3,
+		class="wired_switch",
+		y=4,
+		color="blue"
 	}
 },
 wires={
 	{
-		y=4,
 		edges=0,
-		circuit="wire_6a7c1868_0003",
-		x=3
+		x=3,
+		y=4,
+		circuit="wire_6a7c1868_0003"
 	},
 	{
-		y=4,
 		edges=2,
-		circuit="wire_6a7c1890_0006",
-		x=3
+		x=3,
+		y=4,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=4,
 		edges=10,
-		circuit="wire_6a7c1890_0006",
-		x=4
+		x=4,
+		y=4,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=4,
 		edges=10,
-		circuit="wire_6a7c1890_0006",
-		x=5
+		x=5,
+		y=4,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=4,
 		edges=10,
-		circuit="wire_6a7c1890_0006",
-		x=6
+		x=6,
+		y=4,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=4,
 		edges=12,
-		circuit="wire_6a7c1890_0006",
-		x=7
-	},
-	{
+		x=7,
 		y=4,
+		circuit="wire_6a7c1890_0006"
+	},
+	{
 		edges=4,
-		circuit="wire_6a7c1873_0004",
-		x=9
+		x=9,
+		y=4,
+		circuit="wire_6a7c1873_0004"
 	},
 	{
-		y=5,
 		edges=5,
-		circuit="wire_6a7c1890_0006",
-		x=7
-	},
-	{
+		x=7,
 		y=5,
-		edges=5,
-		circuit="wire_6a7c1873_0004",
-		x=9
+		circuit="wire_6a7c1890_0006"
+	},
+	{
+		edges=5,
+		x=9,
+		y=5,
+		circuit="wire_6a7c1873_0004"
 	},
 	{
-		y=6,
 		edges=3,
-		circuit="wire_6a7c1890_0006",
-		x=7
+		x=7,
+		y=6,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=6,
 		edges=10,
-		circuit="wire_6a7c1890_0006",
-		x=8
+		x=8,
+		y=6,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=6,
 		edges=6,
-		circuit="wire_6a7be918_000b",
-		x=9
+		x=9,
+		y=6,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=6,
 		edges=3,
-		circuit="wire_6a7c1873_0004",
-		x=9
+		x=9,
+		y=6,
+		circuit="wire_6a7c1873_0004"
 	},
 	{
-		y=6,
 		edges=10,
-		circuit="wire_6a7c1890_0006",
-		x=9
+		x=9,
+		y=6,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=6,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=10
+		x=10,
+		y=6,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=6,
 		edges=10,
-		circuit="wire_6a7c1873_0004",
-		x=10
+		x=10,
+		y=6,
+		circuit="wire_6a7c1873_0004"
 	},
 	{
-		y=6,
 		edges=10,
-		circuit="wire_6a7c1890_0006",
-		x=10
+		x=10,
+		y=6,
+		circuit="wire_6a7c1890_0006"
 	},
 	{
-		y=6,
 		edges=8,
-		circuit="wire_6a7be918_000b",
-		x=11
+		x=11,
+		y=6,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=6,
 		edges=8,
-		circuit="wire_6a7c1873_0004",
-		x=11
+		x=11,
+		y=6,
+		circuit="wire_6a7c1873_0004"
 	},
 	{
-		y=6,
 		edges=0,
-		circuit="wire_6a7c1875_0005",
-		x=11
-	},
-	{
+		x=11,
 		y=6,
-		edges=8,
-		circuit="wire_6a7c1890_0006",
-		x=11
+		circuit="wire_6a7c1875_0005"
 	},
 	{
+		edges=8,
+		x=11,
+		y=6,
+		circuit="wire_6a7c1890_0006"
+	},
+	{
+		edges=5,
+		x=9,
 		y=7,
-		edges=5,
-		circuit="wire_6a7be918_000b",
-		x=9
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=8,
 		edges=10,
-		circuit="wire_6a7bec68_0012",
-		x=1
+		x=1,
+		y=8,
+		circuit="wire_6a7bec68_0012"
 	},
 	{
-		y=8,
 		edges=10,
-		circuit="wire_6a7bec68_0012",
-		x=2
+		x=2,
+		y=8,
+		circuit="wire_6a7bec68_0012"
 	},
 	{
-		y=8,
 		edges=10,
-		circuit="wire_6a7bec68_0012",
-		x=3
+		x=3,
+		y=8,
+		circuit="wire_6a7bec68_0012"
 	},
 	{
-		y=8,
 		edges=10,
-		circuit="wire_6a7bec68_0012",
-		x=4
+		x=4,
+		y=8,
+		circuit="wire_6a7bec68_0012"
 	},
 	{
-		y=8,
 		edges=10,
-		circuit="wire_6a7bec68_0012",
-		x=5
+		x=5,
+		y=8,
+		circuit="wire_6a7bec68_0012"
 	},
 	{
-		y=8,
 		edges=0,
-		circuit="wire_6a7be8d1_000a",
-		x=6
+		x=6,
+		y=8,
+		circuit="wire_6a7be8d1_000a"
 	},
 	{
-		y=8,
 		edges=8,
-		circuit="wire_6a7bec68_0012",
-		x=6
+		x=6,
+		y=8,
+		circuit="wire_6a7bec68_0012"
 	},
 	{
-		y=8,
 		edges=6,
-		circuit="wire_6a7be918_000b",
-		x=8
-	},
-	{
+		x=8,
 		y=8,
-		edges=9,
-		circuit="wire_6a7be918_000b",
-		x=9
+		circuit="wire_6a7be918_000b"
+	},
+	{
+		edges=9,
+		x=9,
+		y=8,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=9,
 		edges=5,
-		circuit="wire_6a7be918_000b",
-		x=8
+		x=8,
+		y=9,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=1
+		x=1,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=2
+		x=2,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=3
+		x=3,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=4
+		x=4,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=5
+		x=5,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=6
+		x=6,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=10,
-		circuit="wire_6a7be918_000b",
-		x=7
+		x=7,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	},
 	{
-		y=10,
 		edges=9,
-		circuit="wire_6a7be918_000b",
-		x=8
+		x=8,
+		y=10,
+		circuit="wire_6a7be918_000b"
 	}
 }
 }
\ No newline at end of file
diff --git a/rooms/world.sav b/rooms/world.sav
index 179ea67..8e8a5c4 100644
--- a/rooms/world.sav
+++ b/rooms/world.sav
@@ -1,257 +1,252 @@
 {
-height=18,
 rooms={
 	{
-		x=10,
 		name="3",
-		y=10
+		y=10,
+		x=10
 	},
 	{
-		x=12,
 		name="5",
-		y=10
+		y=10,
+		x=12
 	},
 	{
-		x=12,
 		name="village_1",
-		y=9
+		y=9,
+		x=12
 	},
 	{
-		x=11,
 		name="village_4",
-		y=8
+		y=8,
+		x=11
 	},
 	{
-		x=11,
 		name="yellow_1",
-		y=7
+		y=7,
+		x=11
 	},
 	{
-		x=11,
 		name="yellow_3",
-		y=6
+		y=6,
+		x=11
 	},
 	{
-		x=12,
 		name="yellow_2",
-		y=7
+		y=7,
+		x=12
 	},
 	{
-		x=11,
 		name="yellow_4",
-		y=5
+		y=5,
+		x=11
 	},
 	{
-		x=11,
 		name="yellow_5",
-		y=4
+		y=4,
+		x=11
 	},
 	{
-		x=10,
 		name="yellow_6",
-		y=5
+		y=5,
+		x=10
 	},
 	{
-		x=1,
 		name="default",
-		y=1
+		y=1,
+		x=1
 	},
 	{
-		x=3,
 		name="old_yellow_3",
-		y=1
+		y=1,
+		x=3
 	},
 	{
-		x=5,
 		name="test_patt",
-		y=1
+		y=1,
+		x=5
 	},
 	{
-		x=7,
 		name="test_patt_update",
-		y=1
+		y=1,
+		x=7
 	},
 	{
-		x=9,
 		name="white_asymmetrical",
-		y=1
+		y=1,
+		x=9
 	},
 	{
-		x=11,
 		name="white_ok",
-		y=1
+		y=1,
+		x=11
 	},
 	{
-		x=13,
 		name="white_primary",
-		y=1
+		y=1,
+		x=13
 	},
 	{
-		x=15,
 		name="yellow_arches",
-		y=1
+		y=1,
+		x=15
 	},
 	{
-		x=17,
 		name="yellow_asymmetrical",
-		y=1
+		y=1,
+		x=17
 	},
 	{
-		x=1,
 		name="yellow_cc_moustache",
-		y=3
+		y=3,
+		x=1
 	},
 	{
-		x=3,
 		name="yellow_color_changing_levvel_1",
-		y=3
+		y=3,
+		x=3
 	},
 	{
-		x=7,
 		name="yellow_smile",
-		y=3
+		y=3,
+		x=7
 	},
 	{
-		x=9,
 		name="2",
-		y=10
+		y=10,
+		x=9
 	},
 	{
-		x=11,
 		name="room_11_09",
-		y=9
+		y=9,
+		x=11
 	},
 	{
-		x=9,
 		name="yellow_skull",
-		y=3
+		y=3,
+		x=9
 	},
 	{
-		x=5,
 		name="jorge_room",
-		y=5
+		y=5,
+		x=5
 	},
 	{
-		x=11,
 		name="4",
-		y=10
+		y=10,
+		x=11
 	},
 	{
-		x=1,
 		name="room_01_05",
-		y=5
+		y=5,
+		x=1
 	},
 	{
-		x=2,
 		name="ok",
-		y=8
+		y=8,
+		x=2
 	},
 	{
-		x=5,
 		name="room_05_18",
-		y=18
+		y=18,
+		x=5
 	},
 	{
-		x=9,
 		name="village_start",
-		y=11
+		y=11,
+		x=9
 	},
 	{
-		x=4,
 		name="spiky_test",
-		y=8
+		y=8,
+		x=4
 	},
 	{
-		x=5,
 		name="corner_trimino_test",
-		y=7
+		y=7,
+		x=5
 	},
 	{
-		x=6,
 		name="tetromino_loop_t",
-		y=7
+		y=7,
+		x=6
 	},
 	{
-		x=5,
 		name="corner_trimino_test_copy",
-		y=6
+		y=6,
+		x=5
 	},
 	{
-		x=7,
 		name="blocker_test",
-		y=7
+		y=7,
+		x=7
 	},
 	{
-		x=5,
 		name="spiky_test_2",
-		y=8
+		y=8,
+		x=5
 	},
 	{
-		x=5,
 		name="spiky_test_3",
-		y=9
+		y=9,
+		x=5
 	},
 	{
-		x=3,
 		name="jorge2",
-		y=14
+		y=14,
+		x=3
 	},
 	{
-		x=8,
 		name="room_08_07",
-		y=7
+		y=7,
+		x=8
 	},
 	{
-		x=13,
 		name="village_3",
-		y=8
+		y=8,
+		x=13
 	},
 	{
-		x=12,
 		name="village_2",
-		y=8
+		y=8,
+		x=12
 	},
 	{
-		x=14,
 		name="room_14_07",
-		y=7
+		y=7,
+		x=14
 	},
 	{
-		x=9,
 		name="room_09_13",
-		y=13
+		y=13,
+		x=9
 	},
 	{
-		x=8,
 		name="room_08_13",
-		y=13
+		y=13,
+		x=8
 	},
 	{
-		x=9,
 		name="room_10_15",
-		y=15
+		y=15,
+		x=9
 	},
 	{
-		x=13,
 		name="room_13_14",
-		y=14
+		y=14,
+		x=13
 	},
 	{
-		x=14,
 		name="room_14_14",
-		y=14
+		y=14,
+		x=14
 	},
 	{
-		x=13,
 		name="room_13_13",
-		y=13
-	},
-	{
-		x=12,
-		name="room_12_14",
-		y=14
+		y=13,
+		x=13
 	}
 },
-lastRoom="room_13_14",
-width=18
+lastRoom="room_14_14",
+width=18,
+height=18
 }
\ No newline at end of file
diff --git a/wired_door.lua b/wired_door.lua
index c137247..b780e14 100644
--- a/wired_door.lua
+++ b/wired_door.lua
@@ -1,5 +1,7 @@
 require "door"
 
+local Wire = require "wire"
+
 WiredDoor = class("WiredDoor", Door)
 
 function WiredDoor:initialize(x, y, color, circuitId)
@@ -16,3 +18,13 @@ function WiredDoor:setPowered(powered, canClose)
 	end
 	self:refreshSprites()
 end
+
+function WiredDoor:draw(channel)
+	Entity.draw(self, channel)
+	if not self.sprites[channel] then return end
+	local p = self:getDrawPos()
+	local color = Wire.color(self.circuitId)
+	love.graphics.setColor(color[1], color[2], color[3], 1)
+	love.graphics.setLineWidth(math.max(1, drawScale))
+	love.graphics.circle("line", p.x + 8 * drawScale, p.y + 8 * drawScale, 3 * drawScale)
+end
diff --git a/wired_switch.lua b/wired_switch.lua
index e98d088..cc8030d 100644
--- a/wired_switch.lua
+++ b/wired_switch.lua
@@ -6,3 +6,12 @@ function WiredSwitch:initialize(x, y, color)
 	Switch.initialize(self, x, y, color)
 	self.wired = true
 end
+
+function WiredSwitch:draw(channel)
+	Entity.draw(self, channel)
+	if not self.sprites[channel] then return end
+	local p = self:getDrawPos()
+	love.graphics.setColor(1, 1, 1, 0.9)
+	love.graphics.setLineWidth(math.max(1, drawScale))
+	love.graphics.rectangle("line", p.x + 5 * drawScale, p.y + 5 * drawScale, 6 * drawScale, 6 * drawScale)
+end