diff --git a/mods/default/init.lua b/mods/default/init.lua
index 99f7cb82..ca8d1cbd 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -389,6 +389,15 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:chest_wifi',
+	recipe = {
+		{'group:wood','default:mese','group:wood'},
+		{'group:wood','default:steel_ingot','group:wood'},
+		{'group:wood','group:wood','default:wood'}
+	}
+})
+
 minetest.register_craft({
 	output = 'default:furnace',
 	recipe = {
@@ -1382,6 +1391,38 @@ minetest.register_node("default:chest_locked", {
 	end,
 })
 
+minetest.register_node("default:chest_wifi", {
+	description = "Wifi Chest",
+	tiles = {"default_chest_wifi_top.png", "default_chest_wifi_top.png", "default_chest_wifi_side.png",
+		"default_chest_wifi_side.png", "default_chest_wifi_side.png",
+{name="default_chest_wifi_front_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}}
+},
+	paramtype2 = "facedir",
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	legacy_facedir_simple = true,
+	sounds = default.node_sound_wood_defaults(),
+	on_construct = function(pos)
+		local meta = minetest.env:get_meta(pos)
+		meta:set_string("formspec",
+				"size[8,9]"..
+				"list[current_player;default:chest_wifi;0,0;8,4;]"..
+				"list[current_player;main;0,5;8,4;]")
+		meta:set_string("infotext", "Wifi Chest")
+	end,
+	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+		minetest.log("action", player:get_player_name()..
+				" moves stuff in wifi chest at "..minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name()..
+				" moves stuff to wifi chest at "..minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name()..
+				" takes stuff from wifi chest at "..minetest.pos_to_string(pos))
+	end,
+})
+
 default.furnace_inactive_formspec =
 	"size[8,9]"..
 	"image[2,2;1,1;default_furnace_fire_bg.png]"..
@@ -1735,6 +1776,13 @@ minetest.register_craftitem("default:obsidian_shard", {
 	inventory_image = "default_obsidian_shard.png",
 })
 
+-- Wifi stuff
+minetest.register_on_joinplayer(function(player)
+	local inv = player:get_inventory()
+	inv:set_size("default:chest_wifi", 8*4)
+end)
+
+
 -- Support old code
 function default.spawn_falling_node(p, nodename)
 	spawn_falling_node(p, nodename)
diff --git a/mods/default/textures/default_chest_wifi_front_animated.png b/mods/default/textures/default_chest_wifi_front_animated.png
new file mode 100644
index 00000000..77bcb445
Binary files /dev/null and b/mods/default/textures/default_chest_wifi_front_animated.png differ
diff --git a/mods/default/textures/default_chest_wifi_side.png b/mods/default/textures/default_chest_wifi_side.png
new file mode 100644
index 00000000..f58fae95
Binary files /dev/null and b/mods/default/textures/default_chest_wifi_side.png differ
diff --git a/mods/default/textures/default_chest_wifi_top.png b/mods/default/textures/default_chest_wifi_top.png
new file mode 100644
index 00000000..35c01d0f
Binary files /dev/null and b/mods/default/textures/default_chest_wifi_top.png differ