diff --git a/init.lua b/init.lua
index 9fab009..e50a3af 100644
--- a/init.lua
+++ b/init.lua
@@ -24,6 +24,8 @@ end
 
 -- Load API
 dofile(modpath.."/api.lua")
+-- Machine Registration
+dofile(modpath.."/register.lua")
 
 -------------------
 ----- MODULES -----
@@ -72,8 +74,6 @@ function microexpansion.require_module(name)
 	end
 end
 
-microexpansion.require_module("power")
-
 for name,enabled in pairs(settings) do
 	if enabled ~= false then
 		microexpansion.load_module(name)
diff --git a/modules.conf b/modules.conf
index 5502670..4f08c81 100644
--- a/modules.conf
+++ b/modules.conf
@@ -1,5 +1,5 @@
 shared = true
 network = true
-power = true
+power = false
 storage = true
 ores = true
diff --git a/modules/power/init.lua b/modules/power/init.lua
index 88575c5..cd6882b 100644
--- a/modules/power/init.lua
+++ b/modules/power/init.lua
@@ -9,6 +9,5 @@ me.power = {}
 -- Load Resources
 
 dofile(path.."/network.lua") -- Network Management
-dofile(path.."/register.lua") -- Machine Registration
 --dofile(path.."/ctrl.lua") -- Controller/wires
 dofile(path.."/gen.lua") -- Generators
diff --git a/modules/storage/drive.lua b/modules/storage/drive.lua
index 9041591..59846e6 100644
--- a/modules/storage/drive.lua
+++ b/modules/storage/drive.lua
@@ -17,6 +17,8 @@ local function load_drives()
       end
     end
     ]]
+  else
+    netdrives = {}
   end
 end
 
diff --git a/modules/storage/terminal.lua b/modules/storage/terminal.lua
index 67266c0..d91fc60 100644
--- a/modules/storage/terminal.lua
+++ b/modules/storage/terminal.lua
@@ -167,12 +167,12 @@ microexpansion.register_node("term", {
   },
   after_place_node = pipeworks_enabled and pipeworks.after_place,
   after_dig_node = pipeworks_enabled and pipeworks.after_dig,
-	on_receive_fields = function(pos, _, fields, sender)
-		local net,cp = me.get_connected_network(pos)
-		if net then
-		  if cp then
-		    minetest.log("none","network and ctrl_pos")
-	    else
+    on_receive_fields = function(pos, _, fields, sender)
+      local net,cp = me.get_connected_network(pos)
+      if net then
+        if cp then
+          minetest.log("info","network and ctrl_pos")
+        else
 	     minetest.log("warning","network but no ctrl_pos")
 		  end
 		else
diff --git a/modules/power/register.lua b/register.lua
similarity index 93%
rename from modules/power/register.lua
rename to register.lua
index f7b98bd..00d5be6 100644
--- a/modules/power/register.lua
+++ b/register.lua
@@ -1,4 +1,4 @@
--- power/register.lua
+-- register.lua
 
 --[[ Machine Registration API ]]
 
@@ -29,7 +29,7 @@ function me.register_machine(itemstring, def)
 		end
 
 		-- Trace Network
-		power.trace(pos)
+		--power.trace(pos)
 
 		-- Set demand
 		if def.demand then
@@ -37,7 +37,9 @@ function me.register_machine(itemstring, def)
 		end
 
 		if type(def.machine) == "table" then
-			power.add_machine(pos, def.machine)
+			if power then
+				power.add_machine(pos, def.machine)
+			end
 		end
 	end
 	-- Set on_destruct
@@ -55,7 +57,7 @@ function me.register_machine(itemstring, def)
 			-- Remove item from network
 			me.network_remove(pos)
 			-- Retrace Network
-			power.trace(pos)
+			--power.trace(pos)
 		end
 	end
 	-- Set connects_to