diff --git a/src/main/java/com/hbm/inventory/container/ContainerFEL.java b/src/main/java/com/hbm/inventory/container/ContainerFEL.java
index 4320feb46..db7cd4949 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerFEL.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerFEL.java
@@ -1,7 +1,9 @@
 package com.hbm.inventory.container;
 
+import com.hbm.items.ModItems;
 import com.hbm.tileentity.machine.TileEntityFEL;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -33,31 +35,35 @@ public class ContainerFEL extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(par2 == 0) {
-				if(!this.mergeItemStack(var5, 1, this.inventorySlots.size(), false)) {
+			if(index == 0) {
+				if(!this.mergeItemStack(stack, 1, this.inventorySlots.size(), false)) {
 					return null;
 				}
 			} else {
-				if(!this.mergeItemStack(var5, 0, 1, false))
-					return null;
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 0, 1, false)) return null;
+				} else {
+					if(!this.mergeItemStack(stack, 1, 2, false)) return null;
+				}
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java b/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java
index 4fe7aa668..ed084a881 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java
@@ -1,8 +1,12 @@
 package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotCraftingOutput;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemAssemblyTemplate;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineAssembler;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -55,41 +59,46 @@ private TileEntityMachineAssembler assembler;
 	}
 	
 	@Override
-    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
-    {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 		
-		if (var4 != null && var4.getHasStack())
-		{
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
-			SlotCraftingOutput.checkAchievements(p_82846_1_, var5);
+		if (slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
+			SlotCraftingOutput.checkAchievements(player, stack);
 			
-            if (par2 <= 17) {
-				if (!this.mergeItemStack(var5, 18, this.inventorySlots.size(), true))
-				{
+            if (index <= 17) {
+				if (!this.mergeItemStack(stack, 18, this.inventorySlots.size(), true)) {
 					return null;
 				}
-			}
-			else if (!this.mergeItemStack(var5, 6, 18, false))
-				if (!this.mergeItemStack(var5, 0, 4, false))
-					return null;
-			
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 0, 1, false)) return null;
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
+					if(!this.mergeItemStack(stack, 1, 4, false)) return null;
+				} else if(rStack.getItem() instanceof ItemAssemblyTemplate) {
+					if(!this.mergeItemStack(stack, 4, 5, false)) return null;
+				} else {
+					if(!this.mergeItemStack(stack, 6, 18, false)) return null;
+				}
+			}
+			
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
+			} else {
+				slot.onSlotChanged();
 			}
 
