diff --git a/lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar b/lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar
deleted file mode 100755
index 40a38e3a8..000000000
Binary files a/lib/CodeChickenCore-1.7.10-1.0.4.29-dev.jar and /dev/null differ
diff --git a/lib/CodeChickenCore-1.7.10-1.0.4.29-src.jar b/lib/CodeChickenCore-1.7.10-1.0.4.29-src.jar
deleted file mode 100755
index 5e53d13ce..000000000
Binary files a/lib/CodeChickenCore-1.7.10-1.0.4.29-src.jar and /dev/null differ
diff --git a/lib/CodeChickenLib-1.7.10-1.1.3.140-dev.jar b/lib/CodeChickenLib-1.7.10-1.1.3.140-dev.jar
deleted file mode 100755
index 2470ca73d..000000000
Binary files a/lib/CodeChickenLib-1.7.10-1.1.3.140-dev.jar and /dev/null differ
diff --git a/lib/CodeChickenLib-1.7.10-1.1.3.140-src.jar b/lib/CodeChickenLib-1.7.10-1.1.3.140-src.jar
deleted file mode 100755
index 530c9d2ac..000000000
Binary files a/lib/CodeChickenLib-1.7.10-1.1.3.140-src.jar and /dev/null differ
diff --git a/lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar b/lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar
deleted file mode 100755
index 59aa81fa1..000000000
Binary files a/lib/NotEnoughItems-1.7.10-1.0.3.74-dev.jar and /dev/null differ
diff --git a/lib/NotEnoughItems-1.7.10-1.0.3.74-src.jar b/lib/NotEnoughItems-1.7.10-1.0.3.74-src.jar
deleted file mode 100755
index 00674c7da..000000000
Binary files a/lib/NotEnoughItems-1.7.10-1.0.3.74-src.jar and /dev/null differ
diff --git a/src/main/java/api/hbm/energy/IBatteryItem.java b/src/main/java/api/hbm/energy/IBatteryItem.java
new file mode 100644
index 000000000..e0e72362d
--- /dev/null
+++ b/src/main/java/api/hbm/energy/IBatteryItem.java
@@ -0,0 +1,14 @@
+package api.hbm.energy;
+
+import net.minecraft.item.ItemStack;
+
+public interface IBatteryItem {
+
+    public void chargeBattery(ItemStack stack, long i);
+    public void setCharge(ItemStack stack, long i);
+    public void dischargeBattery(ItemStack stack, long i);
+    public long getCharge(ItemStack stack);
+    public long getMaxCharge();
+    public long getChargeRate();    
+    public long getDischargeRate();
+}
diff --git a/src/main/java/api/hbm/energy/IEnergyConsumer.java b/src/main/java/api/hbm/energy/IEnergyConsumer.java
new file mode 100644
index 000000000..b27d56ffb
--- /dev/null
+++ b/src/main/java/api/hbm/energy/IEnergyConsumer.java
@@ -0,0 +1,5 @@
+package api.hbm.energy;
+
+public interface IEnergyConsumer {
+
+}
diff --git a/src/main/java/api/hbm/energy/IEnergySource.java b/src/main/java/api/hbm/energy/IEnergySource.java
new file mode 100644
index 000000000..6f9f271d9
--- /dev/null
+++ b/src/main/java/api/hbm/energy/IEnergySource.java
@@ -0,0 +1,5 @@
+package api.hbm.energy;
+
+public interface IEnergySource {
+
+}
diff --git a/src/main/java/com/hbm/interfaces/Spaghetti.java b/src/main/java/com/hbm/interfaces/Spaghetti.java
index eb9542b6f..e6a20e2c2 100644
--- a/src/main/java/com/hbm/interfaces/Spaghetti.java
+++ b/src/main/java/com/hbm/interfaces/Spaghetti.java
@@ -5,4 +5,4 @@ package com.hbm.interfaces;
 public @interface Spaghetti {
 
 	public String value();
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java
index 6c83bcf36..28a4feb6d 100644
--- a/src/main/java/com/hbm/lib/Library.java
+++ b/src/main/java/com/hbm/lib/Library.java
@@ -440,13 +440,14 @@ public class Library {
 		return power;
 	}
 	
-	//TODO: jesus christ kill it
+	//TODO: jesus christ
 	//Flut-Füll gesteuerter Energieübertragungsalgorithmus
 	//Flood fill controlled energy transmission algorithm
 	public static void ffgeua(int x, int y, int z, boolean newTact, ISource that, World worldObj) {
 		Block block = worldObj.getBlock(x, y, z);
 		TileEntity tileentity = worldObj.getTileEntity(x, y, z);
 
+		//TODO: transition multiblocks to use the XR mutliblock handler so this spaghetti trash becomes obsolete
 		//Factories
 		if(block == ModBlocks.factory_titanium_conductor && worldObj.getBlock(x, y + 1, z) == ModBlocks.factory_titanium_core)
 		{