diff --git a/changelog.txt b/changelog.txt
index a43a829..fece58d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+2017-05-11:
+Added Screwdriver mod from Minetest_game.
+
 2017-05-06:
 Added more nodes to the spawn mod.
 Added vending machines.
diff --git a/concept art/Ship_Computer_GUI.png b/concept art/Ship_Computer_GUI.png
new file mode 100644
index 0000000..fcc665d
Binary files /dev/null and b/concept art/Ship_Computer_GUI.png differ
diff --git a/license.txt b/license.txt
index a953a24..2aeed7c 100644
--- a/license.txt
+++ b/license.txt
@@ -22,6 +22,14 @@ Metals:
    Media
       Nathan Salapat (CC BY-SA 3.0)
 
+Screwdriver:
+    Code
+        GNU Lesser General Public License, version 2.1
+        Copyright (C) 2013-2016 RealBadAngel, Maciej Kasatkin
+        Copyright (C) 2013-2016 Various Minetest developers and contributors
+    Media
+        Gambit (CC BY-SA 3.0)
+
 Spawn:
    Code
       Nathan Salapat (LGPL 2.1)
diff --git a/mods/screwdriver/README.txt b/mods/screwdriver/README.txt
new file mode 100644
index 0000000..9d39c58
--- /dev/null
+++ b/mods/screwdriver/README.txt
@@ -0,0 +1,13 @@
+Minetest Game mod: screwdriver
+==============================
+See license.txt for license information.
+
+License of source code
+----------------------
+Originally by RealBadAngel, Maciej Kasatkin (LGPL 2.1)
+Various Minetest developers and contributors (LGPL 2.1)
+
+License of media (textures)
+---------------------------
+Created by Gambit (CC BY-SA 3.0):
+  screwdriver.png
diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua
new file mode 100644
index 0000000..ced6b1f
--- /dev/null
+++ b/mods/screwdriver/init.lua
@@ -0,0 +1,170 @@
+screwdriver = {}
+
+screwdriver.ROTATE_FACE = 1
+screwdriver.ROTATE_AXIS = 2
+screwdriver.disallow = function(pos, node, user, mode, new_param2)
+	return false
+end
+screwdriver.rotate_simple = function(pos, node, user, mode, new_param2)
+	if mode ~= screwdriver.ROTATE_FACE then
+		return false
+	end
+end
+
+-- For attached wallmounted nodes: returns true if rotation is valid
+-- simplified version of minetest:builtin/game/falling.lua#L148.
+local function check_attached_node(pos, rotation)
+	local d = minetest.wallmounted_to_dir(rotation)
+	local p2 = vector.add(pos, d)
+	local n = minetest.get_node(p2).name
+	local def2 = minetest.registered_nodes[n]
+	if def2 and not def2.walkable then
+		return false
+	end
+	return true
+end
+
+screwdriver.rotate = {}
+
+local facedir_tbl = {
+	[screwdriver.ROTATE_FACE] = {
+		[0] = 1, [1] = 2, [2] = 3, [3] = 0,
+		[4] = 5, [5] = 6, [6] = 7, [7] = 4,
+		[8] = 9, [9] = 10, [10] = 11, [11] = 8,
+		[12] = 13, [13] = 14, [14] = 15, [15] = 12,
+		[16] = 17, [17] = 18, [18] = 19, [19] = 16,
+		[20] = 21, [21] = 22, [22] = 23, [23] = 20,
+	},
+	[screwdriver.ROTATE_AXIS] = {
+		[0] = 4, [1] = 4, [2] = 4, [3] = 4,
+		[4] = 8, [5] = 8, [6] = 8, [7] = 8,
+		[8] = 12, [9] = 12, [10] = 12, [11] = 12,
+		[12] = 16, [13] = 16, [14] = 16, [15] = 16,
+		[16] = 20, [17] = 20, [18] = 20, [19] = 20,
+		[20] = 0, [21] = 0, [22] = 0, [23] = 0,
+	},
+}
+
+screwdriver.rotate.facedir = function(pos, node, mode)
+	local rotation = node.param2 % 32 -- get first 5 bits
+	local other = node.param2 - rotation
+	rotation = facedir_tbl[mode][rotation] or 0
+	return rotation + other
+end
+
+screwdriver.rotate.colorfacedir = screwdriver.rotate.facedir
+
+local wallmounted_tbl = {
+	[screwdriver.ROTATE_FACE] = {[2] = 5, [3] = 4, [4] = 2, [5] = 3, [1] = 0, [0] = 1},
+	[screwdriver.ROTATE_AXIS] = {[2] = 5, [3] = 4, [4] = 2, [5] = 1, [1] = 0, [0] = 3}
+}
+
+screwdriver.rotate.wallmounted = function(pos, node, mode)
+	local rotation = node.param2 % 8 -- get first 3 bits
+	local other = node.param2 - rotation
+	rotation = wallmounted_tbl[mode][rotation] or 0
+	if minetest.get_item_group(node.name, "attached_node") ~= 0 then
+		-- find an acceptable orientation
+		for i = 1, 5 do
+			if not check_attached_node(pos, rotation) then
+				rotation = wallmounted_tbl[mode][rotation] or 0
+			else
+				break
+			end
+		end
+	end
+	return rotation + other
+end
+
+screwdriver.rotate.colorwallmounted = screwdriver.rotate.wallmounted
+
+-- Handles rotation
+screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses)
+	if pointed_thing.type ~= "node" then
+		return
+	end
+
+	local pos = pointed_thing.under
+
+	if minetest.is_protected(pos, user:get_player_name()) then
+		minetest.record_protection_violation(pos, user:get_player_name())
+		return
+	end
+
+	local node = minetest.get_node(pos)
+	local ndef = minetest.registered_nodes[node.name]
+	if not ndef then
+		return itemstack
+	end
+	-- can we rotate this paramtype2?
+	local fn = screwdriver.rotate[ndef.paramtype2]
+	if not fn and not ndef.on_rotate then
+		return itemstack
+	end
+
+	local should_rotate = true
+	local new_param2
+	if fn then
+		new_param2 = fn(pos, node, mode)
+	else
+		new_param2 = node.param2
+	end
+
+	-- Node provides a handler, so let the handler decide instead if the node can be rotated
+	if ndef.on_rotate then
+		-- Copy pos and node because callback can modify it
+		local result = ndef.on_rotate(vector.new(pos),
+				{name = node.name, param1 = node.param1, param2 = node.param2},
+				user, mode, new_param2)
+		if result == false then -- Disallow rotation
+			return itemstack
+		elseif result == true then
+			should_rotate = false
+		end
+	elseif ndef.on_rotate == false then
+		return itemstack
+	elseif ndef.can_dig and not ndef.can_dig(pos, user) then
+		return itemstack
+	end
+
+	if should_rotate and new_param2 ~= node.param2 then
+		node.param2 = new_param2
+		minetest.swap_node(pos, node)
+		minetest.check_for_falling(pos)
+	end
+
+	if not (creative and creative.is_enabled_for
+			and creative.is_enabled_for(user:get_player_name())) then
+		itemstack:add_wear(65535 / ((uses or 200) - 1))
+	end
+
+	return itemstack
+end
+
+-- Screwdriver
+minetest.register_tool("screwdriver:screwdriver", {
+	description = "Screwdriver (left-click rotates face, right-click rotates axis)",
+	inventory_image = "screwdriver.png",
+	on_use = function(itemstack, user, pointed_thing)
+		screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_FACE, 200)
+		return itemstack
+	end,
+	on_place = function(itemstack, user, pointed_thing)
+		screwdriver.handler(itemstack, user, pointed_thing, screwdriver.ROTATE_AXIS, 200)
+		return itemstack
+	end,
+})
+
+
+--[[minetest.register_craft({
+	output = "screwdriver:screwdriver",
+	recipe = {
+		{"default:steel_ingot"},
+		{"group:stick"}
+	}
+})
+--]]
+minetest.register_alias("screwdriver:screwdriver1", "screwdriver:screwdriver")
+minetest.register_alias("screwdriver:screwdriver2", "screwdriver:screwdriver")
+minetest.register_alias("screwdriver:screwdriver3", "screwdriver:screwdriver")
+minetest.register_alias("screwdriver:screwdriver4", "screwdriver:screwdriver")
diff --git a/mods/screwdriver/license.txt b/mods/screwdriver/license.txt
new file mode 100644
index 0000000..d9b721b
--- /dev/null
+++ b/mods/screwdriver/license.txt
@@ -0,0 +1,50 @@
+License of source code
+----------------------
+
+GNU Lesser General Public License, version 2.1
+Copyright (C) 2013-2016 RealBadAngel, Maciej Kasatkin
+Copyright (C) 2013-2016 Various Minetest developers and contributors
+
+This program is free software; you can redistribute it and/or modify it under the terms
+of the GNU Lesser General Public License as published by the Free Software Foundation;
+either version 2.1 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Lesser General Public License for more details:
+https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
+
+
+Licenses of media (textures)
+----------------------------
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+Copyright (C) 2013-2016 Gambit
+
+You are free to:
+Share — copy and redistribute the material in any medium or format.
+Adapt — remix, transform, and build upon the material for any purpose, even commercially.
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+Under the following terms:
+
+Attribution — You must give appropriate credit, provide a link to the license, and
+indicate if changes were made. You may do so in any reasonable manner, but not in any way
+that suggests the licensor endorses you or your use.
+
+ShareAlike — If you remix, transform, or build upon the material, you must distribute
+your contributions under the same license as the original.
+
+No additional restrictions — You may not apply legal terms or technological measures that
+legally restrict others from doing anything the license permits.
+
+Notices:
+
+You do not have to comply with the license for elements of the material in the public
+domain or where your use is permitted by an applicable exception or limitation.
+No warranties are given. The license may not give you all of the permissions necessary
+for your intended use. For example, other rights such as publicity, privacy, or moral
+rights may limit how you use the material.
+
+For more details:
+http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/mods/screwdriver/textures/screwdriver.png b/mods/screwdriver/textures/screwdriver.png
new file mode 100644
index 0000000..b2a56d5
Binary files /dev/null and b/mods/screwdriver/textures/screwdriver.png differ
diff --git a/mods/spawn/Blends/SpaceShip.blend b/mods/spawn/Blends/SpaceShip.blend
index f5f8940..c283015 100644
Binary files a/mods/spawn/Blends/SpaceShip.blend and b/mods/spawn/Blends/SpaceShip.blend differ
diff --git a/mods/spawn/Blends/SpaceShip.blend1 b/mods/spawn/Blends/SpaceShip.blend1
new file mode 100644
index 0000000..5c7e266
Binary files /dev/null and b/mods/spawn/Blends/SpaceShip.blend1 differ
diff --git a/mods/spawn/computer.lua b/mods/spawn/computer.lua
new file mode 100644
index 0000000..10350a8
--- /dev/null
+++ b/mods/spawn/computer.lua
@@ -0,0 +1,54 @@
+form_base =
+   'size[8,8;]'..
+   'bgcolor[#ffffff00;true]'..
+   'button[0,0;2,1;status;Status]'..
+   'button[2,0;2,1;log;Log]'..
+   'button[4,0;2,1;map;Map]'..
+   'button[6,0;2,1;home;Home]'
+
+wall_computer_home =
+   form_base..
+   'background[0,0;8,8;spawn_comp_home.png;true]'..
+   'label[4,4;This is the home screen.]'
+
+wall_computer_log =
+   form_base..
+   'background[0,0;8,8;spawn_comp_log.png;true]'..
+   'textarea[1,3.5;7,2;;You do not have sufficent privileges on this ship to view this inforamtion. This has been logged and reported to the authorities.;]'..
+   'textarea[1,5;7,2;;If you feel this is an error please speak to the Captian or First mate.;]'
+
+wall_computer_map =
+   form_base..
+   'background[0,0;8,8;spawn_comp_map.png;true]'..
+   'label[0,2.5;Level 1]'..
+   'label[0,5.2;Level 2]'..
+   'label[0,7.75;Level 3]'
+
+wall_computer_status =
+   form_base..
+   'background[0,0;8,8;spawn_comp_status.png;true]'..
+   'label[4,4;This is the status screen.]'
+
+
+
+minetest.register_node('spawn:wall_computer', {
+   description = 'Spaceship computer',
+   tiles = {'spawn_wall.png'},
+   groups = {spawn=1},
+   on_construct = function(pos)
+      local meta = minetest.get_meta(pos)
+      meta:set_string('formspec', wall_computer_home)
+   end,
+   on_receive_fields = function(pos, formname, fields, sender)
+      local meta = minetest.get_meta(pos)
+      if fields['status'] then
+         meta:set_string('formspec', wall_computer_status)
+      elseif fields ['log'] then
+         meta:set_string('formspec', wall_computer_log)
+      elseif fields ['map'] then
+         meta:set_string('formspec', wall_computer_map)
+      elseif fields ['home'] then
+         meta:set_string('formspec', wall_computer_home)
+      end
+   end,
+})
diff --git a/mods/spawn/floors.lua b/mods/spawn/floors.lua
index 01d23cf..826eab5 100644
--- a/mods/spawn/floors.lua
+++ b/mods/spawn/floors.lua
@@ -54,7 +54,7 @@ minetest.register_node('spawn:floor', {
    selection_box = colbox_floor,
    collision_box = colbox_floor,
    tiles = {'spawn_floor_blank.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 minetest.register_node('spawn:ramp1', {
@@ -67,7 +67,7 @@ minetest.register_node('spawn:ramp1', {
    selection_box = colbox_ramp_1,
    collision_box = colbox_ramp_1,
    tiles = {'spawn_floor_blank.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 minetest.register_node('spawn:ramp2', {
@@ -80,7 +80,7 @@ minetest.register_node('spawn:ramp2', {
    selection_box = colbox_ramp_2,
    collision_box = colbox_ramp_2,
    tiles = {'spawn_floor_blank.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 minetest.register_node('spawn:stairs', {
@@ -92,7 +92,7 @@ minetest.register_node('spawn:stairs', {
    selection_box = colbox_ramp_2,
    collision_box = colbox_ramp_2,
    tiles = {'spawn_rail_blank.png', 'spawn_floor_blank.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 for i in ipairs (ship_parts_colors) do
@@ -129,7 +129,7 @@ for i in ipairs (ship_parts_colors) do
          selection_box = colbox,
          collision_box = colbox,
          tiles = {'spawn_floor_blank.png^'..tex, 'spawn_floor_blank.png'},
-         groups = {oddly_breakable_by_hand=3}
+         groups = {spawn=1}
       })
    end
 end
diff --git a/mods/spawn/init.lua b/mods/spawn/init.lua
index da1c8ee..9153272 100644
--- a/mods/spawn/init.lua
+++ b/mods/spawn/init.lua
@@ -12,3 +12,4 @@ dofile(minetest.get_modpath('spawn')..'/rails.lua')
 dofile(minetest.get_modpath('spawn')..'/objects.lua')
 dofile(minetest.get_modpath('spawn')..'/walls.lua')
 dofile(minetest.get_modpath('spawn')..'/vending_machine.lua')
+dofile(minetest.get_modpath('spawn')..'/computer.lua')
diff --git a/mods/spawn/models/spawn_window-panel.obj b/mods/spawn/models/spawn_window-panel.obj
deleted file mode 100644
index 8fdc0f5..0000000
--- a/mods/spawn/models/spawn_window-panel.obj
+++ /dev/null
@@ -1,45 +0,0 @@
-# Blender v2.77 (sub 1) OBJ File: 'SpaceShip.blend'
-# www.blender.org
-o WindowPanel_Cube.008
-v -0.500000 -0.500000 0.100000
-v -0.500000 0.500000 0.100000
-v -0.500000 -0.500000 0.000000
-v -0.500000 0.500000 0.000000
-v 0.500000 -0.500000 0.100000
-v 0.500000 0.500000 0.100000
-v 0.500000 -0.500000 0.000000
-v 0.500000 0.500000 0.000000
-vt 0.1000 0.0000
-vt 0.1000 1.0000
-vt 0.0000 1.0000
-vt 0.0000 0.0000
-vt 0.0001 0.9999
-vt 0.0001 0.0001
-vt 0.9999 0.0001
-vt 0.9999 0.9999
-vt 0.1000 0.0000
-vt 0.1000 1.0000
-vt 0.0000 1.0000
-vt 0.0000 0.0000
-vt 0.0000 0.0000
-vt 0.0000 0.0000
-vt 0.0000 0.0000
-vt 1.0000 0.0000
-vt 1.0000 0.1000
-vt 0.0000 0.1000
-vt 1.0000 0.1000
-vt 0.0000 0.1000
-vt 1.0000 0.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-s off
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/5/2 4/6/2 8/7/2 7/8/2
-f 7/9/3 8/10/3 6/11/3 5/12/3
-f 5/12/4 6/13/4 2/14/4 1/15/4
-f 3/4/5 7/16/5 5/17/5 1/18/5
-f 8/19/6 4/20/6 2/14/6 6/21/6
diff --git a/mods/spawn/models/spawn_window_corner.obj b/mods/spawn/models/spawn_window_corner.obj
index 07c54ad..6f9fbab 100644
--- a/mods/spawn/models/spawn_window_corner.obj
+++ b/mods/spawn/models/spawn_window_corner.obj
@@ -1,18 +1,18 @@
 # Blender v2.78 (sub 5) OBJ File: 'SpaceShip.blend'
 # www.blender.org
 o WindowCorner_BL_Cube.005
-v 0.500000 0.500000 0.000000
+v 0.500000 0.500000 -0.050000
 v 0.500000 0.500000 0.500000
-v -0.500000 -0.500000 -0.000000
+v -0.500000 -0.500000 -0.050000
 v 0.500000 0.500000 -0.500000
 v -0.500000 -0.500000 0.500000
 v 0.500000 -0.500000 0.500000
 v -0.500000 -0.500000 -0.500000
 v 0.500000 -0.500000 -0.500000
-v -0.500000 0.500000 -0.000000
-v -0.500000 0.500000 0.100000
-v -0.500000 -0.500000 0.100000
-v 0.500000 0.500000 0.100000
+v -0.500000 0.500000 -0.050000
+v -0.500000 0.500000 0.050000
+v -0.500000 -0.500000 0.050000
+v 0.500000 0.500000 0.050000
 vt 0.000000 0.006923
 vt 0.995213 1.000000
 vt 0.000000 1.000000
diff --git a/mods/spawn/models/spawn_window_panel.obj b/mods/spawn/models/spawn_window_panel.obj
new file mode 100644
index 0000000..15db573
--- /dev/null
+++ b/mods/spawn/models/spawn_window_panel.obj
@@ -0,0 +1,46 @@
+# Blender v2.78 (sub 5) OBJ File: 'SpaceShip.blend'
+# www.blender.org
+o WindowPanel_Cube.008
+v -0.500000 -0.500000 0.050000
+v -0.500000 0.500000 0.050000
+v -0.500000 -0.500000 -0.050000
+v -0.500000 0.500000 -0.050000
+v 0.500000 -0.500000 0.050000
+v 0.500000 0.500000 0.050000
+v 0.500000 -0.500000 -0.050000
+v 0.500000 0.500000 -0.050000
+vt 0.100026 0.000032
+vt 0.100025 0.999968
+vt 0.000032 0.999968
+vt 0.000032 0.000032
+vt 0.000100 0.999900
+vt 0.000100 0.000100
+vt 0.999900 0.000100
+vt 0.999900 0.999900
+vt 0.100026 0.000032
+vt 0.100025 0.999968
+vt 0.000032 0.999968
+vt 0.000032 0.000032
+vt 0.000000 0.000000
+vt 0.000000 0.000000
+vt 0.000000 0.000000
+vt 0.999968 0.000032
+vt 0.999968 0.100026
+vt 0.000032 0.100026
+vt 0.999968 0.100026
+vt 0.000032 0.100026
+vt 0.999968 0.000032
+vn -1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+g WindowPanel_Cube.008_2
+s off
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/5/2 4/6/2 8/7/2 7/8/2
+f 7/9/3 8/10/3 6/11/3 5/12/3
+f 5/12/4 6/13/4 2/14/4 1/15/4
+f 3/4/5 7/16/5 5/17/5 1/18/5
+f 8/19/6 4/20/6 2/14/6 6/21/6
diff --git a/mods/spawn/objects.lua b/mods/spawn/objects.lua
index 489cf95..ba14737 100644
--- a/mods/spawn/objects.lua
+++ b/mods/spawn/objects.lua
@@ -16,7 +16,7 @@ minetest.register_node('spawn:ladder', {
             {-.4, -.5, .3, .4, .5, .5},},
    },
    tiles = {'spawn_rail_blank.png', 'spawn_floor_blank.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 local colbox_console = {
@@ -38,9 +38,9 @@ minetest.register_node('spawn:console1', {
          type = 'vertical_frames',
          aspect_w = 32,
          aspect_h = 32,
-         length = 2.0,
+         length = 1.0,
       },}, 'spawn_console_front.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 minetest.register_node('spawn:console2', {
@@ -59,7 +59,7 @@ minetest.register_node('spawn:console2', {
          aspect_h = 32,
          length = 1.0,
       },}, 'spawn_console_front.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 minetest.register_node('spawn:console3', {
@@ -78,7 +78,7 @@ minetest.register_node('spawn:console3', {
          aspect_h = 32,
          length = 4.0,
       },}, 'spawn_console_front.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })
 
 local colbox_tube_light = {
@@ -96,7 +96,7 @@ minetest.register_node('spawn:tube_light', {
    selection_box = colbox_tube_light,
    collision_box = colbox_tube_light,
    tiles = {'spawn_tube_light.png'},
-   groups = {oddly_breakable_by_hand=3},
+   groups = {spawn=1},
    on_place = minetest.rotate_node,
    on_timer = function(pos)
       local node = minetest.get_node(pos)
@@ -117,7 +117,7 @@ minetest.register_node('spawn:tube_light_bad', {
    selection_box = colbox_tube_light,
    collision_box = colbox_tube_light,
    tiles = {'spawn_tube_light.png'},
-   groups = {oddly_breakable_by_hand=3},
+   groups = {spawn=1},
    on_place = minetest.rotate_node,
    on_construct = function(pos)
       local timer = minetest.get_node_timer(pos)
diff --git a/mods/spawn/textures/autostore_top.png b/mods/spawn/textures/autostore_top.png
deleted file mode 100644
index 4638de4..0000000
Binary files a/mods/spawn/textures/autostore_top.png and /dev/null differ
diff --git a/mods/spawn/textures/spawn_comp_home.png b/mods/spawn/textures/spawn_comp_home.png
new file mode 100644
index 0000000..b36f29a
Binary files /dev/null and b/mods/spawn/textures/spawn_comp_home.png differ
diff --git a/mods/spawn/textures/spawn_comp_log.png b/mods/spawn/textures/spawn_comp_log.png
new file mode 100644
index 0000000..e559e6b
Binary files /dev/null and b/mods/spawn/textures/spawn_comp_log.png differ
diff --git a/mods/spawn/textures/spawn_comp_map.png b/mods/spawn/textures/spawn_comp_map.png
new file mode 100644
index 0000000..17a69a7
Binary files /dev/null and b/mods/spawn/textures/spawn_comp_map.png differ
diff --git a/mods/spawn/textures/spawn_comp_screens.xcf b/mods/spawn/textures/spawn_comp_screens.xcf
new file mode 100644
index 0000000..2e705d2
Binary files /dev/null and b/mods/spawn/textures/spawn_comp_screens.xcf differ
diff --git a/mods/spawn/textures/spawn_comp_status.png b/mods/spawn/textures/spawn_comp_status.png
new file mode 100644
index 0000000..0f35178
Binary files /dev/null and b/mods/spawn/textures/spawn_comp_status.png differ
diff --git a/mods/spawn/textures/autostore_side.png b/mods/spawn/textures/spawn_vending.png
similarity index 100%
rename from mods/spawn/textures/autostore_side.png
rename to mods/spawn/textures/spawn_vending.png
diff --git a/mods/spawn/textures/autostore_off.png b/mods/spawn/textures/spawn_vending_off.png
similarity index 100%
rename from mods/spawn/textures/autostore_off.png
rename to mods/spawn/textures/spawn_vending_off.png
diff --git a/mods/spawn/textures/autostore_front.png b/mods/spawn/textures/spawn_vending_on.png
similarity index 100%
rename from mods/spawn/textures/autostore_front.png
rename to mods/spawn/textures/spawn_vending_on.png
diff --git a/mods/spawn/vending_machine.lua b/mods/spawn/vending_machine.lua
index 21103a6..2ff27f4 100644
--- a/mods/spawn/vending_machine.lua
+++ b/mods/spawn/vending_machine.lua
@@ -13,7 +13,7 @@ formspec_owner =
 
 minetest.register_node('spawn:vending1', {
 	description = 'Unconfigured Vending Machine',
-	tiles = {'autostore_top.png', 'autostore_side.png', 'autostore_side.png', 'autostore_side.png', 'autostore_side.png', 'autostore_off.png'},
+	tiles = {'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending_off.png'},
 	groups = {spawn=1},
 	paramtype = 'light',
 	paramtype2 = 'facedir',
@@ -67,7 +67,7 @@ minetest.register_node('spawn:vending1', {
 
 minetest.register_node('spawn:vending', {
 	description = 'Vending Machine',
-	tiles = {'autostore_top.png', 'autostore_side.png', 'autostore_side.png', 'autostore_side.png', 'autostore_side.png', 'autostore_front.png'},
+	tiles = {'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending_on.png'},
 	groups = {spawn=1},
 	paramtype = 'light',
 	paramtype2 = 'facedir',
@@ -95,7 +95,7 @@ minetest.register_node('spawn:vending', {
 
 minetest.register_node('spawn:vending_dud', {
 	description = 'Vending Machine',
-	tiles = {'autostore_top.png', 'autostore_side.png', 'autostore_side.png', 'autostore_side.png', 'autostore_side.png', 'autostore_off.png'},
+	tiles = {'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending.png', 'spawn_vending_off.png'},
 	groups = {spawn=1},
 	paramtype = 'light',
 	paramtype2 = 'facedir',
diff --git a/mods/spawn/walls.lua b/mods/spawn/walls.lua
index 9e79880..de93a86 100644
--- a/mods/spawn/walls.lua
+++ b/mods/spawn/walls.lua
@@ -1,5 +1,5 @@
-minetest.register_node('spawn:window', {
-   description = 'Floor',
+minetest.register_node('spawn:window_corner', {
+   description = 'Window Corner',
    drawtype = "mesh",
    mesh = 'spawn_window_corner.obj',
    paramtype = "light",
@@ -7,11 +7,23 @@ minetest.register_node('spawn:window', {
 --   selection_box = colbox_floor,
 --   collision_box = colbox_floor,
    tiles = {'spawn_wall.png', 'black.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
+})
+
+minetest.register_node('spawn:window_panel', {
+   description = 'Window Panel',
+   drawtype = "mesh",
+   mesh = 'spawn_window_panel.obj',
+   paramtype = "light",
+   paramtype2 = "facedir",
+--   selection_box = colbox_floor,
+--   collision_box = colbox_floor,
+   tiles = {'black.png'},
+   groups = {spawn=1}
 })
 
 minetest.register_node('spawn:wall', {
    description = "Wall",
    tiles = {'spawn_wall.png'},
-   groups = {oddly_breakable_by_hand=3}
+   groups = {spawn=1}
 })