-			if(var5.stackSize == var3.stackSize) {
+			if(stack.stackSize == rStack.stackSize) {
 				return null;
 			}
 
-			var4.onPickupFromSlot(p_82846_1_, var3);
+			slot.onPickupFromSlot(player, rStack);
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java b/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java
index 60c428c8a..6bbf3510a 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineChemplant.java
@@ -2,8 +2,12 @@ package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotCraftingOutput;
 import com.hbm.inventory.SlotTakeOnly;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemChemistryTemplate;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineChemplant;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -60,31 +64,42 @@ public class ContainerMachineChemplant extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
-			SlotCraftingOutput.checkAchievements(p_82846_1_, var5);
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
+			SlotCraftingOutput.checkAchievements(player, stack);
 
-			if(par2 <= 20) {
-				if(!this.mergeItemStack(var5, 21, this.inventorySlots.size(), true)) {
+			if(index <= 20) {
+				if(!this.mergeItemStack(stack, 21, this.inventorySlots.size(), true)) {
 					return null;
 				}
-			} else if(!this.mergeItemStack(var5, 4, 5, false))
-				if(!this.mergeItemStack(var5, 13, 19, false))
-					return null;
-
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 0, 1, false)) return null;
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade ) {
+					if(!this.mergeItemStack(stack, 1, 4, false)) return null;
+				} else if(rStack.getItem() instanceof ItemChemistryTemplate) {
+					if(!this.mergeItemStack(stack, 4, 5, false)) return null;
+				} else { //proper shift-clicking filled/empty fluid tanks is an exercise in futility 
+					if(!this.mergeItemStack(stack, 13, 19, false))
+					if(!this.mergeItemStack(stack, 9, 11, false))
+						return null;
+				}
+			}
+			
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
+			} else {
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineExcavator.java b/src/main/java/com/hbm/inventory/container/ContainerMachineExcavator.java
index c55fd5400..9a780d917 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineExcavator.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineExcavator.java
@@ -1,7 +1,10 @@
 package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotTakeOnly;
+import com.hbm.items.ModItems;
 import com.hbm.items.machine.IItemFluidIdentifier;
+import com.hbm.items.machine.ItemDrillbit;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineExcavator;
 
 import api.hbm.energy.IBatteryItem;
@@ -46,43 +49,40 @@ public class ContainerMachineExcavator extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(par2 <= 13) {
-				if(!this.mergeItemStack(var5, 14, this.inventorySlots.size(), true)) {
+			if(index <= 13) {
+				if(!this.mergeItemStack(stack, 14, this.inventorySlots.size(), true)) {
 					return null;
 				}
 			} else {
 				
-				if(var3.getItem() instanceof IBatteryItem) {
-					if(!this.mergeItemStack(var5, 0, 1, false)) {
-						return null;
-					}
-				} else if(var3.getItem() instanceof IItemFluidIdentifier) {
-					if(!this.mergeItemStack(var5, 1, 2, false)) {
-						return null;
-					}
-				} else {
-					if(!this.mergeItemStack(var5, 2, 5, false)) {
-						return null;
-					}
-				}
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 0, 1, false)) return null;
+				} else if(rStack.getItem() instanceof IItemFluidIdentifier) {
+					if(!this.mergeItemStack(stack, 1, 2, false)) return null;
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade ) {
+					if(!this.mergeItemStack(stack, 2, 4, false)) return null;
+				} else if(rStack.getItem() instanceof ItemDrillbit) {
+					if(!this.mergeItemStack(stack, 4, 5, false)) return null;
+				} else
+					return null;
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java b/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java
index 4f5745ed7..feb3de896 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java
@@ -1,8 +1,12 @@
 package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotCraftingOutput;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.IItemFluidIdentifier;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineGasCent;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -51,19 +55,27 @@ public class ContainerMachineGasCent extends Container {
 	@Override
     public ItemStack transferStackInSlot(EntityPlayer player, int index)
     {
-		ItemStack returnStack = null;
+		ItemStack rStack = null;
 		Slot slot = (Slot) this.inventorySlots.get(index);
 		
 		if(slot != null && slot.getHasStack()) {
 			ItemStack stack = slot.getStack();
-			returnStack = stack.copy();
+			rStack = stack.copy();
 			
             if(index <= 6) {
 				if (!this.mergeItemStack(stack, 7, this.inventorySlots.size(), true)) {
 					return null;
 				}
-			} else if(!this.mergeItemStack(stack, 4, 7, false)) {
-				return null;
+			} else {
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 4, 5, false)) return null;
+				} else if(rStack.getItem() instanceof IItemFluidIdentifier) {
+					if(!this.mergeItemStack(stack, 5, 6, false)) return null;
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade ) {
+					if(!this.mergeItemStack(stack, 6, 7, false)) return null;
+				} else
+					return null;
 			}
 			
 			if (stack.stackSize == 0) {
@@ -73,7 +85,7 @@ public class ContainerMachineGasCent extends Container {
 			}
 		}
 		
-		return returnStack;
+		return rStack;
     }
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineShredder.java b/src/main/java/com/hbm/inventory/container/ContainerMachineShredder.java
index f903f1ddd..3e751f88e 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineShredder.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineShredder.java
@@ -1,8 +1,11 @@
 package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotCraftingOutput;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemBlades;
 import com.hbm.tileentity.machine.TileEntityMachineShredder;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -68,32 +71,37 @@ public class ContainerMachineShredder extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(par2 <= 29) {
-				if(!this.mergeItemStack(var5, 30, this.inventorySlots.size(), true)) {
+			if(index <= 29) {
+				if(!this.mergeItemStack(stack, 30, this.inventorySlots.size(), true)) {
 					return null;
 				}
 			} else {
-				if(!this.mergeItemStack(var5, 0, 9, false))
-					if(!this.mergeItemStack(var5, 27, 30, false))
-						return null;
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 29, 30, false)) return null;
+				} else if(rStack.getItem() instanceof ItemBlades) {
+					if(!this.mergeItemStack(stack, 27, 29, false)) return null;
+				} else {
+					if(!this.mergeItemStack(stack, 0, 9, false)) return null;
+				}
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineTurbofan.java b/src/main/java/com/hbm/inventory/container/ContainerMachineTurbofan.java
index e4e53720d..329f6a718 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineTurbofan.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineTurbofan.java
@@ -1,8 +1,12 @@
 package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotTakeOnly;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.IItemFluidIdentifier;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineTurbofan;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -44,31 +48,39 @@ public class ContainerMachineTurbofan extends Container {
 	}
 	
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(par2 <= 4) {
-				if(!this.mergeItemStack(var5, 5, this.inventorySlots.size(), true)) {
+			if(index <= 4) {
+				if(!this.mergeItemStack(stack, 5, this.inventorySlots.size(), true)) {
 					return null;
 				}
-			} else if(!this.mergeItemStack(var5, 0, 1, false)) {
-				if(!this.mergeItemStack(var5, 2, 3, false))
-					return null;
+			} else {
+				
+				if(rStack.getItem() instanceof IBatteryItem) {
+					if(!this.mergeItemStack(stack, 3, 4, false)) return null;
+				} else if(rStack.getItem() instanceof IItemFluidIdentifier) {
+					if(!this.mergeItemStack(stack, 4, 5, false)) return null;
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade ) {
+					if(!this.mergeItemStack(stack, 2, 3, false)) return null;
+				} else {
+					if(!this.mergeItemStack(stack, 0, 1, false)) return null;
+				}
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override