diff --git a/src/resonantinduction/battery/BatteryCache.java b/src/resonantinduction/battery/BatteryCache.java
new file mode 100644
index 00000000..75f21963
--- /dev/null
+++ b/src/resonantinduction/battery/BatteryCache.java
@@ -0,0 +1,6 @@
+package resonantinduction.battery;
+
+public class BatteryCache 
+{
+
+}
diff --git a/src/resonantinduction/battery/BatteryController.java b/src/resonantinduction/battery/BatteryController.java
deleted file mode 100644
index 4eebb9e3..00000000
--- a/src/resonantinduction/battery/BatteryController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * 
- */
-package resonantinduction.battery;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Multiblock battery controller
- * 
- * @author Calclavia
- * 
- */
-public class BatteryController
-{
-	public Set<TileEntityBattery> connectedBlocks = new HashSet<TileEntityBattery>();
-
-	public void update()
-	{
-
-	}
-}
diff --git a/src/resonantinduction/battery/BatteryUpdateProtocol.java b/src/resonantinduction/battery/BatteryUpdateProtocol.java
new file mode 100644
index 00000000..43bc2bb7
--- /dev/null
+++ b/src/resonantinduction/battery/BatteryUpdateProtocol.java
@@ -0,0 +1,6 @@
+package resonantinduction.battery;
+
+public class BatteryUpdateProtocol
+{
+
+}
diff --git a/src/resonantinduction/battery/SynchronizedBatteryData.java b/src/resonantinduction/battery/SynchronizedBatteryData.java
new file mode 100644
index 00000000..fd1f05db
--- /dev/null
+++ b/src/resonantinduction/battery/SynchronizedBatteryData.java
@@ -0,0 +1,12 @@
+package resonantinduction.battery;
+
+public class SynchronizedBatteryData 
+{
+	public int length;
+	
+	public int width;
+	
+	public int height;
+	
+	public int volume;
+}
diff --git a/src/resonantinduction/battery/TileEntityBattery.java b/src/resonantinduction/battery/TileEntityBattery.java
index ef14f874..3fb68b05 100644
--- a/src/resonantinduction/battery/TileEntityBattery.java
+++ b/src/resonantinduction/battery/TileEntityBattery.java
@@ -19,9 +19,6 @@ public class TileEntityBattery extends TileEntityBase implements IInventory
 	private ItemStack[] inventory = new ItemStack[4 * 4];
 	private byte[] sideStatus = new byte[] { 0, 0, 0, 0, 0, 0 };
 
-	// TODO: Multiblock power storage.
-	private BatteryController controller;
-
 	@Override
 	public void updateEntity()
 	{
diff --git a/src/resonantinduction/contractor/TileEntityEMContractor.java b/src/resonantinduction/contractor/TileEntityEMContractor.java
index d0ddb522..eb253081 100644
--- a/src/resonantinduction/contractor/TileEntityEMContractor.java
+++ b/src/resonantinduction/contractor/TileEntityEMContractor.java
@@ -351,7 +351,7 @@ public class TileEntityEMContractor extends TileEntityBase implements IPacketRec
 	
 	public boolean canFunction()
 	{
-		return isLatched() && worldObj.getBlockPowerInput(xCoord, yCoord, zCoord) > 0;
+		return isLatched() && worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord);
 	}
 
 	@Override