diff --git a/config.lua b/config.lua
new file mode 100644
index 0000000..ab7097f
--- /dev/null
+++ b/config.lua
@@ -0,0 +1 @@
+COLLECTOR_INTERVAL = minetest.settings:get("element_exchange.collector_interval") or 20
diff --git a/energy_collector.lua b/energy_collector.lua
new file mode 100644
index 0000000..0dc0b3a
--- /dev/null
+++ b/energy_collector.lua
@@ -0,0 +1,124 @@
+function get_energy_collector_formspec()
+    local formspec = {
+        "size[8,9]",
+        "label[3,2;Orb]",
+        "list[context;dst;4,2;1,1;]",
+        "list[current_player;main;0,5;8,4;]",
+    }
+    return table.concat(formspec, "")
+end
+
+local function can_dig(pos, player)
+    local meta = minetest.get_meta(pos);
+    local inv = meta:get_inventory()
+    return inv:is_empty("dst")
+end
+
+local function on_timer(pos, elapsed)
+    local meta = minetest.get_meta(pos)
+    local inv = meta:get_inventory()
+
+    -- get block above
+    pos.y = pos.y + 1
+
+    if inv:is_empty("dst") then
+        -- stop timer
+        minetest.get_node_timer(pos):stop()
+        return false
+    end
+
+    if minetest.get_natural_light(pos) == 15 then
+        local dest_orb = inv:get_stack("dst", 1)
+        local stored = dest_orb:get_meta():get_int("stored_charge") or 0
+        stored = stored + 1
+        dest_orb:get_meta():set_int("stored_charge", stored)
+        inv:set_stack("dst", 1, dest_orb)
+    end
+    return true
+end
+
+local function on_construct(pos)
+    local meta = minetest.get_meta(pos)
+    local inv = meta:get_inventory()
+    inv:set_size("dst", 1)
+    meta:set_string("formspec", get_energy_collector_formspec())
+    meta:set_string("infotext", "Energy Collector")
+    on_timer(pos, 0)
+end
+
+local function allow_metadata_inventory_put(pos, listname, index, stack, player)
+    if minetest.is_protected(pos, player:get_player_name()) then
+        return 0
+    end
+    local meta = minetest.get_meta(pos)
+    local inv = meta:get_inventory()
+    if listname == "dst" then
+        if stack:get_name() == "element_exchange:exchange_orb" then
+            return stack:get_count()
+        else
+            return 0
+        end
+    end
+end
+
+local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
+    local meta = minetest.get_meta(pos)
+    local inv = meta:get_inventory()
+    local stack = inv:get_stack(from_list, from_index)
+    return allow_metadata_inventory_put(pos, to_list, to_index, stack, player)
+end
+
+local function allow_metadata_inventory_take(pos, listname, index, stack, player)
+    if minetest.is_protected(pos, player:get_player_name()) then
+        return 0
+    end
+    return stack:get_count()
+end
+
+local function on_blast(pos)
+    local drops = {}
+    default.get_inventory_drops(pos, "dst", drops)
+    drops[#drops+1] = "element_exchange:energy_collector"
+    minetest.remove_node(pos)
+    return drops
+end
+
+minetest.register_node("element_exchange:energy_collector", {
+    description = "Energy Collector",
+    tiles = {
+        "ee_energy_collector_up.png",
+        "ee_energy_collector_down.png",
+        "ee_energy_collector_right.png",
+        "ee_energy_collector_right.png",
+        "ee_energy_collector_right.png",
+        "ee_energy_collector_right.png"
+    },
+    groups = {cracky = 2},
+    is_ground_content = false,
+    can_dig = can_dig,
+    on_timer = on_timer,
+    on_construct = on_construct,
+    on_metadata_inventory_move = function(pos)
+        minetest.get_node_timer(pos):start(COLLECTOR_INTERVAL)
+    end,
+    on_metadata_inventory_put = function(pos)
+        minetest.get_node_timer(pos):start(COLLECTOR_INTERVAL)
+    end,
+    on_metadata_inventory_take = function(pos)
+        minetest.get_node_timer(pos):start(COLLECTOR_INTERVAL)
+    end,
+    on_blast = on_blast,
+    allow_metadata_inventory_put = allow_metadata_inventory_put,
+    allow_metadata_inventory_move = allow_metadata_inventory_move,
+    allow_metadata_inventory_take = allow_metadata_inventory_take,
+})
+
+minetest.register_craft({
+    type = "shaped",
+    output = "element_exchange:energy_collector",
+    recipe = {
+        {"default:obsidian_glass", "default:obsidian_glass","default:obsidian_glass"},
+        {"element_exchange:exchange_orb", "default:chest", "element_exchange:exchange_orb"},
+        {"default:steelblock", "default:steelblock",  "default:steelblock"}
+    }
+})
diff --git a/init.lua b/init.lua
index eedb49f..8130b95 100644
--- a/init.lua
+++ b/init.lua
@@ -4,7 +4,9 @@ function get_item_energy(name)
     return minetest.registered_items[name].energy_value or 1
 end
 
+dofile(default_path.."/config.lua")
 dofile(default_path.."/constructor.lua")
 dofile(default_path.."/deconstructor.lua")
+dofile(default_path.."/energy_collector.lua")
 dofile(default_path.."/energy.lua")
 dofile(default_path.."/orb.lua")
diff --git a/settingtypes.txt b/settingtypes.txt
new file mode 100644
index 0000000..93b7a28
--- /dev/null
+++ b/settingtypes.txt
@@ -0,0 +1,2 @@
+# How fast the energy collector gathers energy from the light
+element_exchange.collector_interval (Collector Gather Interval) int 20
diff --git a/textures/ee_energy_collector_down.png b/textures/ee_energy_collector_down.png
new file mode 100644
index 0000000..ff2613f
Binary files /dev/null and b/textures/ee_energy_collector_down.png differ
diff --git a/textures/ee_energy_collector_right.png b/textures/ee_energy_collector_right.png
new file mode 100644
index 0000000..0b63959
Binary files /dev/null and b/textures/ee_energy_collector_right.png differ
diff --git a/textures/ee_energy_collector_up.png b/textures/ee_energy_collector_up.png
new file mode 100644
index 0000000..b46ff73
Binary files /dev/null and b/textures/ee_energy_collector_up.png differ