fix a bug

83 files changed, 5874 insertions, 1330 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index f95f8814a9..2b04356f52 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -1,23 +1,32 @@
 package gtPlusPlus.core.block;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockJukebox;
-import net.minecraft.block.material.Material;
-
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
-import gtPlusPlus.core.block.base.BlockBaseOre;
-import gtPlusPlus.core.block.general.*;
+import gtPlusPlus.core.block.general.BlockCompressedObsidian;
+import gtPlusPlus.core.block.general.BlockNet;
+import gtPlusPlus.core.block.general.BlockTankXpConverter;
+import gtPlusPlus.core.block.general.FirePit;
+import gtPlusPlus.core.block.general.FluidTankInfinite;
+import gtPlusPlus.core.block.general.HellFire;
+import gtPlusPlus.core.block.general.LightGlass;
+import gtPlusPlus.core.block.general.MiningExplosives;
+import gtPlusPlus.core.block.general.PlayerDoors;
 import gtPlusPlus.core.block.general.antigrief.BlockWitherProof;
-import gtPlusPlus.core.block.machine.*;
+import gtPlusPlus.core.block.machine.CircuitProgrammer;
+import gtPlusPlus.core.block.machine.DecayablesChest;
+import gtPlusPlus.core.block.machine.FishTrap;
+import gtPlusPlus.core.block.machine.HeliumGenerator;
+import gtPlusPlus.core.block.machine.Machine_ModularityTable;
+import gtPlusPlus.core.block.machine.Machine_PooCollector;
+import gtPlusPlus.core.block.machine.Machine_ProjectTable;
+import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
+import gtPlusPlus.core.block.machine.Machine_TradeTable;
+import gtPlusPlus.core.block.machine.Machine_Workbench;
+import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced;
 import gtPlusPlus.core.block.machine.bedrock.Mining_Head_Fake;
 import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.Fluid;
 
 public final class ModBlocks {
@@ -78,6 +87,8 @@ public final class ModBlocks {
 	public static Block blockCustomMobSpawner;
 	public static Block blockCustomSuperLight;
 	public static Block blockCustomJukebox;
+	
+	public static Block blockPooCollector;
 
 	public static void init() {
 		Logger.INFO("Initializing Blocks.");
@@ -127,6 +138,8 @@ public final class ModBlocks {
 		
 		//blockCustomSuperLight = new BlockSuperLight();
 		blockCustomJukebox = new Machine_SuperJukebox();
+		
+		blockPooCollector = new Machine_PooCollector();
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 4d7478dbdd..e1bc3462be 100644
--- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -113,7 +113,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 						hiddenTextureArray = new IIconContainer[6];
 					}
 				}
-				catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+				catch (IllegalArgumentException | IllegalAccessException e) {
 					hiddenTextureArray = new IIconContainer[6];
 				}
 			}
@@ -216,7 +216,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
 							hiddenTextureArray = new IIconContainer[6];
 						}
 					}
-					catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+					catch (IllegalArgumentException | IllegalAccessException e) {
 						hiddenTextureArray = new IIconContainer[6];
 					}
 				}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
new file mode 100644
index 0000000000..23fdfe9733
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java
@@ -0,0 +1,180 @@
+package gtPlusPlus.core.block.machine;
+
+import java.util.List;
+import java.util.Random;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockMeta;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector;
+import gtPlusPlus.core.tileentities.machines.TileEntityBaseFluidCollector;
+import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class Machine_PooCollector extends BlockContainer {
+
+	@SideOnly(Side.CLIENT)
+	private IIcon textureTop;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureTop2;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureSide;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureSide2;
+
+	public Machine_PooCollector() {
+		super(Material.iron);
+		this.setBlockName("blockPooCollector");
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, ItemBlockMeta.class,"blockPooCollector");
+	}
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(final int aSide, final int aMeta) {
+		if (aMeta <= 7) {
+			blockIcon = textureSide;
+			return aSide <= 1 ? this.textureTop : this.textureSide;			
+		}
+		else {
+			blockIcon = textureSide2;
+			return aSide <= 1 ? this.textureTop2 : this.textureSide2;			
+		}	
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister p_149651_1_) {
+		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_top");
+		this.textureTop2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_top");
+		this.textureSide = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_sides");
+		this.textureSide2 = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "sewer_adv_sides");
+	}
+
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player,
+			final int side, final float lx, final float ly, final float lz) {
+		if (world.isRemote) {
+			return true;
+		} else {
+			TileEntityBaseFluidCollector tank = (TileEntityBaseFluidCollector) world.getTileEntity(x, y, z);
+			if (tank != null) {
+				Item handItem;
+				try {
+					handItem = player.getHeldItem().getItem();
+				} catch (Throwable t) {
+					handItem = null;
+				}
+				
+				//Fluid container code
+				/*if (handItem != null
+						&& (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer
+								|| FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) {
+					if (tank.tank.getFluid() == null) {
+						try {
+							if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) {
+								ItemStack handItemStack = player.getHeldItem();
+								IFluidContainerItem container = (IFluidContainerItem) handItem;
+								FluidStack containerFluid = container.getFluid(handItemStack);
+								container.drain(handItemStack, container.getFluid(handItemStack).amount, true);
+								tank.tank.setFluid(containerFluid);
+							} else {
+								ItemStack handItemStack = player.getHeldItem();
+								FluidContainerRegistry.drainFluidContainer(handItemStack);
+								FluidStack containerFluid = FluidContainerRegistry.getFluidForFilledItem(handItemStack);
+								ItemStack emptyContainer = FluidContainerRegistry.drainFluidContainer(handItemStack);
+								player.setItemInUse(emptyContainer, 0);
+
+								tank.tank.setFluid(containerFluid);
+							}
+						} catch (Throwable t) {
+							t.printStackTrace();
+						}
+					}
+
+				}*/
+				
+				if (!tank.mInventory.isEmpty()) {
+					PlayerUtils.messagePlayer(player, "Inventory contains:");
+					PlayerUtils.messagePlayer(player, ItemUtils.getArrayStackNames(tank.mInventory.getRealInventory()));
+				}
+				else {
+					PlayerUtils.messagePlayer(player, "No solids collected yet.");					
+				}
+				if (tank.tank.getFluid() != null) {
+					PlayerUtils.messagePlayer(player, "Tank contains " + tank.tank.getFluidAmount() + "L of "
+							+ tank.tank.getFluid().getLocalizedName());
+				}
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public int getRenderBlockPass() {
+		return 0;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return super.isOpaqueCube();
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World world, final int aMeta) {
+		return aMeta <= 7 ? new TileEntityPooCollector() : new TileEntityAdvPooCollector();
+	}
+
+	@Override
+	public void onBlockAdded(World world, int x, int y, int z) {
+		super.onBlockAdded(world, x, y, z);
+	}
+
+	@Override
+	public int getBlockColor() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public int damageDropped(final int damage) {
+		return damage;
+	}
+
+	@Override
+	public Item getItemDropped(final int meta, final Random rand, final int fortune) {
+		return Item.getItemFromBlock(this);
+	}
+
+	@Override
+	public int getRenderColor(int aMeta) {
+		return super.getRenderColor(aMeta);	
+	}
+
+	@Override
+	public void getSubBlocks(Item aItem, CreativeTabs aTab, List aList) {
+		aList.add(new ItemStack(aItem, 1, 0));
+		aList.add(new ItemStack(aItem, 1, 8));		
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
index eecc379290..fdb6b1a0a8 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java
@@ -133,34 +133,24 @@ public class Machine_ProjectTable extends BlockContainer implements ITileTooltip
 	}
 
 	@Optional.Method(modid = "EnderIO")
-	private static boolean checkEnderIOWrench(final ItemStack item){
-		if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")){
+	private static boolean checkEnderIOWrench(final ItemStack item) {
+		if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")) {
 			Class<?> wrenchClass;
-			try {
-				wrenchClass = Class.forName("crazypants.enderio.api.tool.ITool");
-				if (wrenchClass.isInstance(item.getItem())){
-					return true;
-				}
-			}
-			catch (final ClassNotFoundException e1) {
-				return false;
+			wrenchClass = ReflectionUtils.getClass("crazypants.enderio.api.tool.ITool");
+			if (wrenchClass.isInstance(item.getItem())) {
+				return true;
 			}
 		}
 		return false;
 	}
 
 	@Optional.Method(modid = "Buildcraft")
-	private static boolean checkBuildcraftWrench(final ItemStack item){
-		if (ReflectionUtils.doesClassExist("buildcraft.api.tools.IToolWrench")){
+	private static boolean checkBuildcraftWrench(final ItemStack item) {
+		if (ReflectionUtils.doesClassExist("buildcraft.api.tools.IToolWrench")) {
 			Class<?> wrenchClass;
-			try {
-				wrenchClass = Class.forName("buildcraft.api.tools.IToolWrench");
-				if (wrenchClass.isInstance(item.getItem())){
-					return true;
-				}
-			}
-			catch (final ClassNotFoundException e1) {
-				return false;
+			wrenchClass = ReflectionUtils.getClass("buildcraft.api.tools.IToolWrench");
+			if (wrenchClass.isInstance(item.getItem())) {
+				return true;
 			}
 		}
 		return false;
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
index 675aeaaf2b..5c08612042 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
@@ -121,34 +121,24 @@ public class Machine_Workbench extends BlockContainer
 	}
 
 	@Optional.Method(modid = "EnderIO")
-	private static boolean checkEnderIOWrench(final ItemStack item){
-		if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")){
+	private static boolean checkEnderIOWrench(final ItemStack item) {
+		if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")) {
 			Class<?> wrenchClass;
-			try {
-				wrenchClass = Class.forName("crazypants.enderio.api.tool.ITool");
-				if (wrenchClass.isInstance(item.getItem())){
-					return true;
-				}
-			}
-			catch (final ClassNotFoundException e1) {
-				return false;
+			wrenchClass = ReflectionUtils.getClass("crazypants.enderio.api.tool.ITool");
+			if (wrenchClass.isInstance(item.getItem())) {
+				return true;
 			}
 		}
 		return false;
 	}
 
 	@Optional.Method(modid = "Buildcraft")
-	private static boolean checkBuildcraftWrench(final ItemStack item){
-		if (ReflectionUtils.doesClassExist("buildcraft.api.tools.IToolWrench")){
+	private static boolean checkBuildcraftWrench(final ItemStack item) {
+		if (ReflectionUtils.doesClassExist("buildcraft.api.tools.IToolWrench")) {
 			Class<?> wrenchClass;
-			try {
-				wrenchClass = Class.forName("buildcraft.api.tools.IToolWrench");
-				if (wrenchClass.isInstance(item.getItem())){
-					return true;
-				}
-			}
-			catch (final ClassNotFoundException e1) {
-				return false;
+			wrenchClass = ReflectionUtils.getClass("buildcraft.api.tools.IToolWrench");
+			if (wrenchClass.isInstance(item.getItem())) {
+				return true;
 			}
 		}
 		return false;
diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java b/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
index 59621ef830..cc1249280b 100644
--- a/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
+++ b/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java
@@ -4,40 +4,12 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.entity.RenderChicken;
-import net.minecraft.entity.passive.EntityChicken;
-import net.minecraft.util.ResourceLocation;
-
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 @SideOnly(Side.CLIENT)
 public class RenderGiantChicken extends RenderChicken {
-	
-	/**
-	 * Fancy reflective handling of nabbing the original chicken texture object, should save reload the texture to memory. :)
-	 */
-    private static final ResourceLocation chickenTexturesEx;    
-    static {
-        ResourceLocation mChicken;
-		try {
-			mChicken = (ResourceLocation) ReflectionUtils.getField(RenderGiantChicken.class, "chickenTextures").get(null);
-		}
-		catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
-			mChicken = new ResourceLocation("textures/entity/chicken.png");
-		}
-        chickenTexturesEx = mChicken;
-    }
 
     public RenderGiantChicken(ModelBase p_i1252_1_, float p_i1252_2_)
     {
         super(p_i1252_1_, p_i1252_2_);
     }
-
-    /**
-     * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
-     */
-    @Override
-    protected ResourceLocation getEntityTexture(EntityChicken p_110775_1_)
-    {
-        return chickenTexturesEx;
-    }
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 9176dcc720..301ca992a4 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -18,11 +18,13 @@ import gtPlusPlus.core.entity.InternalEntityRegistry;
 import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
+import gtPlusPlus.core.fluids.FluidFactory;
 import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.handler.BurnableFuelHandler;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
 import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.handler.StopAnnoyingFuckingAchievements;
 import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
 import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
@@ -80,8 +82,8 @@ public class CommonProxy {
 		ModItems.init();
 		ModBlocks.init();
 		CI.preInit();
-
-		COMPAT_IntermodStaging.preInit();
+		FluidFactory.preInit();
+		COMPAT_IntermodStaging.preInit(e);
 		BookHandler.run();
 		// Registration of entities and renderers
 		Logger.INFO("[Proxy] Calling Entity registrator.");
@@ -116,6 +118,7 @@ public class CommonProxy {
 			Logger.ERROR("[ERROR] Did not generate fluids at all.");
 		}
 		CI.init();
+		FluidFactory.init();
 
 		/**
 		 * Register the Event Handlers.
@@ -130,6 +133,10 @@ public class CommonProxy {
 		Utils.registerEvent(new HandlerTooltip_EIO());
 		// Handles Custom Tooltips for GC
 		Utils.registerEvent(new HandlerTooltip_GC());
+		
+		if (CORE.DEVENV) {
+			Utils.registerEvent(new StopAnnoyingFuckingAchievements());
+		}
 
 		// Register Chunkloader
 		ForgeChunkManager.setForcedChunkLoadingCallback(GTplusplus.instance, ChunkManager.getInstance());
@@ -147,12 +154,13 @@ public class CommonProxy {
 		// Compat Handling
 		COMPAT_HANDLER.registerMyModsOreDictEntries();
 		COMPAT_HANDLER.intermodOreDictionarySupport();
-		COMPAT_IntermodStaging.init();
+		COMPAT_IntermodStaging.init(e);
 	}
 
 	public void postInit(final FMLPostInitializationEvent e) {
 		Logger.INFO("Cleaning up, doing postInit.");
 		PlayerCache.initCache();
+		FluidFactory.postInit();
 
 		// Make Burnables burnable
 		if (!CORE.burnables.isEmpty()) {
@@ -165,7 +173,7 @@ public class CommonProxy {
 		COMPAT_HANDLER.RemoveRecipesFromOtherMods();
 		COMPAT_HANDLER.InitialiseHandlerThenAddRecipes();
 		COMPAT_HANDLER.startLoadingGregAPIBasedRecipes();
-		COMPAT_IntermodStaging.postInit();
+		COMPAT_IntermodStaging.postInit(e);
 		COMPAT_HANDLER.runQueuedRecipes();
 	}
 
@@ -175,6 +183,7 @@ public class CommonProxy {
 
 	public void onLoadComplete(FMLLoadCompleteEvent event) {
 		COMPAT_IntermodStaging.onLoadComplete(event);
+		COMPAT_HANDLER.onLoadComplete(event);
 	}
 
 	public void registerNetworkStuff() {
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
index a5d0768e72..cd5d36b653 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
@@ -40,17 +40,17 @@ public class COMPAT_CompactWindmills {
 	public static ItemStack evWindmill = ItemUtils.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1);
 
 	//Compact Rotors
-	public static ItemStack rotor2 = ItemUtils.getItemStack("CompactWindmills:WOOL", 1);
-	public static ItemStack rotor1 = ItemUtils.getItemStack("CompactWindmills:WOOD", 1);
-	public static ItemStack rotor3 = ItemUtils.getItemStack("CompactWindmills:ALLOY", 1);
-	public static ItemStack rotor4 = ItemUtils.getItemStack("CompactWindmills:CARBON", 1);
-	public static ItemStack rotor5 = ItemUtils.getItemStack("CompactWindmills:IRIDIUM", 1);
+	public static ItemStack rotor2 = ItemUtils.getItemStackFromFQRN("CompactWindmills:WOOL", 1);
+	public static ItemStack rotor1 = ItemUtils.getItemStackFromFQRN("CompactWindmills:WOOD", 1);
+	public static ItemStack rotor3 = ItemUtils.getItemStackFromFQRN("CompactWindmills:ALLOY", 1);
+	public static ItemStack rotor4 = ItemUtils.getItemStackFromFQRN("CompactWindmills:CARBON", 1);
+	public static ItemStack rotor5 = ItemUtils.getItemStackFromFQRN("CompactWindmills:IRIDIUM", 1);
 
 	//IC2 Rotors
-	public static ItemStack rotorIC1 = ItemUtils.getItemStack("IC2:itemwoodrotor", 1);
-	public static ItemStack rotorIC2 = ItemUtils.getItemStack("IC2:itemironrotor", 1);
-	public static ItemStack rotorIC3 = ItemUtils.getItemStack("IC2:itemsteelrotor", 1);
-	public static ItemStack rotorIC4 = ItemUtils.getItemStack("IC2:itemwcarbonrotor", 1);
+	public static ItemStack rotorIC1 = ItemUtils.getItemStackFromFQRN("IC2:itemwoodrotor", 1);
+	public static ItemStack rotorIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemironrotor", 1);
+	public static ItemStack rotorIC3 = ItemUtils.getItemStackFromFQRN("IC2:itemsteelrotor", 1);
+	public static ItemStack rotorIC4 = ItemUtils.getItemStackFromFQRN("IC2:itemwcarbonrotor", 1);
 	public static ItemStack rotorBlade1 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 7, 1);
 	public static ItemStack rotorBlade2 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 8, 1);
 	public static ItemStack rotorBlade3 = ItemUtils.simpleMetaStack("IC2:itemRecipePart", 10, 1);
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
index 45a70997e4..4d736e1362 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -10,7 +10,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils;
 public class COMPAT_ExtraUtils {
 
 	public static void OreDict(){
-		RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItem("ExtraUtilities:divisionSigil"));
+		RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(ItemUtils.getItemFromFQRN("ExtraUtilities:divisionSigil"));
 		run();
 
 	}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java
index c7b90b780c..6381a6705e 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java
@@ -13,7 +13,7 @@ public class COMPAT_OpenBlocks {
 
 	private static final void run(){
 
-		Item aGraveItem = ItemUtils.getItem("OpenBlocks:grave");
+		Item aGraveItem = ItemUtils.getItemFromFQRN("OpenBlocks:grave");
 		if (aGraveItem == null) {
 			return;
 		}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java
new file mode 100644
index 0000000000..f6c8e86808
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java
@@ -0,0 +1,14 @@
+package gtPlusPlus.core.common.compat;
+
+public class COMPAT_Railcraft {
+
+	public static void OreDict(){
+		run();
+	}
+
+	private static final void run(){	
+		
+		
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
index 6247face1d..b78c10c8ce 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -20,9 +20,9 @@ public class COMPAT_Thaumcraft {
 		for(int i=0; i<=6; i++){
 			//Utils.LOG_INFO(""+i);
 			ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i);
-			GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1));
+			GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:"+i, 1));
 			ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i);
-			GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("Thaumcraft:ItemShard:"+i, 1));
+			GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:"+i, 1));
 			//System.out.println("TC Shard registration count is: "+i);
 		}
 
@@ -30,15 +30,15 @@ public class COMPAT_Thaumcraft {
 			for(int i=0; i<=6; i++){
 				//Utils.LOG_INFO(""+i);
 				ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i);
-				GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
+				GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:"+i, 1));
 				ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i);
-				GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
+				GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:"+i, 1));
 				//System.out.println("TC Shard registration count is: "+i);
 			}
 			ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
-			GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1));
+			GT_OreDictUnificator.registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
 			ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
-			GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStack("ForbiddenMagic:GluttonyShard", 1));
+			GT_OreDictUnificator.registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1));
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index 2fbd3f60c2..64c8b74b33 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -46,7 +46,9 @@ public class ConfigHandler {
 		enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines",
 				false, "Utilizes Neutronium instead.");
 		boilerSteamPerSecond = config.getInt("boilerSteamPerSecond", "machines", 750, 0, 10000, "Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)");
-		requireControlCores = config.getBoolean("requireControlCores", "machines", true, "Multiblocks Require Control Cores");
+		
+		//requireControlCores
+		boolean temp = config.getBoolean("requireControlCores", "machines", true, "Multiblocks Require Control Cores");
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java b/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java
index 36f5b86184..e5c779adcf 100644
--- a/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java
+++ b/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java
@@ -14,6 +14,7 @@ import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion;
 import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
+import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
 import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
 import gtPlusPlus.core.util.Utils;
 
@@ -51,6 +52,8 @@ public class InternalEntityRegistry {
         //EntityRegistry.registerGlobalEntityID(EntityTeslaTowerLightning.class, "plasmaBolt", EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(125, 125, 125));
         EntityRegistry.registerModEntity(EntityTeslaTowerLightning.class, "plasmaBolt", mEntityID++, GTplusplus.instance, 64, 5, true);
         
+        EntityRegistry.registerModEntity(EntityThrowableBomb.class, "EntityThrowableBomb", mEntityID++, GTplusplus.instance, 64, 10, true);
+        
         /**
          * Globals, which generate spawn eggs. (Currently required for Giant chicken spawning)
          */
diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
index bdc239b9ce..f6f397f59e 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
@@ -363,18 +363,15 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
 			}
 
 			//Get a private field from a super class if it exists.
-			try {
-				if (mFirstUpdateField == null) {
-					mFirstUpdateField = ReflectionUtils.getField(Class.forName("net.minecraft.entity.Entity"), "firstUpdate");
-				}			
-				if (mFirstUpdateField != null && mReflectFirstUpdate == true){
-					try {
-						this.mReflectFirstUpdate = (boolean) mFirstUpdateField.get(this);
-					}
-					catch (IllegalArgumentException | IllegalAccessException e) {}
+			if (mFirstUpdateField == null) {
+				mFirstUpdateField = ReflectionUtils.getField(this.getClass(), "firstUpdate");
+			}			
+			if (mFirstUpdateField != null && mReflectFirstUpdate == true){
+				try {
+					this.mReflectFirstUpdate = (boolean) mFirstUpdateField.get(this);
 				}
+				catch (IllegalArgumentException | IllegalAccessException e) {}
 			}
-			catch (NoSuchFieldException | ClassNotFoundException e) {}
 		}
 		super.onEntityUpdate();
 	}
diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java b/src/Java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java
new file mode 100644
index 0000000000..9e72daf687
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java
@@ -0,0 +1,115 @@
+package gtPlusPlus.core.entity.projectile;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+
+import gregtech.api.util.GT_Utility;
+
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+
+public class EntityThrowableBomb extends EntityThrowable {
+
+	public EntityThrowableBomb(World world) {
+		super(world);
+	}
+
+	public EntityThrowableBomb(World world, EntityLivingBase entity) {
+		super(world, entity);
+	}
+
+	public EntityThrowableBomb(World world, double posX, double posY, double posZ) {
+		super(world, posX, posY, posZ);
+	}
+
+	/**
+	 * Called when this EntityThrowable hits a block or entity.
+	 */
+	@Override
+	protected void onImpact(MovingObjectPosition object) {
+		int xBlock = object.blockX;
+		int yBlock = object.blockY;
+		int zBlock = object.blockZ;	
+		if (object.entityHit != null) {
+			byte b0 = 6;
+			if (!GT_Utility.isWearingFullRadioHazmat((EntityLivingBase) object.entityHit)){
+				object.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
+				EntityUtils.setEntityOnFire(object.entityHit, 10);
+				object.entityHit.fireResistance = 0;
+				ravage(EntityUtils.findBlockPosUnderEntity(object.entityHit));
+			}
+		}
+		if (object.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK){			
+			ravage(new BlockPos(xBlock, yBlock, zBlock));			
+		}
+
+		String mParticleType = "reddust";
+		int e=0;
+		for (int i = 0; i < 24; ++i) {
+			if ((e = MathUtils.randInt(0, 5)) <= 1){
+				if (e==0)
+					mParticleType = "largesmoke";
+				if (e==1)
+					mParticleType = "flame";
+			}
+			this.worldObj.spawnParticle(mParticleType, this.posX+MathUtils.randDouble(-2, 2), this.posY+MathUtils.randDouble(-2, 2), this.posZ+MathUtils.randDouble(-2, 2), 0.0D, 0.0D, 0.0D);
+		}
+
+		if (!this.worldObj.isRemote) {
+			this.setDead();
+		}
+	}
+
+	private boolean ravage(BlockPos blockpos){
+
+		int radius = 1;		
+
+		for (int i=(blockpos.xPos-radius);i<(blockpos.xPos+radius);i++){
+			for (int j=(blockpos.yPos-radius);j<(blockpos.yPos+radius);j++){
+				for (int h=(blockpos.zPos-radius);h<(blockpos.zPos+radius);h++){
+
+					int mChance = MathUtils.randInt(1, 10);
+					if (mChance <= 3){
+						Block mBlockhit = worldObj.getBlock(i, j, h);
+						this.worldObj.spawnParticle("flame", this.posX+MathUtils.randDouble(-2, 2), this.posY+MathUtils.randDouble(-2, 2), this.posZ+MathUtils.randDouble(-2, 2), 0.0D, 0.0D, 0.0D);
+						this.worldObj.spawnParticle("largesmoke", this.posX+MathUtils.randDouble(2, 2), this.posY+MathUtils.randDouble(-2, 2), this.posZ+MathUtils.randDouble(-2, 2), 0.0D, 0.0D, 0.0D);
+
+						//GT_Pollution.addPollution(worldObj.getChunkFromBlockCoords(blockpos.xPos, blockpos.zPos), mPol);						
+						this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 0.01f, true);
+						if (mBlockhit == Blocks.grass || mBlockhit == Blocks.mycelium){
+							worldObj.setBlock(i, j+1, h, Blocks.fire);
+							worldObj.setBlock(i, j, h, Blocks.dirt);
+						}
+						else if (mBlockhit == Blocks.leaves || mBlockhit == Blocks.leaves2){
+							worldObj.setBlock(i, j, h, Blocks.fire);
+						}
+						else if (mBlockhit == Blocks.tallgrass){
+							worldObj.setBlock(i, j, h, Blocks.fire);
+							if (worldObj.getBlock(i, j-1, h) == Blocks.grass){
+								worldObj.setBlock(i, j-1, h, Blocks.dirt);					
+							}
+						}
+						else if (mBlockhit == Blocks.carrots || mBlockhit == Blocks.melon_block || mBlockhit == Blocks.pumpkin || mBlockhit == Blocks.potatoes){
+							worldObj.setBlock(i, j+1, h, Blocks.fire);
+							worldObj.setBlock(i, j, h, Blocks.dirt);
+						}
+						else if (mBlockhit == Blocks.air){
+							worldObj.setBlock(i, j, h, Blocks.fire);
+						}	
+					}
+				}	
+			}
+		}
+
+
+		return true;
+	}
+
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
index 9a3958a908..dc7c9c2e78 100644
--- a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
+++ b/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java
@@ -1,113 +1,104 @@
 package gtPlusPlus.core.fluids;
 
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.math.MathUtils;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.BlockFluidClassic;
 import net.minecraftforge.fluids.Fluid;
 
 public class BlockFluidBase extends BlockFluidClassic {
 
 	@SideOnly(Side.CLIENT)
-	protected IIcon stillIcon;
+	protected static IIcon stillIcon;
 	@SideOnly(Side.CLIENT)
-	protected IIcon flowingIcon;
-
-	protected int colour;
-	protected Material fluidMaterial;
-	final String displayName;
-
-	@SuppressWarnings("deprecation")
-	public BlockFluidBase(final Fluid fluid, final Material material) {
-		super(fluid, net.minecraft.block.material.Material.lava);
-		final short[] tempColour = material.getRGBA();
-		this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
-		this.fluidMaterial = material;
-		this.setCreativeTab(AddToCreativeTab.tabOther);
-		this.displayName = material.getLocalizedName();
-		LanguageRegistry.addName(this, "Molten "+this.displayName+" ["+MathUtils.celsiusToKelvin(this.fluidMaterial.getBoilingPointC())+"K]");
-		this.setBlockName(this.GetProperName());
+	protected static IIcon flowingIcon;
+
+	protected final short[] mRGB;
+
+
+	public BlockFluidBase(Fluid fluid, short[] aRGB) {
+		this(fluid, Material.water, aRGB);
 	}
 
-	@SuppressWarnings("deprecation")
-	public BlockFluidBase(final String fluidName, final Fluid fluid, final short[] colour) {
-		super(fluid, net.minecraft.block.material.Material.lava);
-		final short[] tempColour = colour;
-		this.colour = Utils.rgbtoHexValue(tempColour[0], tempColour[1], tempColour[2]);
-		this.setCreativeTab(AddToCreativeTab.tabOther);
-		this.displayName = fluidName;
-		LanguageRegistry.addName(this, "Molten "+this.displayName);
-		this.setBlockName(this.GetProperName());
+	public BlockFluidBase(Fluid fluid, Material material, short[] aRGB) {
+		super(fluid, material);
+		mRGB = aRGB;
+		this.setHardness(100.0F);
+		this.setLightOpacity(3);
+		this.disableStats();
 	}
 
 	@Override
-	public IIcon getIcon(final int side, final int meta) {
-		return ((side == 0) || (side == 1))? this.stillIcon : this.flowingIcon;
+	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity ent) {
+		if (!(ent instanceof EntityLivingBase)) {
+			return;
+		}
+		/*EntityLivingBase player = (EntityLivingBase) ent;
+		int pot = world.rand.nextInt(Potion.potionTypes.length);
+		Potion.potionTypes[pot].performEffect(player, 40);*/
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
-	public void registerBlockIcons(final IIconRegister register) {
-		this.stillIcon = register.registerIcon(CORE.MODID+":fluids/fluid.molten.autogenerated");
-		this.flowingIcon = register.registerIcon(CORE.MODID+":fluids/fluid.molten.autogenerated");
+	public IIcon getIcon(int side, int meta) {
+		return (side == 0 || side == 1) ? stillIcon : flowingIcon;
 	}
 
+	@SideOnly(Side.CLIENT)
 	@Override
-	public boolean canDisplace(final IBlockAccess world, final int x, final int y, final int z) {
-		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
-			return false;
+	public void registerBlockIcons(IIconRegister register) {
+		if (stillIcon == null) {
+			stillIcon = register.registerIcon(CORE.MODID+ ":" + "fluids/fluid.fluid.autogenerated.still");			
 		}
-		return super.canDisplace(world, x, y, z);
+		if (flowingIcon == null) {
+			flowingIcon = register.registerIcon(CORE.MODID+ ":" + "fluids/fluid.fluid.autogenerated.flowing");		
+		}		
 	}
 
 	@Override
-	public boolean displaceIfPossible(final World world, final int x, final int y, final int z) {
-		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
-			return false;
-		}
-		return super.displaceIfPossible(world, x, y, z);
+	public int getBlockColor() {		
+		if (mRGB != null && mRGB.length >= 3) {
+			return Utils.rgbtoHexValue(mRGB[0], mRGB[1], mRGB[2]);
+		}		
+		return super.getBlockColor();
 	}
 
 	@Override
-	public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){
-
-		if (this.colour == 0){
-			return MathUtils.generateSingularRandomHexValue();
-		}
-
-		return this.colour;
+	public int getRenderColor(int aMeta) {		
+		if (mRGB != null && mRGB.length >= 3) {
+			return Utils.rgbtoHexValue(mRGB[0], mRGB[1], mRGB[2]);
+		}		
+		return super.getRenderColor(aMeta);
 	}
 
 	@Override
-	public int getRenderColor(final int aMeta) {
-		if (this.colour == 0){
-			return MathUtils.generateSingularRandomHexValue();
-		}
-
-		return this.colour;
+	public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) {
+		// TODO Auto-generated method stub
+		return super.recolourBlock(world, x, y, z, side, colour);
 	}
 
-	public String GetProperName() {
-		String tempIngot;
-
-		tempIngot = "Molten "+this.displayName;
-
-		return tempIngot;
+	@Override
+	public boolean canDisplace(IBlockAccess world, int x, int y, int z) {
+		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
+			return false;
+		}
+		return super.canDisplace(world, x, y, z);
 	}
 
-	public Material getFluidMaterial(){
-		return this.fluidMaterial;
+	@Override
+	public boolean displaceIfPossible(World world, int x, int y, int z) {
+		if (world.getBlock(x,  y,  z).getMaterial().isLiquid()) {
+			return false;
+		}
+		return super.displaceIfPossible(world, x, y, z);
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java
new file mode 100644
index 0000000000..3359f18f7d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java
@@ -0,0 +1,49 @@
+package gtPlusPlus.core.fluids;
+import gregtech.api.GregTech_API;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.Block;
+import net.minecraft.item.EnumRarity;
+import net.minecraftforge.fluids.Fluid;
+
+public class FactoryFluid extends Fluid implements Runnable {
+
+	private final String mTextureName;
+	private final short[] mRGBa;
+
+	public FactoryFluid(String fluidName, final short[] aRGBa) {
+		this(fluidName, null, Short.MIN_VALUE, Short.MIN_VALUE, Short.MIN_VALUE, Short.MIN_VALUE, false, EnumRarity.common, aRGBa);
+	}
+
+	public FactoryFluid(String fluidName, int luminosity, int density, int temp, int viscosity, final short[] aRGBa) {
+		this(fluidName, null, luminosity, density, temp, viscosity, (density == Short.MIN_VALUE || density >= 0 ? false : true), EnumRarity.common, aRGBa);
+	}
+	
+	public FactoryFluid(String fluidName, Block aBlock, int luminosity, int density, int temp, int viscosity, boolean gas, EnumRarity aRarity, final short[] aRGBa) {
+		super(fluidName);
+		this.mRGBa = aRGBa;
+		this.setBlock(aBlock);
+		if (luminosity != Short.MIN_VALUE)
+		this.setLuminosity(luminosity);
+		if (density != Short.MIN_VALUE)
+		this.setDensity(density);
+		if (temp != Short.MIN_VALUE)
+		this.setTemperature(temp);
+		if (viscosity != Short.MIN_VALUE)
+		this.setViscosity(viscosity);
+		this.setGaseous(gas);
+		this.setRarity(aRarity);
+		this.mTextureName = CORE.MODID+":fluids/fluid.fluid.autogenerated";
+		GregTech_API.sGTBlockIconload.add(this);
+	}
+
+	@Override
+	public int getColor() {
+		return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) | Math.max(0, Math.min(255, this.mRGBa[2]));
+	}
+
+	@Override
+	public void run() {
+		this.setIcons(GregTech_API.sBlockIcons.registerIcon(CORE.MODID+ ":" + "fluids/fluid." + this.mTextureName));		
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
new file mode 100644
index 0000000000..dffd7f55e9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java
@@ -0,0 +1,213 @@
+package gtPlusPlus.core.fluids;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.GTplusplus.INIT_PHASE;
+import gtPlusPlus.api.objects.GregtechException;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.base.itemblock.FluidItemBlock;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import net.minecraftforge.event.entity.player.FillBucketEvent;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+
+public class FluidFactory {
+
+	public static final Map<String, Fluid> mNameToFluidMap = new LinkedHashMap<String, Fluid>();
+	public static final Map<String, ItemStack> mNameToBucketMap = new LinkedHashMap<String, ItemStack>();
+	public static final Map<String, Block> mNameToBlockMap = new LinkedHashMap<String, Block>();
+	public static final Map<String, Integer> mNameToMetaMap = new LinkedHashMap<String, Integer>();
+
+	public static final Map<Fluid, String> mFluidToNameMap = new LinkedHashMap<Fluid, String>();
+	public static final Map<Fluid, ItemStack> mFluidToBucketMap = new LinkedHashMap<Fluid, ItemStack>();
+	public static final Map<Fluid, Block> mFluidToBlockMap = new LinkedHashMap<Fluid, Block>();
+	public static final Map<Fluid, Integer> mFluidToMetaMap = new LinkedHashMap<Fluid, Integer>();
+
+	public static final Map<ItemStack, Fluid> mBucketToFluidMap = new LinkedHashMap<ItemStack, Fluid>();
+	public static final Map<ItemStack, String> mBucketToNameMap = new LinkedHashMap<ItemStack, String>();
+	public static final Map<ItemStack, Block> mBucketToBlockMap = new LinkedHashMap<ItemStack, Block>();
+	public static final Map<ItemStack, Integer> mBucketToMetaMap = new LinkedHashMap<ItemStack, Integer>();
+
+	public static final Map<Block, String> mBlockToNameMap = new LinkedHashMap<Block, String>();
+	public static final Map<Block, Fluid> mBlockToFluidMap = new LinkedHashMap<Block, Fluid>();
+	public static final Map<Block, ItemStack> mBlockToBucketMap = new LinkedHashMap<Block, ItemStack>();
+	public static final Map<Block, Integer> mBlockToMetaMap = new LinkedHashMap<Block, Integer>();
+
+	public static final Map<Integer, String> mMetaToNameMap = new LinkedHashMap<Integer, String>();
+	public static final Map<Integer, Fluid> mMetaToFluidMap = new LinkedHashMap<Integer, Fluid>();
+	public static final Map<Integer, ItemStack> mMetaToBucketMap = new LinkedHashMap<Integer, ItemStack>();
+	public static final Map<Integer, Block> mMetaToBlockMap = new LinkedHashMap<Integer, Block>();
+	
+	
+	//Special Colour Handling
+	public static final Map<Integer, Integer> mMetaToColourMap = new LinkedHashMap<Integer, Integer>();
+
+
+	public static Item mGenericBucket;
+	private static FluidPackage mErrorFluid;
+	private static AutoMap<FluidPackage> mGeneratedFluids = new AutoMap<FluidPackage>();
+
+	public static void preInit() {
+
+	}
+
+	public static void init() {		
+		mGenericBucket = new ItemGenericFluidBucket(Blocks.air);		
+		GameRegistry.registerItem(mGenericBucket, "gtpp.bucket.generic");
+		for (FluidPackage y : mGeneratedFluids) {			
+			if (!y.valid()) {
+				continue;
+			}			
+			GameRegistry.registerBlock(y.mBlock, FluidItemBlock.class, "gtpp_" + y.mName);
+			FluidContainerRegistry.registerFluidContainer(y.get(), y.mBucket, new ItemStack(Items.bucket));
+		}
+		Utils.registerEvent(BucketHandler.INSTANCE);
+	}
+
+	public static void postInit() {
+
+	}
+
+	/**
+	 * Generates a 'Water' type fluid.
+	 * @param aID - The Fluid ID (Must be unique)
+	 * @param aUnlocalName - Unlocalized Fluid Name
+	 * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage.
+	 * @return - A fully constructed & registered {@linkplain FluidPackage}
+	 */
+	public static FluidPackage generate(int aID, String aUnlocalName, short[] aRGB) {
+		return generate(aID, aUnlocalName, Short.MIN_VALUE, Short.MIN_VALUE, Short.MIN_VALUE, Short.MIN_VALUE, aRGB);
+	}
+	
+	/**
+	 * Generate a {@link FluidPackage} from the data provided. This FluidPackage is automatically registered and handled internally.
+	 * Pass in {@link Short}.MIN_VALUE for any of the Fluid Fields (Besides ID, Name or RGB) and it will default to water values.
+	 * @param aID - The Fluid ID (Must be unique)
+	 * @param aUnlocalName - Unlocalized Fluid Name
+	 * @param luminosity - How bright is the fluid.
+	 * @param density - completely arbitrary; negative density indicates that the fluid is
+     * lighter than air. Default value is approximately the real-life density of water in kg/m^3.
+	 * @param temp - completely arbitrary; higher temperature indicates that the fluid is
+     * hotter than air. Default value is approximately the real-life room temperature of water in degrees Kelvin
+	 * @param viscosity - completely arbitrary; negative values are not
+     * permissible. Default value is approximately the real-life density of water in m/s^2 (x10^-3).     *
+     * Higher viscosity means that a fluid flows more slowly, like molasses.
+     * Lower viscosity means that a fluid flows more quickly, like helium.
+	 * @param aRGB - a {@link Short[]} containing the RGB of the FluidPackage.
+	 * @return - A fully constructed & registered {@linkplain FluidPackage}
+	 */
+	public static FluidPackage generate(int aID, String aUnlocalName, int luminosity, int density, int temp,
+			int viscosity, short[] aRGB) {
+
+		FluidPackage aFluidToGenerate = null;
+
+		// Check Load Phase for some Safety, only allow this to be called in Pre-Init.
+		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.PRE_INIT) {
+			try {
+				throw new GregtechException("Cannot generate Fluid Packages outside of Pre-Init!");
+			} catch (GregtechException e) {
+				System.exit(0);
+			}
+		}
+		
+		Fluid aGenFluid = fluid(aUnlocalName, luminosity, density, temp, viscosity, aRGB);
+		Block aGenBlock = block(aGenFluid, aRGB);
+		ItemStack aGenBucket = bucket(aID);
+
+		aFluidToGenerate = new FluidPackage(aID, aUnlocalName, aGenFluid, aGenBucket, aGenBlock);
+
+		if (aFluidToGenerate != null && aFluidToGenerate.valid()) {
+			FluidRegistry.registerFluid(aFluidToGenerate.get());	
+			mGeneratedFluids.put(aFluidToGenerate);		
+		}
+		else {
+			// Handle Bad generation
+			if (mErrorFluid == null) {
+				mErrorFluid = new FluidPackage(0, "", FluidUtils.getWater(1).getFluid(), ItemUtils.getSimpleStack(Items.water_bucket), Blocks.water);
+			}
+			return mErrorFluid;
+		}
+		
+
+		return aFluidToGenerate;
+	}
+	
+	
+	
+	private static Fluid fluid(String aUnlocalName, int luminosity, int density, int temp,
+			int viscosity, short[] aRGB) {
+		return new FactoryFluid(aUnlocalName, luminosity, density, temp, viscosity, aRGB);
+	}
+	
+	private static ItemStack bucket(int aID) {
+		return ItemGenericFluidBucket.registerFluidForBucket(aID);
+	}
+	
+	private static Block block(Fluid aFluidForBlock, short[] aRGB) {
+		if (aFluidForBlock != null) {
+			FluidRegistry.registerFluid(aFluidForBlock);
+			return new BlockFluidBase(aFluidForBlock, aRGB);
+		}
+		return Blocks.dirt;	
+	}
+
+	/**
+	 * Copyright © SpaceToad, 2011 http://www.mod-buildcraft.com BuildCraft is
+	 * distributed under the terms of the Minecraft Mod Public License 1.0, or MMPL.
+	 * Please check the contents of the license located in
+	 * http://www.mod-buildcraft.com/MMPL-1.0.txt
+	 * 
+	 * Modified version of the BC BucketHandler, except using ItemStacks > Items
+	 * (Why?)
+	 * 
+	 * @author Alkalus
+	 */
+
+	public static class BucketHandler {
+
+		public static BucketHandler INSTANCE = new BucketHandler();
+
+		private BucketHandler() {
+
+		}
+
+		@SubscribeEvent
+		public void onBucketFill(FillBucketEvent event) {
+			ItemStack result = fillCustomBucket(event.world, event.target);
+			if (result == null) {
+				return;
+			}
+			event.result = result;
+			event.setResult(Result.ALLOW);
+		}
+
+		private ItemStack fillCustomBucket(World world, MovingObjectPosition pos) {
+			Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ);
+			ItemStack bucket = mBlockToBucketMap.get(block);
+			if (bucket != null && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) {
+				world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ);
+				return ItemUtils.getSimpleStack(bucket, 1);
+			} else {
+				return null;
+			}
+		}
+
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/fluids/FluidPackage.java b/src/Java/gtPlusPlus/core/fluids/FluidPackage.java
new file mode 100644
index 0000000000..29f831776b
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/fluids/FluidPackage.java
@@ -0,0 +1,83 @@
+package gtPlusPlus.core.fluids;
+
+import static gtPlusPlus.core.fluids.FluidFactory.mBlockToBucketMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mBlockToFluidMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mBlockToMetaMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mBlockToNameMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mBucketToBlockMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mBucketToFluidMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mBucketToMetaMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mBucketToNameMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mFluidToBlockMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mFluidToBucketMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mFluidToMetaMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mFluidToNameMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mMetaToBlockMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mMetaToBucketMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mMetaToColourMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mMetaToFluidMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mMetaToNameMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mNameToBlockMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mNameToBucketMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mNameToFluidMap;
+import static gtPlusPlus.core.fluids.FluidFactory.mNameToMetaMap;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+
+public class FluidPackage {
+
+
+	public final int mID;
+	public final String mName;
+	private final Fluid mFluid;
+	public final ItemStack mBucket;
+	public final Block mBlock;
+
+	public FluidPackage(int aID, String aName, Fluid aFluid, ItemStack aBucket, Block aBlock) {
+
+		mNameToFluidMap.put(aName, aFluid);
+		mNameToBucketMap.put(aName, aBucket);
+		mNameToBlockMap.put(aName, aBlock);
+		mNameToMetaMap.put(aName, aID);
+
+		mFluidToNameMap.put(aFluid, aName);
+		mFluidToBucketMap.put(aFluid, aBucket);
+		mFluidToBlockMap.put(aFluid, aBlock);
+		mFluidToMetaMap.put(aFluid, aID);
+
+		mBucketToFluidMap.put(aBucket, aFluid);
+		mBucketToNameMap.put(aBucket, aName);
+		mBucketToBlockMap.put(aBucket, aBlock);
+		mBucketToMetaMap.put(aBucket, aID);
+
+		mBlockToNameMap.put(aBlock, aName);
+		mBlockToFluidMap.put(aBlock, aFluid);
+		mBlockToBucketMap.put(aBlock, aBucket);
+		mBlockToMetaMap.put(aBlock, aID);	
+
+		mMetaToNameMap.put(aID, aName);
+		mMetaToFluidMap.put(aID, aFluid);
+		mMetaToBucketMap.put(aID, aBucket);
+		mMetaToBlockMap.put(aID, aBlock);
+		
+		mMetaToColourMap.put(aID, aFluid.getColor());
+		
+		mID = aID;
+		mName = aName;
+		mFluid = aFluid;
+		mBucket = aBucket;
+		mBlock = aBlock;
+
+	}
+	
+	public Fluid get() {
+		return mFluid;
+	}
+	
+	public boolean valid() {
+		return mName != null && mName.length() > 0 && mFluid != null && mBucket != null && mBlock != null;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/fluids/GenericFluid.java b/src/Java/gtPlusPlus/core/fluids/GenericFluid.java
deleted file mode 100644
index 4f1f5df006..0000000000
--- a/src/Java/gtPlusPlus/core/fluids/GenericFluid.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package gtPlusPlus.core.fluids;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.block.Block;
-
-import gtPlusPlus.core.item.base.itemblock.ItemBlockFluid;
-import gtPlusPlus.core.material.Material;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-
-public class GenericFluid extends Fluid{
-
-	protected final String fluidName;
-	protected final Fluid fluidFactory;
-	protected final Block blockFactory;
-	protected final short[] rgba;
-
-	public GenericFluid(final String displayName, final String fluidName, final int luminosity, final int density, final int temperature, final int viscosity, final boolean isGas, final short[] rgba) {
-		super(fluidName);
-		this.fluidFactory = this;
-		this.rgba = rgba;
-		this.fluidName = fluidName;
-		this.fluidFactory.setLuminosity(luminosity);
-		this.fluidFactory.setDensity(density);
-		this.fluidFactory.setTemperature(temperature);
-		this.fluidFactory.setViscosity(viscosity);
-		this.fluidFactory.setGaseous(isGas);
-		this.fluidFactory.setUnlocalizedName("fluid"+fluidName);
-		FluidRegistry.registerFluid(this.fluidFactory);
-		this.blockFactory = new BlockFluidBase(displayName, this.fluidFactory, rgba).setBlockName("fluidblock"+fluidName);
-		GameRegistry.registerBlock(this.blockFactory, ItemBlockFluid.class, this.blockFactory.getUnlocalizedName().substring(5));
-		this.fluidFactory.setBlock(this.blockFactory);
-
-		//fluidFactory.setUnlocalizedName(blockFactory.getUnlocalizedName());
-
-	}
-
-	public GenericFluid(final Material fluidMaterial, final int luminosity, final int density, final int temperature, final int viscosity, final boolean isGas) {
-
-		super(fluidMaterial.getUnlocalizedName());
-		//IC2_ItemFluidCell fullFluidCell = emptyCell.fill(emptyCell, FluidUtils.getFluidStack(getUnlocalizedName(), 1), true);
-
-		this.fluidFactory = this;
-		this.rgba = fluidMaterial.getRGBA();
-		this.fluidName = fluidMaterial.getUnlocalizedName();
-		this.fluidFactory.setLuminosity(luminosity);
-		this.fluidFactory.setDensity(density);
-		this.fluidFactory.setTemperature(temperature);
-		this.fluidFactory.setViscosity(viscosity);
-		this.fluidFactory.setGaseous(isGas);
-		this.fluidFactory.setUnlocalizedName("fluid"+this.fluidName);
-		FluidRegistry.registerFluid(this.fluidFactory);
-		this.blockFactory = new BlockFluidBase(this.fluidFactory, fluidMaterial).setBlockName("fluidblock"+this.fluidName);
-		GameRegistry.registerBlock(this.blockFactory, ItemBlockFluid.class, this.blockFactory.getUnlocalizedName().substring(5));
-		this.fluidFactory.setBlock(this.blockFactory);
-		//IC2_ItemFluidCell emptyCell = new IC2_ItemFluidCell(fluidName);
-		/*if (aFullContainer != null && aEmptyContainer != null && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
-			GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
-		}*/
-		//fluidFactory.setUnlocalizedName(blockFactory.getUnlocalizedName());
-
-	}
-
-	@Override
-	public int getColor() {
-		return (Math.max(0, Math.min(255, this.rgba[0])) << 16) | (Math.max(0, Math.min(255, this.rgba[1])) << 8) | Math.max(0, Math.min(255, this.rgba[2]));
-	}
-
-}
diff --git a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
new file mode 100644
index 0000000000..d41fccb3ed
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java
@@ -0,0 +1,318 @@
+package gtPlusPlus.core.fluids;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import cpw.mods.fml.common.eventhandler.Event;
+import gtPlusPlus.api.objects.GregtechException;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBucket;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.FillBucketEvent;
+
+public class ItemGenericFluidBucket extends ItemBucket {
+
+	private static IIcon mBaseBucketTexture;
+	private static IIcon mOverlayBucketTexture;	
+	private static AutoMap<Block> mInternalFluidCache = new AutoMap<Block>();	
+	
+	public ItemGenericFluidBucket(Block aFluid) {
+		super(aFluid);
+		this.setContainerItem(Items.bucket);
+		this.maxStackSize = 1;
+		mInternalFluidCache.put(aFluid);
+	}
+	
+	public static ItemStack registerFluidForBucket(int aID) {
+		
+		if (FluidFactory.mMetaToBucketMap.containsKey(aID)) {
+			try {
+				throw new GregtechException(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName());
+			} catch (GregtechException e) {
+				System.exit(0);
+			}
+		}		
+		mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID));
+		return ItemUtils.simpleMetaStack(FluidFactory.mGenericBucket, aID, 1);
+	}
+
+	Map<Integer, IIcon> mIconCache = new LinkedHashMap<Integer, IIcon>();
+
+	/**
+	 * Called whenever this item is equipped and the right mouse button is pressed.
+	 * Args: itemStack, world, entityPlayer
+	 */
+	public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+
+		Block isFull = FluidFactory.mMetaToBlockMap.get(aStack.getItemDamage());
+
+		boolean flag = isFull == Blocks.air;
+		MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(aWorld, aPlayer, flag);
+
+		if (movingobjectposition == null || isFull == null) {
+			return aStack;
+		} else {
+			FillBucketEvent event = new FillBucketEvent(aPlayer, aStack, aWorld, movingobjectposition);
+			if (MinecraftForge.EVENT_BUS.post(event)) {
+				return aStack;
+			}
+
+			if (event.getResult() == Event.Result.ALLOW) {
+				if (aPlayer.capabilities.isCreativeMode) {
+					return aStack;
+				}
+
+				if (--aStack.stackSize <= 0) {
+					return event.result;
+				}
+
+				if (!aPlayer.inventory.addItemStackToInventory(event.result)) {
+					aPlayer.dropPlayerItemWithRandomChoice(event.result, false);
+				}
+
+				return aStack;
+			}
+			if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
+				int i = movingobjectposition.blockX;
+				int j = movingobjectposition.blockY;
+				int k = movingobjectposition.blockZ;
+
+				if (!aWorld.canMineBlock(aPlayer, i, j, k)) {
+					return aStack;
+				}
+
+				if (flag) {
+					if (!aPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, aStack)) {
+						return aStack;
+					}
+
+					Material material = aWorld.getBlock(i, j, k).getMaterial();
+					int l = aWorld.getBlockMetadata(i, j, k);
+
+					if (material == Material.water && l == 0) {
+						aWorld.setBlockToAir(i, j, k);
+						return this.func_150910_a(aStack, aPlayer, Items.water_bucket);
+					}
+
+					if (material == Material.lava && l == 0) {
+						aWorld.setBlockToAir(i, j, k);
+						return this.func_150910_a(aStack, aPlayer, Items.lava_bucket);
+					}
+				} else {
+					if (isFull == Blocks.air) {
+						return new ItemStack(Items.bucket);
+					}
+
+					if (movingobjectposition.sideHit == 0) {
+						--j;
+					}
+
+					if (movingobjectposition.sideHit == 1) {
+						++j;
+					}
+
+					if (movingobjectposition.sideHit == 2) {
+						--k;
+					}
+
+					if (movingobjectposition.sideHit == 3) {
+						++k;
+					}
+
+					if (movingobjectposition.sideHit == 4) {
+						--i;
+					}
+
+					if (movingobjectposition.sideHit == 5) {
+						++i;
+					}
+
+					if (!aPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, aStack)) {
+						return aStack;
+					}
+
+					if (this.tryPlaceContainedLiquid(isFull, aWorld, i, j, k) && !aPlayer.capabilities.isCreativeMode) {
+						return new ItemStack(Items.bucket);
+					}
+				}
+			}
+
+			return aStack;
+		}
+	}
+
+	private ItemStack func_150910_a(ItemStack p_150910_1_, EntityPlayer p_150910_2_, Item p_150910_3_) {
+		if (p_150910_2_.capabilities.isCreativeMode) {
+			return p_150910_1_;
+		} else if (--p_150910_1_.stackSize <= 0) {
+			return new ItemStack(p_150910_3_);
+		} else {
+			if (!p_150910_2_.inventory.addItemStackToInventory(new ItemStack(p_150910_3_))) {
+				p_150910_2_.dropPlayerItemWithRandomChoice(new ItemStack(p_150910_3_, 1, 0), false);
+			}
+
+			return p_150910_1_;
+		}
+	}
+
+	/**
+	 * Attempts to place the liquid contained inside the bucket.
+	 */
+	public boolean tryPlaceContainedLiquid(Block isFull, World aWorld, int aX, int aY, int aZ) {
+		if (isFull == Blocks.air) {
+			return false;
+		} else {
+			Material material = aWorld.getBlock(aX, aY, aZ).getMaterial();
+			boolean flag = !material.isSolid();
+
+			if (!aWorld.isAirBlock(aX, aY, aZ) && !flag) {
+				return false;
+			} else {
+
+				if (!aWorld.isRemote && flag && !material.isLiquid()) {
+					aWorld.func_147480_a(aX, aY, aZ, true);
+				}
+
+				aWorld.setBlock(aX, aY, aZ, isFull, 0, 3);
+
+				return true;
+			}
+		}
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int aMeta) {
+		IIcon aTemp = mIconCache.get(aMeta);
+		return aTemp != null ? aTemp : super.getIconFromDamage(aMeta);
+	}
+
+	@Override
+	public boolean getHasSubtypes() {
+		return mInternalFluidCache.size() > 0;
+	}
+
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+		list.add(new ItemStack(item, 1, 0));			
+			for (Block f : mInternalFluidCache) {
+				Integer aMeta;
+				if (f != null) {
+					aMeta = FluidFactory.mBlockToMetaMap.get(f);
+					if (aMeta != null) {
+						list.add(new ItemStack(item, 1, aMeta));						
+					}
+				}			
+			}		
+	}
+
+	@Override
+	public int getMaxDamage() {
+		return 512;
+	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) {
+		// TODO Auto-generated method stub
+		super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public boolean isRepairable() {
+		return false;
+	}
+
+	@Override
+	public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {		
+		if (stack != null && renderPass == 1) {
+			return mOverlayBucketTexture;
+		}
+		else {
+			return mBaseBucketTexture;
+		}		
+		/*IIcon aTemp = mIconCache.get(stack.getItemDamage());
+		return aTemp != null ? aTemp : super.getIcon(stack, renderPass, player, usingItem, useRemaining);*/
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getMaxDamage(ItemStack stack) {
+		return 512;
+	}
+
+	@Override
+	public boolean isDamaged(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}	
+	
+	@Override
+	public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
+		if (pass == 1) {
+			return mOverlayBucketTexture;
+		}
+		else {
+			return mBaseBucketTexture;
+		}
+	}
+
+	@Override
+	public void registerIcons(final IIconRegister i) {
+		mBaseBucketTexture = i.registerIcon("bucket_empty");
+		mOverlayBucketTexture = i.registerIcon(CORE.MODID+":bucket.generic.overlay");		
+	}
+
+	@Override
+	public boolean tryPlaceContainedLiquid(World p_77875_1_, int p_77875_2_, int p_77875_3_, int p_77875_4_) {
+		return tryPlaceContainedLiquid(Blocks.air, p_77875_1_, p_77875_2_, p_77875_3_, p_77875_4_);
+	}
+
+	@Override
+	public int getColorFromItemStack(ItemStack aStack, int aPass) {
+		if (aPass == 0) {
+			return super.getColorFromItemStack(aStack, aPass);
+		}
+		else {
+			return FluidFactory.mMetaToColourMap.get(aStack.getItemDamage());
+		}
+	}
+
+	@Override
+	public boolean requiresMultipleRenderPasses() {
+		return true;
+	}
+	
+
+}
diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
index f4669bfe35..ed347e8d30 100644
--- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
+++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java
@@ -331,7 +331,7 @@ public class GuiBaseGrindle extends GuiContainer {
 			try {			 
 				r = (ResourceLocation) ReflectionUtils.getField(GuiScreenBook.class, "bookGuiTextures").get(null);
 
-			} catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
+			} catch (IllegalArgumentException | IllegalAccessException e) {
 				r = new ResourceLocation("textures/gui/book.png");
 			}
 			mBookTexture = r;
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java
index 7a3a01b27c..8a1f7c3fe9 100644
--- a/src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java
@@ -16,6 +16,7 @@ import com.google.common.collect.Lists;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiOptionButton;
 import net.minecraft.client.gui.GuiResourcePackAvailable;
@@ -145,9 +146,9 @@ public class GUI_ScrollTest extends GuiScreen
 
                 try
                 {
-                    Class<?> oclass = Class.forName("java.awt.Desktop");
-                    Object object = oclass.getMethod("getDesktop", new Class[0]).invoke((Object)null, new Object[0]);
-                    oclass.getMethod("browse", new Class[] {URI.class}).invoke(object, new Object[] {file1.toURI()});
+                    Class<?> oclass = ReflectionUtils.getClass("java.awt.Desktop");
+                    Object object = ReflectionUtils.getMethod(oclass, "getDesktop", new Class[0]).invoke((Object)null, new Object[0]);
+                    ReflectionUtils.getMethod(oclass, "browse", new Class[] {URI.class}).invoke(object, new Object[] {file1.toURI()});
                 }
                 catch (Throwable throwable)
                 {
diff --git a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
new file mode 100644
index 0000000000..482ca66f09
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -0,0 +1,417 @@
+package gtPlusPlus.core.handler;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
+import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_Log;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.Achievement;
+import net.minecraft.stats.StatBase;
+import net.minecraftforge.common.AchievementPage;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
+
+public class AchievementHandler {
+	
+	public ConcurrentHashMap<String, Achievement> achievementList = new ConcurrentHashMap<String, Achievement>();
+	public ConcurrentHashMap<String, Boolean> issuedAchievements = new ConcurrentHashMap<String, Boolean>();
+	
+	public int adjX = 5;
+	public int adjY = 9;
+	
+	private static final String aBaseAchievementName = "gtpp.start";
+
+	public AchievementHandler() {		
+		
+		Logger.INFO("Initializing GT++ achievements");
+		GT_Log.out.println("Initializing GT++ achievements");
+		
+		//register first
+		this.registerAchievement(aBaseAchievementName, 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Neutronium, Materials.Osmium, null), "", true);
+	       
+		//Useful Info
+		boolean cores = CORE.ConfigSwitches.requireControlCores;
+		if (cores || GregtechMeta_MultiBlockBase.DEBUG_DISABLE_CORES_TEMPORARILY) {
+			this.registerAchievement("hatch.control", -2, -2, GregtechItemList.Hatch_Control_Core.get(1), aBaseAchievementName, false);			
+		}
+		this.registerAchievement("hatch.dynamo.buffered", 2, -2, GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1), aBaseAchievementName, false);
+		//First multi anyone really needs
+		this.registerAchievement("multi.abs", -4, -2, GregtechItemList.Industrial_AlloyBlastSmelter.get(1), cores ? "hatch.control" : aBaseAchievementName, true);
+		
+		//Material Advancement
+		this.registerAchievement("dust.potin", 0, 2, ALLOY.POTIN.getDust(1), aBaseAchievementName, false);
+		this.registerAchievement("dust.eglin", 0, 4, ALLOY.EGLIN_STEEL.getDust(1), "dust.potin", false);
+		this.registerAchievement("dust.staballoy", 0, 6, ALLOY.STABALLOY.getDust(1), "dust.eglin", false);
+		this.registerAchievement("dust.quantum", 0, 8, ALLOY.QUANTUM.getDust(1), "dust.staballoy", true);
+		this.registerAchievement("dust.hypogen", 0, 10, ELEMENT.STANDALONE.HYPOGEN.getDust(1), "dust.quantum", true);
+		
+		
+		//Blocks
+		this.registerAchievement("block.fishtrap", -2, 2, ItemUtils.getSimpleStack(ModBlocks.blockFishTrap), "dust.potin", false);
+		this.registerAchievement("block.withercage", -2, 4, ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard), "dust.eglin", false);
+		
+		
+		//Machines (-10/-8/-6)
+		this.registerAchievement("rtg", -16, -10, GregtechItemList.RTG.get(1), aBaseAchievementName, false);
+		this.registerAchievement("dehydrate", -15, -10, GregtechItemList.GT_Dehydrator_HV.get(1), aBaseAchievementName, false);
+		this.registerAchievement("semifluid", -14, -10, GregtechItemList.Generator_SemiFluid_HV.get(1), aBaseAchievementName, false);
+		this.registerAchievement("earlywasher", -13, -10, GregtechItemList.SimpleDustWasher.get(1), aBaseAchievementName, false);
+		this.registerAchievement("advancedsteam", -12, -10, GregtechItemList.Boiler_Advanced_MV.get(1), aBaseAchievementName, false);
+		this.registerAchievement("pollutionremoval", -11, -10, GregtechItemList.Pollution_Cleaner_IV.get(1), aBaseAchievementName, false);
+		this.registerAchievement("hiampxform", -10, -10, GregtechItemList.Transformer_HA_HV_MV.get(1), aBaseAchievementName, false);		
+		
+		
+		//Multis (-4/-2/0)
+		this.registerAchievement("multi.pss", -16, -7, GregtechItemList.PowerSubStation.get(1), "multi.abs", false);
+		this.registerAchievement("multi.cyclo", -15, -7, GregtechItemList.COMET_Cyclotron.get(1), "multi.abs", false);
+		this.registerAchievement("multi.sifter", -14, -7, GregtechItemList.Industrial_Sifter.get(1), "dust.eglin", false);
+		this.registerAchievement("multi.cokeoven", -13, -7, GregtechItemList.Industrial_CokeOven.get(1), "multi.abs", false);
+		this.registerAchievement("multi.boiler.thermal", -12, -7, GregtechItemList.GT4_Thermal_Boiler.get(1), "multi.abs", false);
+		this.registerAchievement("multi.zhuhai", -11, -7, GregtechItemList.Industrial_FishingPond.get(1), aBaseAchievementName, false);
+		//this.registerAchievement("rtg", -4, -4, GregtechItemList.RTG.get(1), aBaseAchievementName, false);
+		
+		//Casings
+		this.registerAchievement("casing.abs", 2, -10, GregtechItemList.Casing_Coil_BlastSmelter.get(1), aBaseAchievementName, false);
+		this.registerAchievement("casing.cyclotron.coil", 3, -10, GregtechItemList.Casing_Cyclotron_Coil.get(1), aBaseAchievementName, false);
+		this.registerAchievement("casing.multiuse", 4, -10, GregtechItemList.Casing_Multi_Use.get(1), aBaseAchievementName, false);
+		this.registerAchievement("casing.containment", 5, -10, GregtechItemList.Casing_Containment.get(1), aBaseAchievementName, false);
+		
+		
+		
+		
+		
+		
+		
+		
+		//Radioactive
+		this.registerAchievement("decay.neptunium238", 11, 8, ItemUtils.getSimpleStack(ModItems.dustNeptunium238), "multi.cyclo", false);
+		this.registerAchievement("decay.radium226", 12, 8, ItemUtils.getSimpleStack(ModItems.dustRadium226), "multi.cyclo", false);
+		this.registerAchievement("decay.molybdenum99", 13, 8, ItemUtils.getSimpleStack(ModItems.dustMolybdenum99), "multi.cyclo", false);
+		this.registerAchievement("decay.technetium99m", 14, 8, ItemUtils.getSimpleStack(ModItems.dustTechnetium99M), "multi.cyclo", false);
+		this.registerAchievement("decay.technetium99", 15, 8, ItemUtils.getSimpleStack(ModItems.dustTechnetium99), "multi.cyclo", false);
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+			AchievementPage.registerAchievementPage(
+					new AchievementPage("GT++", (Achievement[]) ((Achievement[]) this.achievementList.values()
+							.toArray(new Achievement[this.achievementList.size()]))));
+			MinecraftForge.EVENT_BUS.register(this);
+			FMLCommonHandler.instance().bus().register(this);
+		
+
+	}
+
+	public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement,
+			boolean special) {
+			Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon, requirement);
+			if (special) {
+				achievement.setSpecial();
+			}
+
+			achievement.registerStat();
+			if (CORE.DEVENV) {
+				GT_Log.out.println("achievement." + textId + "=");
+				GT_Log.out.println("achievement." + textId + ".desc=");
+			}
+
+			this.achievementList.put(textId, achievement);
+			return achievement;		
+	}
+
+	public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, String requirement,
+			boolean special) {
+			Achievement achievement = new Achievement(textId, textId, this.adjX + x, this.adjY + y, icon,
+					this.getAchievement(requirement));
+			if (special) {
+				achievement.setSpecial();
+			}
+
+			achievement.registerStat();
+			if (CORE.DEVENV) {
+				GT_Log.out.println("achievement." + textId + "=");
+				GT_Log.out.println("achievement." + textId + ".desc=");
+			}
+
+			this.achievementList.put(textId, achievement);
+			return achievement;		
+	}
+
+	public void issueAchievement(EntityPlayer entityplayer, String textId) {
+		if (entityplayer != null) {
+			entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId));
+		}
+	}
+
+	public Achievement getAchievement(String textId) {
+		return this.achievementList.containsKey(textId) ? (Achievement) this.achievementList.get(textId) : null;
+	}
+
+	
+	/**
+	 * A generic handler that will give an achievement for an item.
+	 * Useful to only write this once, then call it from all handlers.
+	 * @param aStack - The Itemstack to check for achievements.
+	 * @param aPlayer - The player to unlock for.
+	 */
+	private void handleAchivement(ItemStack aStack, EntityPlayer aPlayer) {
+		
+		if (aPlayer != null && aStack != null) {			
+			/*
+			 * Copy this to all events because I am lazy - Alk 2019
+			 */
+
+			//Safe name
+			String aUnlocalName = ItemUtils.getUnlocalizedItemName(aStack);
+			
+			
+			boolean isValid = false;			
+			//Check if valid name // mod
+			String aModID = ItemUtils.getModId(aStack);		
+			
+			if (aModID == null || aModID.length() <= 0 || aModID.isEmpty()) {
+				return;
+			}			
+			
+			if (aModID != null && (ItemUtils.getModId(aStack).equals(CORE.MODID) || ItemUtils.getModId(aStack).equalsIgnoreCase("gregtech"))) {
+				isValid = true;
+			}		
+			if (!isValid) {
+				return;
+			}
+			
+			//Should unlock base achievement from *ANY* GT++ item. (Too lazy to special case GT machineBlocks though)
+			if (ItemUtils.getModId(aStack).equals(CORE.MODID)) {
+				this.issueAchievement(aPlayer, aBaseAchievementName);
+			}
+			
+			if (aUnlocalName.contains("item.")) {
+				aUnlocalName = aUnlocalName.substring(5);
+			}
+			else if (aUnlocalName.contains("tile.")) {
+				aUnlocalName = aUnlocalName.substring(5);
+			}			
+			
+			//Logger.INFO("Picked up "+aUnlocalName);
+			
+			
+			/**
+			 * Misc Blocks
+			 */
+			
+			if (aUnlocalName.equals("blockFishTrap")) {
+				this.issueAchievement(aPlayer, "block.fishtrap");				
+			}			
+			if (aUnlocalName.equals("blockBlackGate")) {
+				this.issueAchievement(aPlayer, "block.withercage");				
+			}			
+			
+			
+			/**
+			 * Decayables
+			 */			
+			if (aUnlocalName.equals("dustNeptunium238")) {
+				this.issueAchievement(aPlayer, "decay.neptunium238");				
+			}			
+			else if (aUnlocalName.equals("dustRadium226")) {
+				this.issueAchievement(aPlayer, "decay.radium226");				
+			}			
+			else if (aUnlocalName.equals("dustMolybdenum99")) {
+				this.issueAchievement(aPlayer, "decay.molybdenum99");				
+			}			
+			else if (aUnlocalName.equals("dustTechnetium99M")) {
+				this.issueAchievement(aPlayer, "decay.technetium99m");				
+			}			
+			else if (aUnlocalName.equals("dustTechnetium99")) {
+				this.issueAchievement(aPlayer, "decay.technetium99");				
+			}
+
+			/**
+			 * Random Materials worthy of Achievements
+			 */
+			else if (aUnlocalName.equals("itemDustPotin")) {
+				this.issueAchievement(aPlayer, "dust.potin");				
+			}
+			else if (aUnlocalName.equals("itemDustEglinSteel")) {
+				this.issueAchievement(aPlayer, "dust.eglin");				
+			}
+			else if (aUnlocalName.equals("itemDustStaballoy")) {
+				this.issueAchievement(aPlayer, "dust.staballoy");				
+			}
+			else if (aUnlocalName.equals("itemDustQuantum")) {
+				this.issueAchievement(aPlayer, "dust.quantum");				
+			}
+			else if (aUnlocalName.equals("itemDustHypogen")) {
+				this.issueAchievement(aPlayer, "dust.hypogen");
+			}
+
+
+
+			/**
+			 * Machines
+			 */
+
+			else if (aUnlocalName.startsWith("gt.blockmachines.")) {				
+				
+				//Readability
+				String aStartsWith = "gt.blockmachines.";				
+				
+				/**
+				 * Single Blocks
+				 */
+				
+				//RTG				
+				if (aUnlocalName.startsWith(aStartsWith + "basicgenerator.rtg")) {
+					this.issueAchievement(aPlayer, "rtg");
+				} 			
+				//Dehydrator
+				else if (aUnlocalName.startsWith(aStartsWith + "machine.dehydrator.tier.")) {
+					this.issueAchievement(aPlayer, "dehydrate");
+				}  			
+				//SemiFluids
+				else if (aUnlocalName.startsWith(aStartsWith + "basicgenerator.semifluid.tier.")) {
+					this.issueAchievement(aPlayer, "semifluid");
+				}  			
+				//Simple Washer
+				else if (aUnlocalName.startsWith(aStartsWith + "simplewasher.01.tier.")) {
+					this.issueAchievement(aPlayer, "earlywasher");
+				}  			
+				//Advanced Boilers
+				else if (aUnlocalName.startsWith(aStartsWith + "electricboiler.")) {
+					this.issueAchievement(aPlayer, "advancedsteam");
+				}
+				//Scrubers
+				else if (aUnlocalName.startsWith(aStartsWith + "pollutioncleaner.01.tier.")) {
+					this.issueAchievement(aPlayer, "pollutionremoval");
+				}				
+				//High-amp xformers
+				else if (aUnlocalName.startsWith(aStartsWith + "transformer.ha.tier.")) {
+					this.issueAchievement(aPlayer, "hiampxform");
+				} 
+				//Buffered Dynamos
+				else if (aUnlocalName.startsWith(aStartsWith + "hatch.dynamo.buffer.tier.")) {
+					this.issueAchievement(aPlayer, "hatch.dynamo.buffered");
+				}
+				//Control Core Hatch
+				else if (aUnlocalName.startsWith(aStartsWith + "hatch.control.adv")) {
+					this.issueAchievement(aPlayer, "hatch.control");
+				}  
+				
+				
+				
+				/**
+				 * Multis
+				 */				
+				
+				//ABS
+				else if (aUnlocalName.equals(aStartsWith + "industrialsalloyamelter.controller.tier.single")) {
+					this.issueAchievement(aPlayer, "multi.abs");
+				}				
+				//PSS
+				else if (aUnlocalName.equals(aStartsWith + "substation.01.input.single")) {
+					this.issueAchievement(aPlayer, "multi.pss");
+				}				
+				//Cyclotron
+				else if (aUnlocalName.startsWith(aStartsWith + "cyclotron.tier.single")) {
+					this.issueAchievement(aPlayer, "multi.cyclo");
+				}				
+				//Sifter
+				else if (aUnlocalName.equals(aStartsWith + "industrialsifter.controller.tier.single")) {
+					this.issueAchievement(aPlayer, "multi.sifter");
+				}				
+				//Coke Oven
+				else if (aUnlocalName.equals(aStartsWith + "industrialcokeoven.controller.tier.single")) {
+					this.issueAchievement(aPlayer, "multi.cokeoven");
+				}				
+				//Thermal Boiler
+				else if (aUnlocalName.equals(aStartsWith + "gtplusplus.thermal.boiler")) {
+					this.issueAchievement(aPlayer, "multi.boiler.thermal");
+				}				
+				//Zhuhai
+				else if (aUnlocalName.equals(aStartsWith + "industrial.fishpond.controller.tier.single")) {
+					this.issueAchievement(aPlayer, "multi.zhuhai");
+				} 
+				
+			}
+
+			/**
+			 * Casings
+			 */
+			
+			else if (aUnlocalName.equals("gtplusplus.blockcasings.14")) {
+				this.issueAchievement(aPlayer, "casing.abs");
+			} 
+			
+			else if (aUnlocalName.equals("gtplusplus.blockcasings.2.9")) {
+				this.issueAchievement(aPlayer, "casing.cyclotron.coil");
+			} 
+
+			else if (aUnlocalName.equals("gtplusplus.blockcasings.3.2")) {
+				this.issueAchievement(aPlayer, "casing.multiuse");
+			}
+			else if (aUnlocalName.equals("gtplusplus.blockcasings.3.15")) {
+				this.issueAchievement(aPlayer, "casing.containment");
+			}
+		}
+	}
+	
+	
+	
+	
+	/*
+	 * Handle achievements for all vanilla types of obtianment.
+	 */
+	
+	
+
+	@SubscribeEvent
+	public void onCrafting(ItemCraftedEvent event) {
+		EntityPlayer player = event.player;
+		ItemStack stack = event.crafting;
+		if (player != null && stack != null) {
+			handleAchivement(stack, player);
+		}
+	}
+
+	@SubscribeEvent
+	public void onSmelting(ItemSmeltedEvent event) {
+		EntityPlayer player = event.player;
+		ItemStack stack = event.smelting;
+		if (player != null && stack != null) {
+			handleAchivement(stack, player);
+		}
+	}
+
+	@SubscribeEvent
+	public void onItemPickup(EntityItemPickupEvent event) {
+		EntityPlayer player = event.entityPlayer;
+		ItemStack stack = event.item.getEntityItem();
+		if (player != null && stack != null) {
+			handleAchivement(stack, player);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index f6735de8e4..1e3cb0ffbb 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -4,11 +4,13 @@ import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
 
 import java.util.*;
 
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.common.compat.*;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
@@ -19,6 +21,7 @@ import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.recipe.*;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
 import net.minecraft.item.ItemStack;
@@ -39,7 +42,7 @@ public class COMPAT_HANDLER {
 		GT_OreDictUnificator.registerOre("craftingToolSandHammer", new ItemStack(ModItems.itemSandstoneHammer));
 
 		for(int i=1; i<=10; i++){
-			GT_OreDictUnificator.registerOre("bufferCore_"+GT_Values.VN[i-1], new ItemStack(ItemUtils.getItem("miscutils:item.itemBufferCore"+i)));
+			GT_OreDictUnificator.registerOre("bufferCore_"+GT_Values.VN[i-1], new ItemStack(ItemUtils.getItemFromFQRN("miscutils:item.itemBufferCore"+i)));
 		}
 	}
 
@@ -204,11 +207,21 @@ public class COMPAT_HANDLER {
 				}
 			}
 		}
-		RecipeGen_Recycling.executeGenerators();		
+		RecipeGen_Recycling.executeGenerators();	
+		runQueuedMisc();
+	}
+	
+
+
+	public static void onLoadComplete(FMLLoadCompleteEvent event) {
+		runQueuedOnLoadComplete(event);
 	}
 
 	public static final AutoMap<RunnableWithInfo<String>> mRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>();
-	public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>();
+	public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>();	
+
+	public static final AutoMap<RunnableWithInfo<String>> mObjectsToRunInPostInit = new AutoMap<RunnableWithInfo<String>>();
+	public static final AutoMap<ItemPackage> mObjectsToRunInOnLoadComplete = new AutoMap<ItemPackage>();
 
 	public static void runQueuedRecipes() {
 		//Add autogenerated Recipes from Item Components
@@ -233,4 +246,33 @@ public class COMPAT_HANDLER {
 
 		}
 	}
+	
+	public static void runQueuedMisc() {
+		for (RunnableWithInfo<String> m : mObjectsToRunInPostInit) {
+			try {
+				m.run();
+			}
+			catch (Throwable t) {
+				t.printStackTrace();
+				Logger.INFO("[ERROR] "+m.getInfoData());
+			}
+
+		}
+	}
+	
+	/**
+	 * Generally used to register GT recipe map changes after they've been populated.
+	 */
+	public static void runQueuedOnLoadComplete(FMLLoadCompleteEvent event) {
+		for (ItemPackage m : mObjectsToRunInOnLoadComplete) {
+			try {
+				m.onLoadComplete(event);
+			}
+			catch (Throwable t) {
+				t.printStackTrace();
+				Logger.INFO("[ERROR] "+m.getInfoData());
+			}
+
+		}
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index 79a2d2a6c0..0f689325a3 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -1,6 +1,10 @@
 package gtPlusPlus.core.handler;
 
+import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import gtPlusPlus.xmod.bartcrops.HANDLER_CropsPlusPlus;
 import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty;
 import gtPlusPlus.xmod.computronics.HANDLER_Computronics;
 import gtPlusPlus.xmod.forestry.HANDLER_FR;
@@ -15,7 +19,7 @@ import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers;
 
 public class COMPAT_IntermodStaging {
 
-	public static void preInit(){
+	public static void preInit(FMLPreInitializationEvent preinit){
 		HANDLER_GT.preInit();
 		HANDLER_GC.preInit();
 		HANDLER_TF.preInit();
@@ -28,9 +32,10 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Tinkers.preInit();
 		HANDLER_SC2.preInit();
 		HANDLER_GalactiCraft.preInit();
+		HANDLER_CropsPlusPlus.preInit(preinit);
 	}
 
-	public static void init(){
+	public static void init(FMLInitializationEvent init){
 		HANDLER_GT.init();
 		HANDLER_GC.init();
 		HANDLER_TF.init();
@@ -43,9 +48,10 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Tinkers.init();
 		HANDLER_SC2.init();
 		HANDLER_GalactiCraft.init();
+		HANDLER_CropsPlusPlus.init(init);
 	}
 
-	public static void postInit(){
+	public static void postInit(FMLPostInitializationEvent postinit){
 		HANDLER_GT.postInit();
 		HANDLER_GC.postInit();
 		HANDLER_TF.postInit();
@@ -58,6 +64,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Tinkers.postInit();
 		HANDLER_SC2.postInit();
 		HANDLER_GalactiCraft.postInit();
+		HANDLER_CropsPlusPlus.postInit(postinit);
 	}
 
 	public static void onLoadComplete(FMLLoadCompleteEvent event) {
diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
new file mode 100644
index 0000000000..b10e67aeaf
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.core.handler;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.stats.AchievementList;
+import net.minecraftforge.event.entity.player.AchievementEvent;
+
+public class StopAnnoyingFuckingAchievements {
+
+	/**
+	 * Stops me getting fireworks every fucking time I open my inventory upon first loading a dev client.
+	 * @param event
+	 */
+	@SubscribeEvent
+	public void FUCK_OFF(AchievementEvent event)	{
+		if (event.achievement.equals(AchievementList.openInventory)) {
+			if (MathUtils.randInt(0, 10) >= 9)
+				PlayerUtils.messagePlayer(event.entityPlayer, "Bang! Nah, Just joking, there's no fireworks. :)");
+			event.setCanceled(true);
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index 6c940371b3..ef91647c1a 100644
--- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -3,10 +3,16 @@ package gtPlusPlus.core.handler.events;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import gregtech.api.enums.ItemList;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.GTplusplus;
+import gtPlusPlus.GTplusplus.INIT_PHASE;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -22,8 +28,15 @@ public class GeneralTooltipEventHandler {
 	@SubscribeEvent
 	public void onItemTooltip(ItemTooltipEvent event){
 
+		
+		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED && GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
+			return;
+		}
+		if (event.itemStack == null) {
+			return;
+		}
 		if (CORE.ConfigSwitches.chanceToDropFluoriteOre > 0) {
-			if (!BlockEventHandler.blockLimestone.isEmpty()) {
+			if (BlockEventHandler.blockLimestone != null && !BlockEventHandler.blockLimestone.isEmpty()) {
 				for (ItemStack h : BlockEventHandler.blockLimestone) {
 					if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
 						if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
@@ -32,7 +45,7 @@ public class GeneralTooltipEventHandler {
 					}
 				}
 			}
-			if (!BlockEventHandler.oreLimestone.isEmpty()) {
+			if (BlockEventHandler.oreLimestone != null && !BlockEventHandler.oreLimestone.isEmpty()) {
 				for (ItemStack h : BlockEventHandler.oreLimestone) {
 					if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) {
 						if (ItemUtils.getModId(h) != null && !ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) {
@@ -43,6 +56,26 @@ public class GeneralTooltipEventHandler {
 			}
 		}
 
+		//Material Collector Tooltips		
+		if (ModBlocks.blockPooCollector != null && Block.getBlockFromItem(event.itemStack.getItem()) == ModBlocks.blockPooCollector) {			
+			//Normal
+			if (event.itemStack.getItemDamage() == 0) {
+				event.toolTip.add("Used to collect animal waste");
+				event.toolTip.add("Collects in a 5x4x5 area starting at Y+1");
+				event.toolTip.add("Use Hoppers/Pipes to empty");
+				event.toolTip.add(EnumChatFormatting.GOLD+"Capacity: "+EnumChatFormatting.AQUA+"8000L");
+			}
+			//Advanced
+			else {
+				event.toolTip.add("Used to collect waste (Works on more than animals)");
+				event.toolTip.add("Significantly faster than the simple version");
+				event.toolTip.add("Collects in a 5x4x5 area starting at Y+1");
+				event.toolTip.add("Use Hoppers/Pipes to empty");
+				event.toolTip.add(EnumChatFormatting.GOLD+"Capacity: "+EnumChatFormatting.AQUA+"128000L");
+			}
+		}
+		
+		
 
 		if (CORE.ConfigSwitches.enableAnimatedTurbines) {
 			boolean shift = false;					
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 8d7db4f40a..e8f0e31458 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -32,11 +32,14 @@ import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
 import gtPlusPlus.core.item.bauble.HealthBoostBauble;
 import gtPlusPlus.core.item.bauble.ModularBauble;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.CoalTar;
+import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.IonParticles;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.chemistry.StandardBaseParticles;
+import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.effects.RarityUncommon;
 import gtPlusPlus.core.item.general.BaseItemGrindle;
 import gtPlusPlus.core.item.general.BufferCore;
@@ -59,8 +62,10 @@ import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil;
 import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire;
 import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion;
 import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion;
+import gtPlusPlus.core.item.general.throwables.ItemThrowableBomb;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.materials.DustDecayable;
+import gtPlusPlus.core.item.tool.misc.DebugScanner;
 import gtPlusPlus.core.item.tool.misc.GregtechPump;
 import gtPlusPlus.core.item.tool.misc.SandstoneHammer;
 import gtPlusPlus.core.item.tool.misc.box.AutoLunchBox;
@@ -87,6 +92,7 @@ import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.GTplusplus_Everglades;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
@@ -217,6 +223,8 @@ public final class ModItems {
 	public static Item dustCalciumCarbonate;
 	public static Item dustLi2CO3CaOH2;
 	public static Item dustLi2BeF4;
+	
+	public static Item dustTumbagaMix;
 
 	public static Item dustAer;
 	public static Item dustIgnis;
@@ -304,7 +312,7 @@ public final class ModItems {
 
 	public static GregtechPump toolGregtechPump;
 
-	public static Item itemGenericToken;
+	public static ItemGenericToken itemGenericToken;
 
 	public static Item itemControlCore;
 
@@ -328,6 +336,15 @@ public final class ModItems {
 	public static BatteryPackBaseBauble itemChargePack3;
 	public static BatteryPackBaseBauble itemChargePack4;
 
+	public static DebugScanner itemDebugScanner;
+
+	public static ItemDummyResearch itemDummyResearch;
+
+	public static CoreItem itemBombCasing;
+	public static CoreItem itemBombUnf;
+	public static CoreItem itemDetCable;
+	public static ItemThrowableBomb itemBomb;
+
 	static {
 		Logger.INFO("Items!");
 		//Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon.
@@ -336,9 +353,13 @@ public final class ModItems {
 	}
 
 	public static final void init(){
+		
+		itemDebugScanner = new DebugScanner();
+		
 		itemAlkalusDisk = new BaseItemDamageable("itemAlkalusDisk", AddToCreativeTab.tabMisc, 1, 0, "Unknown Use", EnumRarity.rare, EnumChatFormatting.AQUA, false, null);
 		itemBigEgg = new ItemGiantEgg("itemBigEgg", "Ginourmous Chicken Egg", tabMisc, 64, 0, "I had best try disassemble this.. for science!", "fuelLargeChickenEgg", 5000, 0).setTextureName(CORE.MODID + ":itemBigEgg");
 		itemGenericToken = new ItemGenericToken();
+		itemDummyResearch = new ItemDummyResearch();
 		
 		//Debug Loading
 		if (CORE.DEBUG){
@@ -353,7 +374,7 @@ public final class ModItems {
 		//Some Simple forms of materials
 		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
 		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
-		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStack(CORE.MODID+":itemStickyRubber", 1));
+		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemStickyRubber", 1));
 
 
 		itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
@@ -689,7 +710,8 @@ public final class ModItems {
 		GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
 		//Zirconium Chloride
 		dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
-		dustCookedZrCl4 = ItemUtils.generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
+		dustCookedZrCl4 = ItemUtils.generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4", "ZrCl4", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf		
+		
 		//Zirconium Tetrafluoride
 		/*GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1));
 		GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1));*/
@@ -830,7 +852,9 @@ public final class ModItems {
 		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){
 			itemDoublePlateEuropium = new BaseItemPlateDouble(ELEMENT.getInstance().EUROPIUM);
 		}
-
+		
+		//Tumbaga Mix (For Simple Crafting)
+		dustTumbagaMix = ItemUtils.generateSpecialUseDusts("MixTumbaga", "Tumbaga Mix", "Au2Cu", Utils.rgbtoHexValue(255, 150, 80))[0];
 		
 		/*
 		 * Decayable Materials
@@ -863,12 +887,28 @@ public final class ModItems {
 		itemControlCore = new ItemControlCore();
 
 		//Chemistry
-		CoalTar.run();
-		RocketFuels.run();
+		new CoalTar();
+		new RocketFuels();
 		
 		//Nuclear Processing
-		NuclearChem.run();
-
+		new NuclearChem();
+		
+		//Farm Animal Fun
+		new AgriculturalChem();
+		
+		//General Chemistry
+		new GenericChem();
+		
+		
+		//Bombs
+		itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc);
+		itemBombCasing.setTextureName(CORE.MODID + ":bomb_casing");		
+		itemBombUnf = new CoreItem("itemBombUnf", "Bomb (unf)", tabMisc);
+		itemBombUnf.setTextureName(CORE.MODID + ":bomb_casing");		
+		itemDetCable = new CoreItem("itemDetCable", "Det. Cable", tabMisc);
+		itemDetCable.setTextureName("string");		
+		itemBomb = new ItemThrowableBomb();
+		
 		//Only used for debugging.
 		/*if (CORE.DEVENV) {
 			new ConnectedBlockFinder();
@@ -1002,7 +1042,7 @@ public final class ModItems {
 
 			//Baubles Mod Test
 			try {
-				final Class<?> baublesTest = Class.forName("baubles.api.IBauble");
+				final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble");
 				if (baublesTest != null){
 					COMPAT_Baubles.run();
 				}
@@ -1064,10 +1104,10 @@ public final class ModItems {
 	}
 	
 	public static void registerCustomTokens() {
-		ItemGenericToken.register(0, "BitCoin", 16, "Can be used on the dark web");
-		ItemGenericToken.register(1, "Hand Pump Trade Token I", 1, "Craft into a Tier I Hand pump");
-		ItemGenericToken.register(2, "Hand Pump Trade Token II", 1, "Craft into a Tier II Hand pump");
-		ItemGenericToken.register(3, "Hand Pump Trade Token III", 1, "Craft into a Tier III Hand pump");
-		ItemGenericToken.register(4, "Hand Pump Trade Token IV", 1, "Craft into a Tier IV Hand pump");
+		itemGenericToken.register(0, "BitCoin", 16, "Can be used on the dark web");
+		itemGenericToken.register(1, "Hand Pump Trade Token I", 1, "Craft into a Tier I Hand pump");
+		itemGenericToken.register(2, "Hand Pump Trade Token II", 1, "Craft into a Tier II Hand pump");
+		itemGenericToken.register(3, "Hand Pump Trade Token III", 1, "Craft into a Tier III Hand pump");
+		itemGenericToken.register(4, "Hand Pump Trade Token IV", 1, "Craft into a Tier IV Hand pump");
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 4dbb5851f2..ceeff7e655 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -8,6 +8,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
@@ -17,11 +18,12 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -66,9 +68,9 @@ public class BaseItemComponent extends Item{
 
 		GT_OreDictUnificator.registerOre(componentType.getOreDictName()+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
 		if (LoadedMods.Thaumcraft) {
-			ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), GTPP_Aspects.METALLUM, 1);
+			ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1);
 			if (componentMaterial.isRadioactive) {
-				ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), GTPP_Aspects.RADIO, 2);				
+				ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel);				
 			}
 		}
 		registerComponent();		
@@ -76,18 +78,28 @@ public class BaseItemComponent extends Item{
 
 	//For Cell Generation
 	public BaseItemComponent(final String unlocalName, final String localName, final short[] RGBA) {
+		
+		// Handles .'s from fluid internal names.
+		String aFormattedNameForFluids;
+		if (unlocalName.contains(".")) {			
+			aFormattedNameForFluids = StringUtils.splitAndUppercase(unlocalName, ".");						
+		}
+		else {
+			aFormattedNameForFluids = unlocalName;
+		}		
+		 	
 		this.componentMaterial = null;
-		this.unlocalName = "itemCell"+unlocalName;
+		this.unlocalName = "itemCell"+aFormattedNameForFluids;
 		this.materialName = localName;
 		this.componentType = ComponentTypes.CELL;
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
-		this.setUnlocalizedName(unlocalName);
+		this.setUnlocalizedName(aFormattedNameForFluids);
 		this.setMaxStackSize(64);
 		this.componentColour = MathUtils.getRgbAsHex(RGBA);
 		this.extraData = RGBA;
 		this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME);
-		GameRegistry.registerItem(this, unlocalName);
-		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+unlocalName, ItemUtils.getSimpleStack(this));
+		GameRegistry.registerItem(this, aFormattedNameForFluids);
+		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+aFormattedNameForFluids, ItemUtils.getSimpleStack(this));
 		registerComponent();
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java b/src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
index 84fae41bb0..96b5425437 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockFluid.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java
@@ -13,38 +13,30 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
-public class ItemBlockFluid extends ItemBlock{
+public class FluidItemBlock extends ItemBlock{
 
 	protected final int blockColour;
-	protected final int sRadiation;
-	protected Material thisFluid;
 	final BlockFluidBase baseBlock;
 	String name;
 
-	public ItemBlockFluid(final Block block) {
+	public FluidItemBlock(final Block block) {
 		super(block);
 		this.baseBlock = (BlockFluidBase) block;
 		this.blockColour = this.baseBlock.getRenderColor(1);
-		this.thisFluid = this.baseBlock.getFluidMaterial();
-		this.sRadiation=ItemUtils.getRadioactivityLevel(this.baseBlock.getUnlocalizedName());
 		this.name = this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
 		//GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), UtilsItems.getSimpleStack(this));
 	}
 
-	public final Material setFluidMaterial(final Material M){
-		return this.thisFluid=M;
-	}
-
 	public int getRenderColor(final int aMeta) {
 		return this.blockColour;
 	}
 
 	@Override
 	public String getItemStackDisplayName(final ItemStack iStack) {
-		if (this.thisFluid != null){
+		/*if (this.thisFluid != null){
 			this.name = "Molten "+this.thisFluid.getLocalizedName();
 			return this.name;
-		}
+		}*/
 		this.name = "Molten "+this.baseBlock.getLocalizedName().replace("tile", "").replace("fluid", "").replace("name", "").replace("block", "").replace(".", "");
 		return this.name;
 	}
@@ -55,24 +47,15 @@ public class ItemBlockFluid extends ItemBlock{
 			return MathUtils.generateSingularRandomHexValue();
 		}
 		return this.blockColour;
-
 	}
 
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K");
+		/*list.add("Temperature: "+MathUtils.celsiusToKelvin(this.thisFluid.getMeltingPointC())+"K");
 		if (this.sRadiation > 0){
 			list.add(CORE.GT_Tooltip_Radioactive);
-		}
+		}*/
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
-	public String GetProperName() {
-		String tempIngot;
-
-		tempIngot = "Molten "+this.baseBlock.getLocalizedName();
-
-		return tempIngot;
-	}
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 517e3f7c1f..396689ef63 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -15,6 +15,7 @@ import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
 
@@ -44,7 +45,16 @@ public class ItemBlockGtBlock extends ItemBlock {
 			this.blockColour = block.getBlockColor();
 		} else {
 			this.blockColour = block.getBlockColor();
+		}	
+
+		if (block instanceof BlockBaseModular){
+			BlockBaseModular g = (BlockBaseModular) block;
+			this.mMaterial = g.getMaterialEx();
+		}
+		else {
+			this.mMaterial = null;
 		}
+		
 		// GT_OreDictUnificator.registerOre("block"+block.getUnlocalizedName().replace("tile.block",
 		// "").replace("tile.", "").replace("of", "").replace("Of", "").replace("Block",
 		// "").replace("-", "").replace("_", "").replace(" ", ""),
@@ -59,24 +69,32 @@ public class ItemBlockGtBlock extends ItemBlock {
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
 		if (this.mMaterial != null) {
-			list.add(this.mMaterial.vChemicalFormula);
-			if (this.mMaterial.vRadiationLevel > 0) {
-				list.add(CORE.GT_Tooltip_Radioactive);
-			}
+			list.add(this.mMaterial.vChemicalFormula);			
 		} else {
-			list.add("Material is Null.");
+			
+			try {
+				BlockBaseModular g = (BlockBaseModular) thisBlock;
+				this.mMaterial = g.getMaterialEx();
+			}
+			catch (Throwable t) {
+				
+			}
+			
+			
+			//list.add("Material is Null.");
 		}
 
+		if (this.isOre) {
 		if (KeyboardUtils.isCtrlKeyDown()) {
 			Block b = Block.getBlockFromItem(stack.getItem());
 			if (b != null) {
 
 				String aTool = b.getHarvestTool(stack.getItemDamage());
 				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
-				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
 
 				if (this.mMaterial != null) {
-					list.add("Ore contains:    ");
+					list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+					list.add("Contains:    ");
 					if (mMaterial.getComposites().isEmpty()) {
 						list.add("- " + mMaterial.getLocalizedName());
 					} else {
@@ -89,6 +107,22 @@ public class ItemBlockGtBlock extends ItemBlock {
 		} else {
 			list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info.");
 		}
+		}
+		else {
+			Block b = Block.getBlockFromItem(stack.getItem());
+			if (b != null) {
+				String aTool = b.getHarvestTool(stack.getItemDamage());
+				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
+				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+			}
+		}
+		
+		if (this.mMaterial != null) {
+			if (this.mMaterial.vRadiationLevel > 0) {
+				list.add(CORE.GT_Tooltip_Radioactive);
+			}
+		}
+		
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
index 74dd2f196c..0dd125bf7b 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -1,18 +1,45 @@
 package gtPlusPlus.core.item.base.itemblock;
 
 import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.world.World;
+
+import java.util.List;
 
 import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
 
 public class ItemBlockGtFrameBox extends ItemBlock{
 
 	protected int blockColour;
+	private Material mMaterial;
+	private int sRadiation;
 
 	public ItemBlockGtFrameBox(final Block block) {
 		super(block);
 		final BlockBaseModular baseBlock = (BlockBaseModular) block;
 		this.blockColour = baseBlock.getRenderColor(1);
+		
+
+
+		if (block instanceof BlockBaseModular){
+			BlockBaseModular g = (BlockBaseModular) block;
+			this.mMaterial = g.getMaterialEx();
+			sRadiation = mMaterial.vRadiationLevel;
+		}
+		else {
+			this.mMaterial = null;
+			sRadiation = 0;
+		}
+		
 		//GT_OreDictUnificator.registerOre("frameGt"+block.getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "").replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""), ItemUtils.getSimpleStack(this));
 	}
 
@@ -20,4 +47,48 @@ public class ItemBlockGtFrameBox extends ItemBlock{
 		return this.blockColour;
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		if (this.mMaterial != null) {
+			list.add(this.mMaterial.vChemicalFormula);
+			if (this.mMaterial.vRadiationLevel > 0) {
+				list.add(CORE.GT_Tooltip_Radioactive);
+			}
+		} else {
+			list.add("Material is Null.");
+		}
+		if (KeyboardUtils.isCtrlKeyDown()) {
+			Block b = Block.getBlockFromItem(stack.getItem());
+			if (b != null) {
+				String aTool = b.getHarvestTool(stack.getItemDamage());
+				int aMiningLevel1 = b.getHarvestLevel(stack.getItemDamage());
+				list.add("Mining Level: " + Math.min(Math.max(aMiningLevel1, 0), 5));
+				if (this.mMaterial != null) {
+					list.add("Contains:    ");
+					if (mMaterial.getComposites().isEmpty()) {
+						list.add("- " + mMaterial.getLocalizedName());
+					} else {
+						for (MaterialStack m : mMaterial.getComposites()) {
+							list.add("- " + m.getStackMaterial().getLocalizedName() + " x" + m.getPartsPerOneHundred());
+						}
+					}
+				}
+			}
+		} else {
+			list.add(EnumChatFormatting.DARK_GRAY + "Hold Ctrl to show additional info.");
+		}
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_,
+			final boolean p_77663_5_) {
+
+			if (this.sRadiation > 0) {
+				EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.sRadiation, world, entityHolding);
+			}
+		}
+	
+
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index 1d48bbbbf9..b26ac67225 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -1,8 +1,14 @@
 package gtPlusPlus.core.item.base.itemblock;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.data.AutoMap;
 import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlockWithMetadata;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -10,13 +16,36 @@ import net.minecraft.util.IIcon;
 public class ItemBlockMeta extends ItemBlockWithMetadata
 {
 	private final Block mBlock;
+	private HashMap<Integer, AutoMap<String>> aTooltips = new LinkedHashMap<Integer, AutoMap<String>>();
 
-	public ItemBlockMeta(final Block p_i45326_1_)
+	public ItemBlockMeta(final Block aBlock)
 	{
-		super(p_i45326_1_, p_i45326_1_);
-		this.mBlock = p_i45326_1_;
+		super(aBlock, aBlock);
+		this.mBlock = aBlock;
 		this.setMaxDamage(0);
 		this.setHasSubtypes(true);
+		if (aBlock instanceof ITileTooltip) {
+			ITileTooltip aTooltip = (ITileTooltip) aBlock;
+			//aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap());
+		}
+	}
+	
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		Block aThis = Block.getBlockFromItem(stack.getItem());
+		if (aThis != null) {
+			if (!aTooltips.isEmpty()) {
+				AutoMap<String> h = aTooltips.get(stack.getItemDamage());
+				if (h != null && !h.isEmpty()) {
+					for (String s : h) {
+						list.add(s);
+					}
+				}
+			}
+		}		
+		super.addInformation(stack, aPlayer, list, bool);		
 	}
 
 	/**
@@ -42,4 +71,44 @@ public class ItemBlockMeta extends ItemBlockWithMetadata
 	public String getUnlocalizedName(final ItemStack stack) {
 		return this.getUnlocalizedName() + "." + stack.getItemDamage();
 	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 2b3f477c56..de47ed8225 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TC_Aspects;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -26,7 +27,7 @@ import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
 
 public class BaseOreComponent extends Item{
@@ -57,9 +58,9 @@ public class BaseOreComponent extends Item{
 		registerComponent();
 		GT_OreDictUnificator.registerOre(componentType.getComponent()+material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
 		if (LoadedMods.Thaumcraft) {
-			ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), GTPP_Aspects.METALLUM, 2);
+			ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1);
 			if (componentMaterial.isRadioactive) {
-				ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), GTPP_Aspects.RADIO, 4);				
+				ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel);				
 			}
 		}
 		
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index b6a5dff2ac..eaa0905c93 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -14,22 +14,36 @@ public class BaseItemRod extends BaseItemComponent{
 	public BaseItemRod(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.ROD);
 		this.addExtruderRecipe();
+		this.addLatheRecipe();
 	}
 
 
 	private void addExtruderRecipe(){
 		Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods");
-
 		final ItemStack stackStick = this.componentMaterial.getRod(1);
 		final ItemStack stackBolt = this.componentMaterial.getBolt(4);
-
+		
 		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackBolt}))
-		GT_Values.RA.addCutterRecipe(
-				stackStick,
-				stackBolt,
-				null,
-				(int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
-				4);
+			GT_Values.RA.addCutterRecipe(
+					stackStick,
+					stackBolt,
+					null,
+					(int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
+					4);
+	}
+
+
+	private void addLatheRecipe(){
+		Logger.WARNING("Adding recipe for "+this.materialName+" Rod");
+		ItemStack boltStack = this.componentMaterial.getIngot(1);
+		if (ItemUtils.checkForInvalidItems(boltStack)){
+			GT_Values.RA.addLatheRecipe(
+					boltStack,
+					ItemUtils.getSimpleStack(this),
+					null,
+					(int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
+					4);
+		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index af74c1d535..29e525ed10 100644
--- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -18,8 +18,8 @@ public class BaseItemScrew extends BaseItemComponent{
 
 	private void addLatheRecipe(){
 		Logger.WARNING("Adding recipe for "+this.materialName+" Screws");
-		final ItemStack boltStack = ItemUtils.getItemStackOfAmountFromOreDict(this.unlocalName.replace("itemScrew", "bolt"), 1);
-		if (null != boltStack){
+		ItemStack boltStack = this.componentMaterial.getBolt(1);
+		if (ItemUtils.checkForInvalidItems(boltStack)){
 			GT_Values.RA.addLatheRecipe(
 					boltStack,
 					ItemUtils.getSimpleStack(this),
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
new file mode 100644
index 0000000000..0c2bdaa3ef
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -0,0 +1,408 @@
+package gtPlusPlus.core.item.chemistry;
+
+import java.util.ArrayList;
+
+import forestry.plugins.PluginCore;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class AgriculturalChem extends ItemPackage {
+
+	private static boolean aBOP;
+	private static boolean aTiCon;
+
+	private static AutoMap<FluidStack> mBloodFluids = new AutoMap<FluidStack>();
+
+	/**
+	 * Fluids
+	 */
+
+	// Poop Juice
+	public static Fluid PoopJuice;
+	// Manure Slurry
+	public static Fluid ManureSlurry;
+	// Fertile Manure Slurry
+	public static Fluid FertileManureSlurry;
+	// Blood
+	public static Fluid CustomBlood;
+
+	/**
+	 * Items
+	 */
+
+	// Manure Byproducts
+	public static Item dustManureByproducts;
+	// Organic Fertilizer
+	public static Item dustOrganicFertilizer;
+	// Dirt
+	public static Item dustDirt;
+
+	// Poop Juice
+	// vv - Centrifuge
+	// Manure Slurry && Manure Byproducts -> (Elements) Centrifuge to several tiny
+	// piles
+	// vv - Chem Reactor - Add Peat, Meat
+	// Organic Fertilizer
+	// vv - Dehydrate
+	// Fertilizer
+
+	// Poop Juice
+	// vv - Mixer - Add Blood, Bone, Meat (1000L Poo, 200L Blood, x2 Bone, x3 Meat)
+	// Fertile Manure Slurry
+	// vv - Chem Reactor - Add Peat x1.5
+	// Organic Fertilizer x3
+	// vv - Dehydrate
+	// Fertilizer
+
+
+	@Override
+	public void items() {
+		// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
+		dustManureByproducts = ItemUtils.generateSpecialUseDusts("ManureByproducts", "Manure Byproduct",
+				"(N2H4O3)N2P2Ca3CuC8", Utils.rgbtoHexValue(110, 75, 25))[0];
+
+		// Basically Guano
+		dustOrganicFertilizer = ItemUtils.generateSpecialUseDusts("OrganicFertilizer", "Organic Fertilizer",
+				"Ca5(PO4)3(OH)", Utils.rgbtoHexValue(240, 240, 240))[0];
+
+		// Dirt Dust :)
+		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];		
+	}
+
+	@Override
+	public void blocks() {
+		// None yet
+	}
+
+	@Override
+	public void fluids() {
+		// Sewage
+		PoopJuice = FluidUtils.generateFluidNonMolten("raw.waste", "Raw Animal Waste", 32 + 175,
+				new short[] { 100, 70, 30, 100 }, null, null, 0, true);
+
+		// Sewage
+		ManureSlurry = FluidUtils.generateFluidNonMolten("manure.slurry", "Manure Slurry", 39 + 175,
+				new short[] { 75, 45, 15, 100 }, null, null, 0, true);
+
+		// Sewage
+		FertileManureSlurry = FluidUtils.generateFluidNonMolten("fertile.manure.slurry", "Fertile Manure Slurry",
+				45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true);		
+	}
+	
+	
+
+	public AgriculturalChem() {
+		super();
+		
+		aBOP = LoadedMods.BiomesOPlenty;
+		aTiCon = LoadedMods.TiCon;
+
+		Logger.INFO("Adding Agrochemical content");
+
+		FluidStack aBlood;
+		if (aBOP) {
+			aBlood = FluidUtils.getFluidStack("hell_blood", 100);
+			if (aBlood != null) {
+				Logger.INFO("Found Biome's o Plenty, enabled Blood support.");
+				CustomBlood = aBlood.getFluid();
+				mBloodFluids.put(aBlood);
+			}
+		}
+
+		if (aTiCon) {
+			aBlood = FluidUtils.getFluidStack("hell_blood", 100);
+			if (aBlood != null) {
+				Logger.INFO("Found Tinker's Construct, enabled Blood support.");
+				CustomBlood = aBlood.getFluid();
+				mBloodFluids.put(FluidUtils.getFluidStack("blood", 100));
+			}
+		}
+
+		// Handle Blood Internally, Create if required.
+		if (mBloodFluids.isEmpty() || CustomBlood == null) {
+			Logger.INFO(
+					"Did not find any existing Blood fluids. Trying to wildcard search the fluid registry, then generate our own if that fails.");
+			FluidStack aTempBlood = FluidUtils.getWildcardFluidStack("blood", 100);
+			if (aTempBlood != null) {
+				CustomBlood = aTempBlood.getFluid();
+			} else {
+				aTempBlood = FluidUtils.getWildcardFluidStack("hell_blood", 100);
+				if (aTempBlood == null) {
+					CustomBlood = FluidUtils.generateFluidNoPrefix("blood", "Blood", 32 + 175,
+							new short[] { 175, 25, 25, 100 }, true);
+				} else {
+					CustomBlood = aTempBlood.getFluid();
+				}
+			}
+			Logger.INFO("Using " + CustomBlood.getName());
+			mBloodFluids.put(FluidUtils.getFluidStack(CustomBlood, 100));
+		}
+
+	}
+
+	private static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
+
+	private static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+
+	private static void processAllOreDict() {
+		processOreDict("listAllmeatraw", mMeats);
+		processOreDict("listAllfishraw", mFish);
+		processOreDict("listAllfruit", mFruits);
+		processOreDict("listAllVeggie", mVege);
+		processOreDict("listAllnut", mNuts);
+		processOreDict("listAllSeed", mSeeds);
+		processOreDict("brickPeat", mPeat);
+		processOreDict("bone", mBones);
+		processOreDict("dustBone", mBoneMeal);
+		// Just make a mega list, makes life easier.
+		if (!mMeats.isEmpty()) {
+			for (ItemStack g : mMeats) {
+				mList_Master_Meats.put(g);
+			}
+		}
+		if (!mFish.isEmpty()) {
+			for (ItemStack g : mFish) {
+				mList_Master_Meats.put(g);
+			}
+		}
+		if (!mFruits.isEmpty()) {
+			for (ItemStack g : mFruits) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mVege.isEmpty()) {
+			for (ItemStack g : mVege) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mNuts.isEmpty()) {
+			for (ItemStack g : mNuts) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mSeeds.isEmpty()) {
+			for (ItemStack g : mSeeds) {
+				mList_Master_Seeds.put(g);
+			}
+		}
+		if (!mBoneMeal.isEmpty()) {
+			for (ItemStack g : mBoneMeal) {
+				mList_Master_Bones.put(g);
+			}
+		}
+		if (!mBones.isEmpty()) {
+			for (ItemStack g : mBones) {
+				mList_Master_Bones.put(g);
+			}
+		}
+	}
+
+	private static void processOreDict(String aOreName, AutoMap<ItemStack> aMap) {
+		ArrayList<ItemStack> aTemp = OreDictionary.getOres(aOreName);
+		if (!aTemp.isEmpty()) {
+			for (ItemStack stack : aTemp) {
+				aMap.put(stack);
+			}
+		}
+	}
+
+	private static void addBasicSlurryRecipes() {
+
+		ItemStack aManureByprod1 = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1);
+		ItemStack aManureByprod2 = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1);
+		ItemStack aDirtDust = ItemUtils.getSimpleStack(dustDirt, 1);
+
+		// Poop Juice to Basic Slurry
+		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(10), null, FluidUtils.getFluidStack(PoopJuice, 1000), // In
+				// Fluid
+				FluidUtils.getFluidStack(ManureSlurry, 250), // Out Fluid
+				aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod1, aManureByprod1,
+				new int[] { 2000, 2000, 500, 500, 250, 250 }, // Chances
+				10 * 20, // Time
+				30); // EU
+
+		// More Efficient way to get byproducts, less Slurry
+		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(20), null, FluidUtils.getFluidStack(PoopJuice, 1000), // In
+				// Fluid
+				FluidUtils.getFluidStack(ManureSlurry, 50), // Out Fluid
+				aDirtDust, aDirtDust, aManureByprod1, aManureByprod1, aManureByprod2, aManureByprod2,
+				new int[] { 4000, 3000, 1250, 1250, 675, 675 }, // Chances
+				20 * 20, // Time
+				60); // EU
+
+	}
+
+	private static void addAdvancedSlurryRecipes() {
+
+		ItemStack aCircuit = CI.getNumberedCircuit(10);
+		ItemStack aBone;
+		ItemStack aMeat;
+		ItemStack aEmptyCells = CI.emptyCells(2);
+		ItemStack aInputCells = ItemUtils.getItemStackOfAmountFromOreDict("cellRawWaste", 2);
+		FluidStack aOutput = FluidUtils.getFluidStack(FertileManureSlurry, 1000);
+
+		for (FluidStack aBloodStack : mBloodFluids) {
+			for (ItemStack aBoneStack : mList_Master_Bones) {
+				aBone = ItemUtils.getSimpleStack(aBoneStack, 2);
+				for (ItemStack aMeatStack : mList_Master_Meats) {
+					aMeat = ItemUtils.getSimpleStack(aMeatStack, 5);
+					// Poop Juice to Fertile Slurry
+					GT_Values.RA.addMixerRecipe(aCircuit, aBone, aMeat, aInputCells, aBloodStack, // Input Fluid
+							aOutput, // Output Fluid
+							aEmptyCells, // Output Item
+							20 * 8, // Time?
+							60 // Eu?
+							);
+				}
+			}
+		}
+	}
+
+	private static void addBasicOrganiseFertRecipes() {
+		FluidStack aInputFluid = FluidUtils.getFluidStack(ManureSlurry, 1000);
+		ItemStack aOutputDust = ItemUtils.getSimpleStack(dustOrganicFertilizer, 3);
+		ItemStack aPeat;
+		ItemStack aMeat;
+		for (ItemStack aPeatStack : mPeat) {
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 3);
+			for (ItemStack aMeatStack : mList_Master_Meats) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 5);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 20 * 20, 120);
+			}
+
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 2);
+			for (ItemStack aMeatStack : mList_Master_FruitVege) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 9);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 10 * 20, 120);
+			}
+		}
+	}
+
+	private static void addAdvancedOrganiseFertRecipes() {
+		FluidStack aInputFluid = FluidUtils.getFluidStack(FertileManureSlurry, 1000);
+		ItemStack aOutputDust = ItemUtils.getSimpleStack(dustOrganicFertilizer, 7);
+		ItemStack aPeat;
+		ItemStack aMeat;
+		for (ItemStack aPeatStack : mPeat) {
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 5);
+			for (ItemStack aMeatStack : mList_Master_Meats) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 7);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 10 * 20, 140);
+			}
+			aPeat = ItemUtils.getSimpleStack(aPeatStack, 3);
+			for (ItemStack aMeatStack : mList_Master_FruitVege) {
+				aMeat = ItemUtils.getSimpleStack(aMeatStack, 12);
+				CORE.RA.addChemicalRecipe(aPeat, aMeat, aInputFluid, null, aOutputDust, 5 * 20, 140);
+			}
+		}
+	}
+
+	private static void addMiscRecipes() {
+
+		ItemStack aDustOrganicFert = ItemUtils.getSimpleStack(dustOrganicFertilizer, 1);
+		ItemStack aManureByprod = ItemUtils.getSimpleStack(dustManureByproducts, 1);
+
+		// Dehydrate Organise Fert to Normal Fert.
+
+		/**
+		 * Forestry Support
+		 */
+		if (LoadedMods.Forestry) {
+
+			Item aForestryFert = PluginCore.items.fertilizerCompound;
+
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
+					null, new ItemStack[] { ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod },
+					new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+		}
+
+		/**
+		 * IC2 Support
+		 */
+		if (LoadedMods.IndustrialCraft2) {
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
+					null, new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod,
+							aManureByprod },
+					new int[] { 10000, 2000, 2000 }, 20 * 20, 240);
+		}
+
+		// Dirt Production
+		CORE.RA.addCompressorRecipe(ItemUtils.getSimpleStack(dustDirt, 9), ItemUtils.getSimpleStack(Blocks.dirt),
+				20 * 2, 8);
+
+		// Centrifuge Byproducts
+
+		// Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
+		GT_Values.RA.addCentrifugeRecipe(CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(aManureByprod, 4),
+				FluidUtils.getFluidStack("sulfuricacid", 250), // In Fluid
+				FluidUtils.getFluidStack("sulfuricapatite", 50), // Out Fluid
+				Materials.Phosphorus.getDustSmall(2), Materials.Calcium.getDustSmall(2),
+				Materials.Copper.getDustTiny(1), Materials.Carbon.getDust(1), ItemUtils.getSimpleStack(dustDirt, 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1),
+				new int[] { 2500, 2500, 750, 1000, 5000, 250 }, // Chances
+				20 * 20, // Time
+				60); // EU
+
+		// Add Fuel Usages
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(PoopJuice, 1000), 12);
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(ManureSlurry, 1000), 24);
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(FertileManureSlurry, 1000), 32);
+
+	}
+
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Failed to generate recipes for AgroChem.";
+	}
+
+	@Override
+	public boolean generateRecipes() {
+		if (mBloodFluids.isEmpty()) {
+			Logger.INFO("Could not find, nor create Blood fluid. Unable to add recipes.");
+			return false;
+		}
+
+		// Organise OreDict
+		processAllOreDict();
+
+		// Slurry Production
+		addBasicSlurryRecipes();
+		addAdvancedSlurryRecipes();
+
+		// Organic Fert. Production
+		addBasicOrganiseFertRecipes();
+		addAdvancedOrganiseFertRecipes();
+
+		addMiscRecipes();
+		return true;
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index eea1aed49f..e060723afd 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
@@ -21,9 +21,10 @@ import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
-public class CoalTar {
+public class CoalTar extends ItemPackage {
 
 	public static Fluid Coal_Gas;
+	public static Fluid Coal_Oil;
 	public static Fluid Ethylene;
 	public static Fluid Benzene;
 	public static Fluid Ethylbenzene;
@@ -39,116 +40,6 @@ public class CoalTar {
 	public static Fluid Hydrogen_Peroxide;
 	public static Fluid Lithium_Peroxide;
 
-	public static void run(){
-
-		//Special Compatibility for Coke
-		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 1), "fuelCoke");
-		//Create Coal Gas
-		Coal_Gas = FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
-		//Ethanol
-		// v - Dehydrate cells to remove water
-		
-		
-		//Create Ethylene
-		if (!FluidUtils.doesFluidExist("Ethylene")){
-			Ethylene = FluidUtils.generateFluidNonMolten("Ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
-		}
-		else {
-			Ethylene = FluidUtils.getWildcardFluidStack("Ethylene", 1).getFluid();
-		}
-		
-		//Create Benzene - (Toluene + Hydrogen | 95% Benzene / 5% methane)
-		if (!FluidUtils.doesFluidExist("NitrousOxide")){
-			Benzene = FluidUtils.generateFluidNonMolten("Benzene", "Benzene", 81, new short[]{150, 75, 0, 100}, null, null);
-		}
-		else {
-			Benzene = FluidUtils.getWildcardFluidStack("Benzene", 1).getFluid();
-		}
-		
-		//Create Ethylbenzene - Ethylbenzene is produced in on a large scale by combining benzene and ethylene in an acid-catalyzed chemical reaction
-		//Use Chemical Reactor
-		Ethylbenzene = FluidUtils.generateFluidNonMolten("Ethylbenzene", "Ethylbenzene", 136, new short[]{255, 255, 255, 100}, null, null);
-		//Create Anthracene
-		Anthracene = FluidUtils.generateFluidNonMolten("Anthracene", "Anthracene", 340, new short[]{255, 255, 255, 100}, null, null);
-		//Toluene
-		if (!FluidUtils.doesFluidExist("Toluene")){
-			Toluene = FluidUtils.generateFluidNonMolten("Toluene", "Toluene", -95, new short[]{140, 70, 20, 100}, null, null);
-		}
-		else {
-			Toluene = FluidUtils.getWildcardFluidStack("Toluene", 1).getFluid();
-			Item itemCellToluene = new BaseItemComponent("Toluene", "Toluene", new short[]{140, 70, 20, 100});
-			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
-		}
-
-		//Create Coal Tar
-		Coal_Tar = FluidUtils.generateFluidNonMolten("CoalTar", "Coal Tar", 450, new short[]{32, 32, 32, 100}, null, null);
-		// v - Distill (60% Tar oil/15% Naphtha/20% Ethylbenzene/5% Anthracene)
-		//Create Coal Tar Oil
-		Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("CoalTarOil", "Coal Tar Oil", 240, new short[]{240, 240, 150, 100}, null, null);
-		// v - Wash With Sulfuric Acid
-		//Create Sulfuric Coal Tar Oil
-		Sulfuric_Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("SulfuricCoalTarOil", "Sulfuric Coal Tar Oil", 240, new short[]{250, 170, 12, 100}, null, null);
-		// v - Distill (No loss, just time consuming)
-		//Create Naphthalene
-		Naphthalene = FluidUtils.generateFluidNonMolten("Naphthalene", "Naphthalene", 115, new short[]{210, 185, 135, 100}, null, null);
-		// v - Oxidize with mercury and nitric acid
-		//Create Phthalic Acid
-		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
-		// v - Dehydrate at 180C+
-		//Create Phthalic Anhydride
-		ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
-
-
-
-		//Create 2-Ethylanthraquinone
-		//2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
-		Ethylanthraquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthraquinone", "2-Ethylanthraquinone", 415, new short[]{227, 255, 159, 100}, null, null);
-		//Create 2-Ethylanthrahydroquinone
-		//Palladium plate + Hydrogen(250) + 2-Ethylanthraquinone(500) = 600 Ethylanthrahydroquinone
-		Ethylanthrahydroquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthrahydroquinone", "2-Ethylanthrahydroquinone", 415, new short[]{207, 225, 129, 100}, null, null);
-		//Create Hydrogen Peroxide
-		//Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
-		Hydrogen_Peroxide = FluidUtils.generateFluidNonMolten("HydrogenPeroxide", "Hydrogen Peroxide", 150, new short[]{210, 255, 255, 100}, null, null);
-
-
-
-		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
-		ItemUtils.generateSpecialUseDusts("LithiumHydroperoxide", "Lithium Hydroperoxide", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
-		// v - Dehydrate
-		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
-		Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
-
-		//Burn the coal gas!
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1), null, 32, 3);
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1), null, 64, 3);
-		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1), null, 128, 3);
-		createRecipes();
-
-
-	}
-
-	private static void createRecipes() {
-		recipeCreateEthylene();
-		recipeCreateBenzene();
-		recipeCreateEthylbenzene();
-
-		recipeCoalToCoalTar();
-		recipeCoalTarToCoalTarOil();
-		recipeCoalTarOilToSulfuricOilToNaphthalene();
-		recipeNaphthaleneToPhthalicAcid();
-		recipePhthalicAcidToPhthalicAnhydride();
-		recipe2Ethylanthraquinone();
-		recipe2Ethylanthrahydroquinone();
-		recipeHydrogenPeroxide();
-		recipeLithiumHydroperoxide();
-		recipeLithiumPeroxide();
-		
-		recipeEthylBenzineFuelsIntoHeavyFuel();
-	}
-
-
-
 	private static void recipeEthylBenzineFuelsIntoHeavyFuel() {
 			CORE.RA.addChemicalRecipe(
 					ItemUtils.getItemStackOfAmountFromOreDict("cellFuel", 9), 
@@ -228,6 +119,15 @@ public class CoalTar {
 
 
 	public static void recipeCoalToCoalTar(){
+		//Charcoal
+		AddGregtechRecipe.addCokeAndPyrolyseRecipes(
+				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 32L),
+				8,
+				GT_Values.NF,
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDirt", 2),
+				FluidUtils.getFluidStack("fluid.coaltar", 800), 
+				15,
+				120);
 		//Lignite
 		AddGregtechRecipe.addCokeAndPyrolyseRecipes(
 				GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L),
@@ -235,7 +135,7 @@ public class CoalTar {
 				GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
 				FluidUtils.getFluidStack("fluid.coaltar", 800), 
-				90,
+				45,
 				60);
 
 		//Coal
@@ -245,7 +145,7 @@ public class CoalTar {
 				GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
 				FluidUtils.getFluidStack("fluid.coaltar", 2200), 
-				60,
+				30,
 				120);
 
 		//Coke
@@ -255,7 +155,7 @@ public class CoalTar {
 				GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3),
 				FluidUtils.getFluidStack("fluid.coaltar", 3400), 
-				30,
+				15,
 				240);
 
 	}
@@ -295,14 +195,24 @@ public class CoalTar {
 				900, //aDuration
 				30,//aEUt
 				false //Hidden?
-				);
+				);		
+		GT_Values.RA.addDistilleryRecipe(
+				CI.getNumberedCircuit(5), //Circuit
+				FluidUtils.getFluidStack("fluid.coaltar", 1500), //aInput
+				FluidUtils.getFluidStack("fluid.kerosene", 400), //aOutput
+				300, //aDuration
+				64,//aEUt
+				false //Hidden?
+				);	
+		
 		GT_Values.RA.addDistillationTowerRecipe(
 				FluidUtils.getFluidStack("fluid.coaltar", 1000),
 				new FluidStack[]{
-						FluidUtils.getFluidStack("fluid.coaltaroil", 600), //aOutput
-						FluidUtils.getFluidStack("liquid_naphtha", 150), //aOutput
-						FluidUtils.getFluidStack("fluid.ethylbenzene", 200), //aOutput
+						FluidUtils.getFluidStack("fluid.coaltaroil", 500), //aOutput
+						FluidUtils.getFluidStack("liquid_naphtha", 100), //aOutput
+						FluidUtils.getFluidStack("fluid.ethylbenzene", 150), //aOutput
 						FluidUtils.getFluidStack("fluid.anthracene", 50), //aOutput
+						FluidUtils.getFluidStack("fluid.kerosene", 200), //aOutput
 				},
 				null,
 				900,
@@ -430,4 +340,141 @@ public class CoalTar {
 				240);
 	}
 
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Bad Coal Science!";
+	}
+
+	@Override
+	public boolean generateRecipes() {
+		recipeCreateEthylene();
+		recipeCreateBenzene();
+		recipeCreateEthylbenzene();
+
+		recipeCoalToCoalTar();
+		recipeCoalTarToCoalTarOil();
+		recipeCoalTarOilToSulfuricOilToNaphthalene();
+		recipeNaphthaleneToPhthalicAcid();
+		recipePhthalicAcidToPhthalicAnhydride();
+		recipe2Ethylanthraquinone();
+		recipe2Ethylanthrahydroquinone();
+		recipeHydrogenPeroxide();
+		recipeLithiumHydroperoxide();
+		recipeLithiumPeroxide();
+		
+		recipeEthylBenzineFuelsIntoHeavyFuel();		
+
+		//Burn the coal gas!
+		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
+		CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricCoalTarOil", 1), 64);
+		CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTarOil", 1), 32);
+		CORE.RA.addSemifluidFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalTar", 1), 16);		
+		
+		return true;
+	}
+
+	@Override
+	public void items() {
+		//Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
+		// v - Dehydrate at 180C+
+		//Create Phthalic Anhydride
+		ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
+
+		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
+		ItemUtils.generateSpecialUseDusts("LithiumHydroperoxide", "Lithium Hydroperoxide", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
+		// v - Dehydrate
+		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
+		//Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
+	}
+
+	@Override
+	public void blocks() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void fluids() {
+
+
+		//Special Compatibility for Coke
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 1), "fuelCoke");
+		//Create Coal Gas
+		Coal_Gas = FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
+		//Ethanol
+		// v - Dehydrate cells to remove water
+		
+		
+		//Create Ethylene
+		if (!FluidUtils.doesFluidExist("Ethylene")){
+			Ethylene = FluidUtils.generateFluidNonMolten("Ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
+		}
+		else {
+			Ethylene = FluidUtils.getWildcardFluidStack("Ethylene", 1).getFluid();
+		}
+		
+		//Create Benzene - (Toluene + Hydrogen | 95% Benzene / 5% methane)
+		if (!FluidUtils.doesFluidExist("NitrousOxide")){
+			Benzene = FluidUtils.generateFluidNonMolten("Benzene", "Benzene", 81, new short[]{150, 75, 0, 100}, null, null);
+		}
+		else {
+			Benzene = FluidUtils.getWildcardFluidStack("Benzene", 1).getFluid();
+		}
+		
+		//Create Ethylbenzene - Ethylbenzene is produced in on a large scale by combining benzene and ethylene in an acid-catalyzed chemical reaction
+		//Use Chemical Reactor
+		Ethylbenzene = FluidUtils.generateFluidNonMolten("Ethylbenzene", "Ethylbenzene", 136, new short[]{255, 255, 255, 100}, null, null);
+		//Create Anthracene
+		Anthracene = FluidUtils.generateFluidNonMolten("Anthracene", "Anthracene", 340, new short[]{255, 255, 255, 100}, null, null);
+		//Toluene
+		if (!FluidUtils.doesFluidExist("Toluene")){
+			Toluene = FluidUtils.generateFluidNonMolten("Toluene", "Toluene", -95, new short[]{140, 70, 20, 100}, null, null);
+		}
+		else {
+			Toluene = FluidUtils.getWildcardFluidStack("Toluene", 1).getFluid();
+			Item itemCellToluene = new BaseItemComponent("Toluene", "Toluene", new short[]{140, 70, 20, 100});
+			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
+		}
+
+		//Create Coal Tar
+		Coal_Tar = FluidUtils.generateFluidNonMolten("CoalTar", "Coal Tar", 450, new short[]{32, 32, 32, 100}, null, null);
+		// v - Distill (60% Tar oil/15% Naphtha/20% Ethylbenzene/5% Anthracene)
+		//Create Coal Tar Oil
+		Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("CoalTarOil", "Coal Tar Oil", 240, new short[]{240, 240, 150, 100}, null, null);
+		// v - Wash With Sulfuric Acid
+		//Create Sulfuric Coal Tar Oil
+		Sulfuric_Coal_Tar_Oil = FluidUtils.generateFluidNonMolten("SulfuricCoalTarOil", "Sulfuric Coal Tar Oil", 240, new short[]{250, 170, 12, 100}, null, null);
+		// v - Distill (No loss, just time consuming)
+		//Create Naphthalene
+		Naphthalene = FluidUtils.generateFluidNonMolten("Naphthalene", "Naphthalene", 115, new short[]{210, 185, 135, 100}, null, null);
+		// v - Oxidize with mercury and nitric acid
+		//Create Phthalic Acid
+		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
+		// v - Dehydrate at 180C+
+		//Create Phthalic Anhydride
+		//ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
+
+
+
+		//Create 2-Ethylanthraquinone
+		//2-Ethylanthraquinone is prepared from the reaction of phthalic anhydride and ethylbenzene
+		Ethylanthraquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthraquinone", "2-Ethylanthraquinone", 415, new short[]{227, 255, 159, 100}, null, null);
+		//Create 2-Ethylanthrahydroquinone
+		//Palladium plate + Hydrogen(250) + 2-Ethylanthraquinone(500) = 600 Ethylanthrahydroquinone
+		Ethylanthrahydroquinone2 = FluidUtils.generateFluidNonMolten("2Ethylanthrahydroquinone", "2-Ethylanthrahydroquinone", 415, new short[]{207, 225, 129, 100}, null, null);
+		//Create Hydrogen Peroxide
+		//Compressed Air(1500) + Ethylanthrahydroquinone(500) + Anthracene(5) = 450 Ethylanthraquinone && 200 Peroxide
+		Hydrogen_Peroxide = FluidUtils.generateFluidNonMolten("HydrogenPeroxide", "Hydrogen Peroxide", 150, new short[]{210, 255, 255, 100}, null, null);
+
+
+
+		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
+		//ItemUtils.generateSpecialUseDusts("LithiumHydroperoxide", "Lithium Hydroperoxide", "HLiO2", Utils.rgbtoHexValue(125, 125, 125));
+		// v - Dehydrate
+		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
+		Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
+
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
new file mode 100644
index 0000000000..02afada849
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -0,0 +1,108 @@
+package gtPlusPlus.core.item.chemistry;
+
+import gregtech.api.enums.TextureSet;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.material.MaterialGenerator;
+import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.Item;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+
+public class GenericChem extends ItemPackage {
+
+	/**
+	 * Materials
+	 */	
+	
+	public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, "", 0);//Not a GT Inherited Material
+	public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
+	public static final Material TEFLON = new Material("Teflon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{75, 45, 75}, 300, 600, 44, 48, true, "", 0);//Not a GT Inherited Material
+
+	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+	//public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material
+	//public static final Material Nylon = new Material();
+	
+	/**
+	 * Fluids
+	 */
+
+	public Fluid Benzene;
+	public Fluid NitroBenzene;
+	public Fluid Aniline;
+	public Fluid Polyurethane;
+	public Fluid Phenol; //https://en.wikipedia.org/wiki/Phenol#Uses
+	public Fluid Cyclohexane; //https://en.wikipedia.org/wiki/Cyclohexane	
+	public Fluid Cyclohexanone; //https://en.wikipedia.org/wiki/Cyclohexanone
+	
+	public Fluid Cadaverine; //https://en.wikipedia.org/wiki/Cadaverine
+	public Fluid Putrescine; //https://en.wikipedia.org/wiki/Putrescine
+	
+
+	/**
+	 * Items
+	 */
+
+	// Phenol Byproducts
+	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
+
+
+
+	@Override
+	public void items() {		
+		PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0];		
+		MaterialGenerator.generate(BAKELITE, false);	
+		MaterialGenerator.generate(NYLON, false);
+		MaterialGenerator.generate(TEFLON, false);
+	}
+
+	@Override
+	public void blocks() {}
+
+	@Override
+	public void fluids() {
+		
+		if (!FluidRegistry.isFluidRegistered("benzene")) {
+			Benzene = FluidUtils.generateFluidNoPrefix("benzene", "Benzene", 278,	new short[] { 100, 70, 30, 100 }, true);			
+		}
+		else {
+			Benzene = FluidRegistry.getFluid("benzene");
+		}
+		
+		NitroBenzene = FluidUtils.generateFluidNoPrefix("nitrobenzene", "NitroBenzene", 278,	new short[] { 70, 50, 40, 100 }, true);
+		
+		Aniline = FluidUtils.generateFluidNoPrefix("aniline", "Aniline", 266,	new short[] { 100, 100, 30, 100 }, true);
+		
+		Polyurethane = FluidUtils.generateFluidNoPrefix("polyurethane", "Polyurethane", 350,	new short[] { 100, 70, 100, 100 }, true);
+		
+		if (!FluidRegistry.isFluidRegistered("phenol")) {
+			Phenol = FluidUtils.generateFluidNoPrefix("phenol", "Phenol", 313,	new short[] { 100, 70, 30, 100 }, true);			
+		}
+		else {
+			Phenol = FluidRegistry.getFluid("phenol");
+		}		
+		
+		Cyclohexane = FluidUtils.generateFluidNoPrefix("cyclohexane", "Cyclohexane", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);		
+		Cyclohexanone = FluidUtils.generateFluidNoPrefix("cyclohexanone", "Cyclohexanone", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
+		
+		Cadaverine = FluidUtils.generateFluidNoPrefix("cadaverine", "Cadaverine", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
+		Putrescine = FluidUtils.generateFluidNoPrefix("putrescine", "Putrescine", 32 + 175,	new short[] { 100, 70, 30, 100 }, true);
+		
+	}	
+
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Failed to generate recipes for AgroChem.";
+	}
+
+	@Override
+	public boolean generateRecipes() {		
+
+		
+		return true;
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
index 517a698e80..e08a509436 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -6,6 +6,7 @@ import java.util.List;
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.Utils;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,18 +23,16 @@ public class IonParticles extends BaseItemParticle {
 	
 	
 	public IonParticles() {
-		super("Ion", aElements.length, EnumRarity.rare);
+		super("Ion", ELEMENT.NAMES.length, EnumRarity.rare);
 	}
 	
-	private static final String[] aElements = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminum", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Cesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
-
-	public static IIcon[] overlays = new IIcon[aElements.length];
+	public static IIcon[] overlays = new IIcon[ELEMENT.NAMES.length];
 	public static IIcon baseTexture;
 	
 	static {
 		//Generate Ions
 		int key = 0;
-		for (String s : aElements) {
+		for (String s : ELEMENT.NAMES) {
 			//Map names to Meta
 			NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
 			MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
@@ -62,7 +61,7 @@ public class IonParticles extends BaseItemParticle {
 	
 	@Override
     public String getUnlocalizedName(final ItemStack itemStack) {
-        return "item.particle.ion" + "." + aElements[itemStack.getItemDamage()];
+        return "item.particle.ion" + "." + ELEMENT.NAMES[itemStack.getItemDamage()];
     }
 	
 	private static boolean createNBT(ItemStack rStack){
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
index 1d45dec183..25beb6d9b5 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java
@@ -3,7 +3,7 @@ package gtPlusPlus.core.item.chemistry;
 import net.minecraft.init.Items;
 
 import gregtech.api.enums.GT_Values;
-
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
@@ -11,18 +11,40 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraftforge.fluids.Fluid;
 
-public class NuclearChem {
+public class NuclearChem extends ItemPackage {
 
 	public static Fluid Burnt_LiFBeF2ThF4UF4;
 	public static Fluid Burnt_LiFBeF2ZrF4UF4;
 	public static Fluid Burnt_LiFBeF2ZrF4U235;
 	
 	public static Fluid GeneticMutagen;
-	private static boolean generateMutagenRecipe = false;
+	private static boolean generateMutagenRecipe = false;	
+
+	@Override
+	public String errorMessage() {
+		return "bad Nuclear Chemistry Recipes.";
+	}
 
-	public static void run(){
+	@Override
+	public boolean generateRecipes() {		
+		if (generateMutagenRecipe) {
+			chemReator_CreateMutagen();	
+		}		
+		chemReactor_MutagenWithEggs();
+		return true;
+	}
+
+	@Override
+	public void items() {
+	}
+
+	@Override
+	public void blocks() {
+	}
 
-		//Create Coal Gas
+	@Override
+	public void fluids() {
+		//Create Used Nuclear Fuels
 		Burnt_LiFBeF2ThF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ThF4UF4", "Burnt LiFBeF2ThF4UF4 Salt", 545, new short[]{48, 175, 48, 100}, null, null);
 		Burnt_LiFBeF2ZrF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4UF4", "Burnt LiFBeF2ZrF4UF4 Salt", 520, new short[]{48, 168, 68, 100}, null, null);
 		Burnt_LiFBeF2ZrF4U235 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4U235", "Burnt LiFBeF2ZrF4U235 Salt", 533, new short[]{68, 185, 48, 100}, null, null);
@@ -34,18 +56,6 @@ public class NuclearChem {
 		else {
 			GeneticMutagen = FluidUtils.getFluidStack("fluid.Mutagen", 1).getFluid();
 		}
-		
-		createRecipes();
-
-
-	}
-
-	private static void createRecipes() {
-		
-		if (generateMutagenRecipe)
-		chemReator_CreateMutagen();	
-		
-		chemReactor_MutagenWithEggs();
 	}
 	
 	private static void chemReator_CreateMutagen() {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
new file mode 100644
index 0000000000..cb7e32eaf0
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java
@@ -0,0 +1,201 @@
+package gtPlusPlus.core.item.chemistry;
+
+import java.util.ArrayList;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class OilChem extends ItemPackage {
+
+	/**
+	 * Fluids
+	 */
+
+	// Poop Juice
+	public static Fluid PoopJuice;
+	// Manure Slurry
+	public static Fluid ManureSlurry;
+	// Fertile Manure Slurry
+	public static Fluid FertileManureSlurry;
+
+	/**
+	 * Items
+	 */
+
+	// Manure Byproducts
+	public static Item dustManureByproducts;
+	// Organic Fertilizer
+	public static Item dustOrganicFertilizer;
+	// Dirt
+	public static Item dustDirt;
+
+	// Poop Juice
+	// vv - Centrifuge
+	// Manure Slurry && Manure Byproducts -> (Elements) Centrifuge to several tiny
+	// piles
+	// vv - Chem Reactor - Add Peat, Meat
+	// Organic Fertilizer
+	// vv - Dehydrate
+	// Fertilizer
+
+	// Poop Juice
+	// vv - Mixer - Add Blood, Bone, Meat (1000L Poo, 200L Blood, x2 Bone, x3 Meat)
+	// Fertile Manure Slurry
+	// vv - Chem Reactor - Add Peat x1.5
+	// Organic Fertilizer x3
+	// vv - Dehydrate
+	// Fertilizer
+
+
+	@Override
+	public void items() {
+		// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
+		dustManureByproducts = ItemUtils.generateSpecialUseDusts("ManureByproducts", "Manure Byproduct",
+				"(N2H4O3)N2P2Ca3CuC8", Utils.rgbtoHexValue(110, 75, 25))[0];
+
+		// Basically Guano
+		dustOrganicFertilizer = ItemUtils.generateSpecialUseDusts("OrganicFertilizer", "Organic Fertilizer",
+				"Ca5(PO4)3(OH)", Utils.rgbtoHexValue(240, 240, 240))[0];
+
+		// Dirt Dust :)
+		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];		
+	}
+
+	@Override
+	public void blocks() {
+		// None yet
+	}
+
+	@Override
+	public void fluids() {
+		// Sewage
+		PoopJuice = FluidUtils.generateFluidNonMolten("raw.waste", "Raw Animal Waste", 32 + 175,
+				new short[] { 100, 70, 30, 100 }, null, null, 0, true);
+
+		// Sewage
+		ManureSlurry = FluidUtils.generateFluidNonMolten("manure.slurry", "Manure Slurry", 39 + 175,
+				new short[] { 75, 45, 15, 100 }, null, null, 0, true);
+
+		// Sewage
+		FertileManureSlurry = FluidUtils.generateFluidNonMolten("fertile.manure.slurry", "Fertile Manure Slurry",
+				45 + 175, new short[] { 65, 50, 15, 100 }, null, null, 0, true);		
+	}
+
+	private static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
+
+	private static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
+	private static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+
+	private static void processAllOreDict() {
+		processOreDict("listAllmeatraw", mMeats);
+		processOreDict("listAllfishraw", mFish);
+		processOreDict("listAllfruit", mFruits);
+		processOreDict("listAllVeggie", mVege);
+		processOreDict("listAllnut", mNuts);
+		processOreDict("listAllSeed", mSeeds);
+		processOreDict("brickPeat", mPeat);
+		processOreDict("bone", mBones);
+		processOreDict("dustBone", mBoneMeal);
+		// Just make a mega list, makes life easier.
+		if (!mMeats.isEmpty()) {
+			for (ItemStack g : mMeats) {
+				mList_Master_Meats.put(g);
+			}
+		}
+		if (!mFish.isEmpty()) {
+			for (ItemStack g : mFish) {
+				mList_Master_Meats.put(g);
+			}
+		}
+		if (!mFruits.isEmpty()) {
+			for (ItemStack g : mFruits) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mVege.isEmpty()) {
+			for (ItemStack g : mVege) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mNuts.isEmpty()) {
+			for (ItemStack g : mNuts) {
+				mList_Master_FruitVege.put(g);
+			}
+		}
+		if (!mSeeds.isEmpty()) {
+			for (ItemStack g : mSeeds) {
+				mList_Master_Seeds.put(g);
+			}
+		}
+		if (!mBoneMeal.isEmpty()) {
+			for (ItemStack g : mBoneMeal) {
+				mList_Master_Bones.put(g);
+			}
+		}
+		if (!mBones.isEmpty()) {
+			for (ItemStack g : mBones) {
+				mList_Master_Bones.put(g);
+			}
+		}
+	}
+
+	private static void processOreDict(String aOreName, AutoMap<ItemStack> aMap) {
+		ArrayList<ItemStack> aTemp = OreDictionary.getOres(aOreName);
+		if (!aTemp.isEmpty()) {
+			for (ItemStack stack : aTemp) {
+				aMap.put(stack);
+			}
+		}
+	}
+
+	private static void addBasicSlurryRecipes() {}
+
+	private static void addAdvancedSlurryRecipes() {}
+
+	private static void addBasicOrganiseFertRecipes() {}
+
+	private static void addAdvancedOrganiseFertRecipes() {}
+
+	private static void addMiscRecipes() {}
+
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Failed to generate recipes for AgroChem.";
+	}
+
+	@Override
+	public boolean generateRecipes() {		
+
+		// Organise OreDict
+		processAllOreDict();
+
+		// Slurry Production
+		addBasicSlurryRecipes();
+		addAdvancedSlurryRecipes();
+
+		// Organic Fert. Production
+		addBasicOrganiseFertRecipes();
+		addAdvancedOrganiseFertRecipes();
+
+		addMiscRecipes();
+		return true;
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index a516cb0639..f2b5d0683c 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -1,31 +1,37 @@
 package gtPlusPlus.core.item.chemistry;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 
+import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.Recipe_GT;
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-public class RocketFuels {
+public class RocketFuels extends ItemPackage {
 	
 	public static HashSet<String> mValidRocketFuelNames = new HashSet<String>();
 	public static HashMap<Integer, Fluid> mValidRocketFuels = new HashMap<Integer, Fluid>();
 
-	public static Fluid Kerosene;	
+	public static Fluid Oil_Heavy;
+	public static Fluid Diesel;
+	public static Fluid Kerosene;
 	public static Fluid RP1;	
 	public static Fluid Nitrogen_Tetroxide;	
 	public static Fluid Hydrazine;	
@@ -45,117 +51,23 @@ public class RocketFuels {
 
 	public static Item Ammonium_Nitrate_Dust;
 	public static Item Formaldehyde_Catalyst;
-
-	public static void run(){
-
-		//Create Kerosene
-		Kerosene = FluidUtils.generateFluidNonMolten("Kerosene", "Kerosene", 500, new short[]{150, 40, 150, 100}, null, null);
-
-		//RP! Focket Fuel
-		RP1 = FluidUtils.generateFluidNonMolten("RP1Fuel", "RP-1 Rocket Fuel", 500, new short[]{210, 50, 50, 100}, null, null);
-
-		//Create Nitrogen Tetroxide
-		Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten("NitrogenTetroxide", "Nitrogen Tetroxide", -11, new short[]{170, 170, 0, 100}, null, null);
-
-		//Create Hydrazine
-		Hydrazine = FluidUtils.generateFluidNonMolten("Hydrazine", "Hydrazine", 2, new short[]{250, 250, 250, 100}, null, null);
-
-		//Create Monomethylhydrazine
-		Monomethylhydrazine = FluidUtils.generateFluidNonMolten("Monomethylhydrazine", "Monomethylhydrazine", -52, new short[]{125, 125, 125, 100}, null, null);
-
-		//Create Anthracene
-		Nitrous_Oxide = FluidUtils.generateFluidNonMolten("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100}, null, null);
-
-		//Nos
-		if (!FluidUtils.doesFluidExist("NitrousOxide")){
-			Nitrous_Oxide = FluidUtils.generateFluidNoPrefix("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100});
-		}
-		else {
-			Nitrous_Oxide = FluidUtils.getWildcardFluidStack("NitrousOxide", 1).getFluid();
-			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellNitrousOxide", 1) == null){				
-				new BaseItemComponent("NitrousOxide", "Nitrous Oxide", new short[] {10, 10, 175});
-			}
-		}
-		
-		//Unsymmetrical_Dimethylhydrazine		
-		if (FluidUtils.getFluidStack("1,1dimethylhydrazine", 1) == null){
-			Unsymmetrical_Dimethylhydrazine = FluidUtils.generateFluidNonMolten("UnsymmetricalDimethylhydrazine", "Unsymmetrical Dimethylhydrazine", -57, new short[]{70, 210, 20, 100}, null, null);
-		}
-		else {
-			Unsymmetrical_Dimethylhydrazine = FluidUtils.getFluidStack("1,1dimethylhydrazine", 1000).getFluid();
-		}
-
-		//Create Hydrated_Ammonium_Nitrate_Slurry
-		Hydrated_Ammonium_Nitrate_Slurry = FluidUtils.generateFluidNonMolten("AmmoniumNitrateSlurry", "Hydrated Ammonium Nitrate Slurry", 450, new short[]{150, 75, 150, 100}, null, null);
-
-		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
-		Ammonium_Nitrate_Dust = ItemUtils.generateSpecialUseDusts("AmmoniumNitrate", "Ammonium Nitrate", "N2H4O3", Utils.rgbtoHexValue(150, 75, 150))[0];
-
-		//Create Liquid_Oxygen
-		if (FluidUtils.getFluidStack("LiquidOxygen", 1) == null && FluidUtils.getFluidStack("liquidoxygen", 1) == null){
-			Liquid_Oxygen = FluidUtils.generateFluidNonMolten("LiquidOxygen", "Liquid Oxygen", -240, new short[]{75, 75, 220, 100}, null, null);
-		}
-		else {
-			if (FluidUtils.getFluidStack("LiquidOxygen", 1) != null ) {
-				Liquid_Oxygen = FluidUtils.getFluidStack("LiquidOxygen", 1).getFluid();				
-			}
-			else {
-				Liquid_Oxygen = FluidUtils.getFluidStack("liquidoxygen", 1).getFluid();
-			}
-			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellLiquidOxygen", 1) == null){				
-				new BaseItemComponent("LiquidOxygen", "Liquid Oxygen", new short[] {10, 10, 175});
-			}
-		}	
-
-		Formaldehyde = FluidUtils.generateFluidNonMolten("Formaldehyde", "Formaldehyde", -92, new short[]{150, 75, 150, 100}, null, null);
-		Formaldehyde_Catalyst = ItemUtils.generateSpecialUseDusts("FormaldehydeCatalyst", "Formaldehyde Catalyst", "Fe16V1", Utils.rgbtoHexValue(25, 5, 25))[0];
-
-
-		Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten("RocketFuelMixA", "H8N4C2O4 Rocket Fuel", -185, new short[]{50, 220, 50, 100}, null, null);
-		RP1_Plus_Liquid_Oxygen = FluidUtils.generateFluidNonMolten("RocketFuelMixB", "Rp-1 Fuel Mixture", -250, new short[]{250, 50, 50, 100}, null, null);
-		Monomethylhydrazine_Plus_Nitric_Acid = FluidUtils.generateFluidNonMolten("RocketFuelMixC", "CN3H7O3 Rocket Fuel", -300, new short[]{125, 75, 180, 100}, null, null);
-		Dense_Hydrazine_Mix = FluidUtils.generateFluidNonMolten("RocketFuelMixD", "Dense Hydrazine Fuel Mixture", -250, new short[]{175, 80, 120, 100}, null, null);
-
-
-
-		createRecipes();
-
-
-	}
-
-	private static void createRecipes() {
-		createKerosene();	
-		createRP1();
-		createNitrogenTetroxide();
-		createHydrazine();
-		createMonomethylhydrazine();
-
-		if (!CORE.GTNH) {
-			createLOX();
-		}
-
-
-		createHydratedAmmoniumNitrateSlurry();		
-		createAmmoniumNitrateDust();		
-		createFormaldehyde();
-		createFormaldehydeCatalyst();		
-		createUnsymmetricalDimethylhydrazine();
-
-		createRocketFuels();
-		addRocketFuelsToMap();
-
-	}
-
+	
 	public static void createKerosene(){
-		FluidStack fuelA = FluidUtils.getFluidStack("diesel", 400);
-		FluidStack fuelB = FluidUtils.getFluidStack("fuel", 400);
+		
+		
+		
+		FluidStack fuelA = FluidUtils.getFluidStack("diesel", 300);
+		FluidStack fuelB = FluidUtils.getFluidStack("fuel", 300);
+		
+		
+		
 		if (fuelA != null){
 			//GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
-			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
+			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(Kerosene, 100), 200, 64, false);
 		}
 		if (fuelA == null && fuelB != null){
 			//GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
-			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false);
+			GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelB, FluidUtils.getFluidStack(Kerosene, 100), 200, 64, false);
 		}
 	}
 
@@ -288,9 +200,9 @@ public class RocketFuels {
 
 	}
 
-	private static void addRocketFuelsToMap() {	
-		AutoMap<Recipe_GT> mRocketFuels = new AutoMap<Recipe_GT>();
-		mRocketFuels.put(new Recipe_GT(
+	private static void addRocketFuelsToMap() {		
+		HashMap<Integer, Recipe_GT> mRocketFuels = new LinkedHashMap<Integer, Recipe_GT>();
+		mRocketFuels.put(0, new Recipe_GT(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -302,7 +214,7 @@ public class RocketFuels {
 				0,
 				256)); //Fuel Value
 		
-		mRocketFuels.put(new Recipe_GT(
+		mRocketFuels.put(1, new Recipe_GT(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -314,7 +226,7 @@ public class RocketFuels {
 				0,
 				512)); //Fuel Value
 		
-		mRocketFuels.put(new Recipe_GT(
+		mRocketFuels.put(2, new Recipe_GT(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -326,7 +238,7 @@ public class RocketFuels {
 				0,
 				768)); //Fuel Value
 		
-		mRocketFuels.put(new Recipe_GT(
+		mRocketFuels.put(3, new Recipe_GT(
 				true,
 				new ItemStack[] {},
 				new ItemStack[] {},
@@ -340,15 +252,15 @@ public class RocketFuels {
 		
 		
 		//Add in default Diesel for the Buggy
-		mValidRocketFuelNames.add(Materials.Fuel.getFluid(1).getFluid().getName());
-		mValidRocketFuels.put(-1, Materials.Fuel.getFluid(1).getFluid());	
-		
-		int mID = 0;
-		for (Recipe_GT r : mRocketFuels) {
-			if (r != null) {
-				mValidRocketFuelNames.add(r.mFluidInputs[0].getFluid().getName());
-				mValidRocketFuels.put(mID++, r.mFluidInputs[0].getFluid());
-				Recipe_GT.Gregtech_Recipe_Map.sRocketFuels.add(r);				
+		mValidRocketFuels.put(-1, Diesel);	
+
+		mValidRocketFuelNames.add(FluidRegistry.getFluidName(Diesel));
+		for (int mID : mRocketFuels.keySet()) {
+			Recipe_GT aFuelRecipe = mRocketFuels.get(mID);
+			if (aFuelRecipe != null) {
+				mValidRocketFuelNames.add(FluidRegistry.getFluidName(aFuelRecipe.mFluidInputs[0].getFluid()));
+				mValidRocketFuels.put(mID, aFuelRecipe.mFluidInputs[0].getFluid());
+				Recipe_GT.Gregtech_Recipe_Map.sRocketFuels.add(aFuelRecipe);		
 			}
 		}
 
@@ -500,6 +412,333 @@ public class RocketFuels {
 
 	}
 
+	@Override
+	public String errorMessage() {
+		// TODO Auto-generated method stub
+		return "Bad Rocket Fuel Science!";
+	}
+
+	@Override
+	public boolean generateRecipes() {
+		createKerosene();	
+		createRP1();
+		createNitrogenTetroxide();
+		createHydrazine();
+		createMonomethylhydrazine();
+
+		if (!CORE.GTNH) {
+			createLOX();
+		}
+
+
+		createHydratedAmmoniumNitrateSlurry();		
+		createAmmoniumNitrateDust();		
+		createFormaldehyde();
+		createFormaldehydeCatalyst();		
+		createUnsymmetricalDimethylhydrazine();
+
+		createRocketFuels();
+		addRocketFuelsToMap();
+		
+		return true;
+	}
+
+	@Override
+	public boolean onLoadComplete(FMLLoadCompleteEvent event) {	
+
+		
+		if (MathUtils.randInt(1, 2) > 0) {
+			return false;
+		}
+		
+
+		Materials aMaterial_Chloramine = MaterialUtils.getMaterial("Chloramine");
+		Materials aMaterial_Dimethylamine = MaterialUtils.getMaterial("Dimethylamine");
+		Materials aMaterial_DilutedHydrochloricAcid = MaterialUtils.getMaterial("DilutedHydrochloricAcid");
+		Materials aMaterial_NitrogenDioxide = MaterialUtils.getMaterial("NitrogenDioxide");
+		Materials aMaterial_DinitrogenTetroxide = MaterialUtils.getMaterial("DinitrogenTetroxide");
+		Materials aMaterial_Dimethylhydrazine = MaterialUtils.getMaterial("Dimethylhydrazine");
+		
+		Materials aMaterial_Oxygen = Materials.Oxygen;
+		Materials aMaterial_Water = Materials.Water;
+		Materials aMaterial_HypochlorousAcid = MaterialUtils.getMaterial("HypochlorousAcid");
+		Materials aMaterial_Ammonia = MaterialUtils.getMaterial("Ammonia");
+		Materials aMaterial_Methanol = MaterialUtils.getMaterial("Methanol");
+		
+		if (aMaterial_Chloramine == null || aMaterial_Dimethylamine == null || aMaterial_DilutedHydrochloricAcid == null 
+				|| aMaterial_Dimethylhydrazine == null || aMaterial_NitrogenDioxide == null || aMaterial_DinitrogenTetroxide == null 
+				|| aMaterial_HypochlorousAcid == null || aMaterial_Ammonia == null || aMaterial_Methanol == null) {
+			return false;
+		}
+		
+
+		ItemStack aCellEmpty = CI.emptyCells(1);
+		ItemStack aCellWater = aMaterial_Water.getCells(1);
+		ItemStack aCellOxygen = aMaterial_Oxygen.getCells(1);
+		ItemStack aCellChloramine = aMaterial_Chloramine.getCells(1);
+		ItemStack aCellDimethylamine = aMaterial_Dimethylamine.getCells(1);
+		ItemStack aCellDilutedHydrochloricAcid = aMaterial_DilutedHydrochloricAcid.getCells(1);
+		ItemStack aCellNitrogenDioxide = aMaterial_NitrogenDioxide.getCells(1);
+		ItemStack aCellDinitrogenTetroxide = aMaterial_DinitrogenTetroxide.getCells(1);
+		ItemStack aCellDimethylhydrazine = aMaterial_Dimethylhydrazine.getCells(1);
+		
+		
+		
+		
+
+
+		GT_Recipe aChemReactor_1 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+
+		GT_Recipe aChemReactor_2 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+		
+		
+		
+		
+		GT_Recipe aChemReactor_Basic_1 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+
+		GT_Recipe aChemReactor_Basic_2 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+
+		GT_Recipe aChemReactor_Basic_3 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+
+		GT_Recipe aChemReactor_Basic_4 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+
+		GT_Recipe aChemReactor_Adv_1 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+
+		GT_Recipe aChemReactor_Adv_2 = new Recipe_GT(
+				true, //Optimise
+				new ItemStack[] {}, //I
+				new ItemStack[] {}, //O
+				null, //Special
+				new int[] {}, //Chance
+				new FluidStack[] {}, //I
+				new FluidStack[] {}, //O
+				0,  //Dura
+				0,  //Eu
+				0); //Special
+
+		
+		
+
+		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);
+		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);
+		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);
+		//RecipeUtils.removeGtRecipe(aChemReactor_Basic_1, GT_Recipe.GT_Recipe_Map.sChemicalRecipes);	
+		
+		
+		
+		
+		
+
+      /*  GT_Values.RA.addChemicalRecipe(                   Materials.Chloramine.getCells(2),    GT_Utility.getIntegratedCircuit(1),  Materials.Dimethylamine.getGas(5000), Materials.Dimethylhydrazine.getFluid(6000),        Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(1), 960, 480);        
+        GT_Values.RA.addChemicalRecipe(                   Materials.Dimethylamine.getCells(5), GT_Utility.getIntegratedCircuit(1),  Materials.Chloramine.getFluid(2000),  Materials.Dimethylhydrazine.getFluid(6000),        Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(4), 960, 480);        
+        GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Chloramine.getCells(2),    Materials.Empty.getCells(4),         Materials.Dimethylamine.getGas(5000), Materials.DilutedHydrochloricAcid.getFluid(1000),  Materials.Dimethylhydrazine.getCells(6),       GT_Values.NI, 960, 480);        
+        GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Dimethylamine.getCells(5), Materials.Empty.getCells(1),         Materials.Chloramine.getFluid(2000),  Materials.DilutedHydrochloricAcid.getFluid(1000),  Materials.Dimethylhydrazine.getCells(6),       GT_Values.NI, 960, 480);        
+        GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Dimethylamine.getCells(5), Materials.Chloramine.getCells(2),    Materials.Chloramine.getFluid(2000),  Materials.DilutedHydrochloricAcid.getFluid(1000),  Materials.Dimethylhydrazine.getCells(6),       Materials.DilutedHydrochloricAcid.getCells(1), 960, 480);        
+    	GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.HypochlorousAcid.getFluid(3000), Materials.Ammonia.getGas(8000), Materials.Methanol.getFluid(12000)}, new FluidStack[]{Materials.Dimethylhydrazine.getFluid(12000), Materials.DilutedHydrochloricAcid.getFluid(2000), Materials.Water.getFluid(9000)}, null, 1040, 480);
+        
+        GT_Values.RA.addChemicalRecipe(GT_Utility.getIntegratedCircuit(2),    GT_Values.NI,                        Materials.NitrogenDioxide.getGas(1000), Materials.DinitrogenTetroxide.getGas(1000), GT_Values.NI, 640);        
+        GT_Values.RA.addChemicalRecipe(Materials.NitrogenDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2),  GT_Values.NF,                           Materials.DinitrogenTetroxide.getGas(1000), Materials.Empty.getCells(1), 640);        
+        GT_Values.RA.addChemicalRecipe(Materials.NitrogenDioxide.getCells(1), GT_Utility.getIntegratedCircuit(12), GT_Values.NF,                           GT_Values.NF, Materials.DinitrogenTetroxide.getCells(1), 640);        
+    	GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(23)}, new FluidStack[]{Materials.Ammonia.getGas(8000), Materials.Oxygen.getGas(7000)},                                   new FluidStack[]{Materials.DinitrogenTetroxide.getGas(6000), Materials.Water.getFluid(9000)}, null, 480, 30);
+    	GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(23)}, new FluidStack[]{Materials.Nitrogen.getGas(2000), Materials.Hydrogen.getGas(6000), Materials.Oxygen.getGas(7000)}, new FluidStack[]{Materials.DinitrogenTetroxide.getGas(6000), Materials.Water.getFluid(9000)}, null, 1100, 480);
+
+        GT_Values.RA.addMixerRecipe(Materials.Dimethylhydrazine.getCells(1), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.DinitrogenTetroxide.getGas(1000), new FluidStack(ItemList.sRocketFuel, 2000), Materials.Empty.getCells(1), 60, 16);
+        GT_Values.RA.addMixerRecipe(Materials.DinitrogenTetroxide.getCells(1), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Dimethylhydrazine.getFluid(1000), new FluidStack(ItemList.sRocketFuel, 2000), Materials.Empty.getCells(1), 60, 16);
+        GT_Values.RA.addMixerRecipe(Materials.Dimethylhydrazine.getCells(2), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Oxygen.getGas(1000), new FluidStack(ItemList.sRocketFuel, 3000), Materials.Empty.getCells(2), 60, 16);
+        GT_Values.RA.addMixerRecipe(Materials.Oxygen.getCells(1), GT_Values.NI, GT_Values.NI, GT_Values.NI, Materials.Dimethylhydrazine.getFluid(2000), new FluidStack(ItemList.sRocketFuel, 3000), Materials.Empty.getCells(1), 60, 16);
+
+		
+		*/
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		//Get Rocket Fuel
+		
+		//Find recipes using default values
+		
+		//Remove	
+		
+		//Rebake map		
+		
+		return true;
+	};
+
+	@Override
+	public void items() {
+		Formaldehyde_Catalyst = ItemUtils.generateSpecialUseDusts("FormaldehydeCatalyst", "Formaldehyde Catalyst", "Fe16V1", Utils.rgbtoHexValue(25, 5, 25))[0];
+	}
+
+	@Override
+	public void blocks() {
+	}
+
+	@Override
+	public void fluids() {
+		
+		//Register default fluids
+		Diesel = MaterialUtils.getMaterial("Fuel", "Diesel").getFluid(1).getFluid();
+		Oil_Heavy = MaterialUtils.getMaterial("OilHeavy", "Oil").getFluid(1).getFluid();		
+		
+		
+		//Create Kerosene
+		Kerosene = FluidUtils.generateFluidNonMolten("Kerosene", "Kerosene", 500, new short[]{150, 40, 150, 100}, null, null);
+		CoalTar.Coal_Oil = Kerosene;
+		
+		//RP! Focket Fuel
+		RP1 = FluidUtils.generateFluidNonMolten("RP1Fuel", "RP-1 Rocket Fuel", 500, new short[]{210, 50, 50, 100}, null, null);
+
+		//Create Nitrogen Tetroxide
+		Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten("NitrogenTetroxide", "Nitrogen Tetroxide", -11, new short[]{170, 170, 0, 100}, null, null);
+
+		//Create Hydrazine
+		Hydrazine = FluidUtils.generateFluidNonMolten("Hydrazine", "Hydrazine", 2, new short[]{250, 250, 250, 100}, null, null);
+
+		//Create Monomethylhydrazine
+		Monomethylhydrazine = FluidUtils.generateFluidNonMolten("Monomethylhydrazine", "Monomethylhydrazine", -52, new short[]{125, 125, 125, 100}, null, null);
+
+		//Create Anthracene
+		Nitrous_Oxide = FluidUtils.generateFluidNonMolten("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100}, null, null);
+
+		//Nos
+		if (!FluidUtils.doesFluidExist("NitrousOxide")){
+			Nitrous_Oxide = FluidUtils.generateFluidNoPrefix("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100});
+		}
+		else {
+			Nitrous_Oxide = FluidUtils.getWildcardFluidStack("NitrousOxide", 1).getFluid();
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellNitrousOxide", 1) == null){				
+				new BaseItemComponent("NitrousOxide", "Nitrous Oxide", new short[] {10, 10, 175});
+			}
+		}
+		
+		//Unsymmetrical_Dimethylhydrazine		
+		if (FluidUtils.getFluidStack("1,1dimethylhydrazine", 1) == null){
+			Unsymmetrical_Dimethylhydrazine = FluidUtils.generateFluidNonMolten("UnsymmetricalDimethylhydrazine", "Unsymmetrical Dimethylhydrazine", -57, new short[]{70, 210, 20, 100}, null, null);
+		}
+		else {
+			Unsymmetrical_Dimethylhydrazine = FluidUtils.getFluidStack("1,1dimethylhydrazine", 1000).getFluid();
+		}
+
+		//Create Hydrated_Ammonium_Nitrate_Slurry
+		Hydrated_Ammonium_Nitrate_Slurry = FluidUtils.generateFluidNonMolten("AmmoniumNitrateSlurry", "Hydrated Ammonium Nitrate Slurry", 450, new short[]{150, 75, 150, 100}, null, null);
+
+		//Lithium Hydroperoxide - LiOH + H2O2 → LiOOH + 2 H2O
+		Ammonium_Nitrate_Dust = ItemUtils.generateSpecialUseDusts("AmmoniumNitrate", "Ammonium Nitrate", "N2H4O3", Utils.rgbtoHexValue(150, 75, 150))[0];
+
+		//Create Liquid_Oxygen
+		if (FluidUtils.getFluidStack("LiquidOxygen", 1) == null && FluidUtils.getFluidStack("liquidoxygen", 1) == null){
+			Liquid_Oxygen = FluidUtils.generateFluidNonMolten("LiquidOxygen", "Liquid Oxygen", -240, new short[]{75, 75, 220, 100}, null, null);
+		}
+		else {
+			if (FluidUtils.getFluidStack("LiquidOxygen", 1) != null ) {
+				Liquid_Oxygen = FluidUtils.getFluidStack("LiquidOxygen", 1).getFluid();				
+			}
+			else {
+				Liquid_Oxygen = FluidUtils.getFluidStack("liquidoxygen", 1).getFluid();
+			}
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellLiquidOxygen", 1) == null){				
+				new BaseItemComponent("LiquidOxygen", "Liquid Oxygen", new short[] {10, 10, 175});
+			}
+		}
+		
+
+		Formaldehyde = FluidUtils.generateFluidNonMolten("Formaldehyde", "Formaldehyde", -92, new short[]{150, 75, 150, 100}, null, null);
+		
+		Unsymmetrical_Dimethylhydrazine_Plus_Nitrogen_Tetroxide = FluidUtils.generateFluidNonMolten("RocketFuelMixA", "H8N4C2O4 Rocket Fuel", -185, new short[]{50, 220, 50, 100}, null, null);
+		RP1_Plus_Liquid_Oxygen = FluidUtils.generateFluidNonMolten("RocketFuelMixB", "Rp-1 Fuel Mixture", -250, new short[]{250, 50, 50, 100}, null, null);
+		Monomethylhydrazine_Plus_Nitric_Acid = FluidUtils.generateFluidNonMolten("RocketFuelMixC", "CN3H7O3 Rocket Fuel", -300, new short[]{125, 75, 180, 100}, null, null);
+		Dense_Hydrazine_Mix = FluidUtils.generateFluidNonMolten("RocketFuelMixD", "Dense Hydrazine Fuel Mixture", -250, new short[]{175, 80, 120, 100}, null, null);
+
+		
+	}
+
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
new file mode 100644
index 0000000000..1c28f99ff8
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
@@ -0,0 +1,111 @@
+package gtPlusPlus.core.item.crafting;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.general.ItemGenericToken;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+public class ItemDummyResearch extends ItemGenericToken {
+	
+	public static enum ASSEMBLY_LINE_RESEARCH {
+		
+		
+		RESEARCH_1_CONTAINMENT("Containment Fields", "Advanced scientific study"),
+		RESEARCH_2_BASIC_CHEM("Basic Chemistry", "Time to start at the beginning"),
+		RESEARCH_3_ADV_CHEM("Advanced Chemistry", "Best learn more than chemical equations"),
+		RESEARCH_4_BASIC_PHYSICS("Basic Physics", "Fundamental laws of motion"),
+		RESEARCH_5_ADV_PHYSICS("Advanced Physics", "Advanced knowledge!"),
+		RESEARCH_6_BASIC_METALLURGY("Basic Metallurgy", "Information about material smelting"),
+		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!");	
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		private String mName;
+		private String mDesc;
+		
+		private ASSEMBLY_LINE_RESEARCH(String aName, String aDesc) {
+			mName = aName;
+			mDesc = aDesc;
+			ModItems.itemDummyResearch.register(mName, mDesc);
+		}
+		
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	private static Map<String, Integer> mInternalNameToIdMap = new LinkedHashMap<String, Integer>();
+	
+	public static ItemStack getResearchStack(ASSEMBLY_LINE_RESEARCH aResearchName, int aStacksize) {
+		Integer aMeta = mInternalNameToIdMap.get(Utils.sanitizeString(aResearchName.mName));
+		if (aMeta == null) {
+			aMeta = 0;
+		}		
+		return ItemUtils.simpleMetaStack(ModItems.itemDummyResearch, aMeta, aStacksize);
+	}
+	
+	private int aID = 0;
+	public ItemDummyResearch() {
+		super("dummyResearch", "Research", new String[] {"This object requires some further study"}, "research");
+		
+
+		
+	}
+	
+	/**
+	 * 
+	 * @param aResearchType - What is the research for?
+	 * @param aDescriptThe - tooltip for this research
+	 * @return - Did we register a custom research item?
+	 */
+	public boolean register(String aResearchType, String aDescript) {
+		int aNewID = aID++;
+		mInternalNameToIdMap.put(Utils.sanitizeString(aResearchType), aNewID);
+		return register(aNewID, "Research on "+aResearchType, 1, aDescript);
+	}
+	
+	@Override
+	public boolean register(int id, String aLocalName, int aMaxStack, String aDescript) {		
+		return register(id, aLocalName, 1, new String[] {aDescript, EnumChatFormatting.DARK_GRAY+"Used to further your knowledge"}, EnumRarity.common, EnumChatFormatting.LIGHT_PURPLE);
+	}	
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public final void registerIcons(final IIconRegister aIconRegister) {
+		for (int i = 0, j = mLocalNames.size(); i < j; i++) {
+			mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + "research" + "/" + "note"));
+		}
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
index eb22f8fa07..5ef72b6f17 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
@@ -17,7 +17,7 @@ import gtPlusPlus.core.lib.CORE;
 
 public class ItemControlCore extends Item {
 
-	public IIcon[] icons = new IIcon[10];
+	public static IIcon[] icons = new IIcon[10];
 
 	public ItemControlCore() {
 		super();
@@ -31,16 +31,16 @@ public class ItemControlCore extends Item {
 
 	@Override
 	public void registerIcons(IIconRegister reg) {
-		this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0");
-		this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1");
-		this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2");
-		this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3");
-		this.icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4");
-		this.icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5");
-		this.icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6");
-		this.icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7");
-		this.icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8");
-		this.icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9");
+		icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0");
+		icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1");
+		icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2");
+		icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3");
+		icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4");
+		icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5");
+		icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6");
+		icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7");
+		icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8");
+		icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9");
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
index dfd5eca203..c076bf5c95 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -19,37 +19,38 @@ import net.minecraft.util.IIcon;
 
 public class ItemGenericToken extends CoreItem {
 
-	public final static HashMap<Integer, String> mLocalNames;
-	public final static HashMap<Integer, Integer> mMaxStackSizes;
-	public final static HashMap<Integer, String[]> mDescriptionArrays;
-	public final static HashMap<Integer, EnumRarity> mRarities;
-	public final static HashMap<Integer, EnumChatFormatting> mCustomNameColours;
-	public final static HashMap<Integer, IIcon> mIcons;
-
-	static {
+	public final HashMap<Integer, String> mLocalNames;
+	public final HashMap<Integer, Integer> mMaxStackSizes;
+	public final HashMap<Integer, String[]> mDescriptionArrays;
+	public final HashMap<Integer, EnumRarity> mRarities;
+	public final HashMap<Integer, EnumChatFormatting> mCustomNameColours;
+	public final HashMap<Integer, IIcon> mIcons;
+	private final String mTextureDir;
+
+	public ItemGenericToken() {
+		this("itemGenericToken", "Token", new String[] { "Can be reclaimed in some way, shape or form" }, "token");
+	}
+	
+	public ItemGenericToken(String aUnlocalName, String aInternalName, String[] aBaseTooltip, String aTextureDir) {
+		super(aUnlocalName, aInternalName, AddToCreativeTab.tabMisc, 64, 1000, aBaseTooltip, EnumRarity.common,	EnumChatFormatting.RESET, false, null);
 		mLocalNames = new HashMap<Integer, String>();
 		mMaxStackSizes = new HashMap<Integer, Integer>();
 		mDescriptionArrays = new HashMap<Integer, String[]>();
 		mRarities = new HashMap<Integer, EnumRarity>();
 		mCustomNameColours = new HashMap<Integer, EnumChatFormatting>();
 		mIcons = new HashMap<Integer, IIcon>();
+		mTextureDir = aTextureDir;
 	}
 
-	public ItemGenericToken() {
-		super("itemGenericToken", "Token", AddToCreativeTab.tabMisc, 64, 1000,
-				new String[] { "Can be reclaimed in some way, shape or form" }, EnumRarity.common,
-				EnumChatFormatting.RESET, false, null);
-	}
-
-	public static boolean register(int id, String aLocalName, int aMaxStack, String aDescript) {
+	public boolean register(int id, String aLocalName, int aMaxStack, String aDescript) {
 		return register(id, aLocalName, aMaxStack, new String[] { aDescript });
 	}
 
-	public static boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript) {
+	public boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript) {
 		return register(id, aLocalName, aMaxStack, aDescript, EnumRarity.common, EnumChatFormatting.RESET);
 	}
 
-	public static boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript, EnumRarity aRarity,
+	public boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript, EnumRarity aRarity,
 			EnumChatFormatting aCustomNameColour) {
 		int[][] sizes = new int[2][6];
 		sizes[0][0] = mLocalNames.size();
@@ -153,9 +154,9 @@ public class ItemGenericToken extends CoreItem {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public final void registerIcons(final IIconRegister aIconRegister) {
+	public void registerIcons(final IIconRegister aIconRegister) {
 		for (int i = 0, j = mLocalNames.size(); i < j; i++) {
-			mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + "token" + "/" + i));
+			mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + mTextureDir + "/" + i));
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
index 7f6a52f135..2f49ac1287 100644
--- a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
+++ b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
@@ -27,6 +27,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class ItemBaseBook extends ItemWritableBook{
 
@@ -113,11 +114,11 @@ public class ItemBaseBook extends ItemWritableBook{
 		
 		if (player.worldObj.isRemote){
 			try {
-				Class<?> clazz = Class.forName("net.minecraft.client.gui.GuiScreenBook");
+				Class<?> clazz = ReflectionUtils.getClass("net.minecraft.client.gui.GuiScreenBook");
 				Constructor<?> ctor = clazz.getConstructor(EntityPlayer.class, ItemStack.class, boolean.class);
 				Object object = ctor.newInstance(new Object[] { player, bookstack, false });
 				Minecraft.getMinecraft().displayGuiScreen((GuiScreen) object);
-			} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+			} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
diff --git a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
index 592b68d06a..a95fab4b6c 100644
--- a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
+++ b/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java
@@ -21,6 +21,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class ItemEntityCatcher extends Item implements IEntityCatcher {
 
@@ -117,14 +118,10 @@ public class ItemEntityCatcher extends Item implements IEntityCatcher {
 		}
 		Class<? extends Entity> mEntityClass;
 		String mClassName;
-		mClassName = NBTUtils.getString(aStack,"mClassName");
-		try {
-			mEntityClass = (Class<? extends Entity>) Class.forName(mClassName);
-			if (mEntityClass != null) {
-				return mEntityClass;
-			}
-		}
-		catch (ClassNotFoundException e) {
+		mClassName = NBTUtils.getString(aStack, "mClassName");
+		mEntityClass = (Class<? extends Entity>) ReflectionUtils.getClass(mClassName);
+		if (mEntityClass != null) {
+			return mEntityClass;
 		}
 		return null;
 	}
diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java
new file mode 100644
index 0000000000..9467c3a58c
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java
@@ -0,0 +1,123 @@
+package gtPlusPlus.core.item.general.throwables;
+
+import java.util.List;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ItemThrowableBomb extends CoreItem {
+
+	private static AutoMap<ItemStack> mLighters = new AutoMap<ItemStack>();
+	public static IIcon[] icons = new IIcon[10];
+	
+	public ItemThrowableBomb() {
+		super("gtpp.throwable.bomb", "Bomb", AddToCreativeTab.tabMisc, 16, 0, new String[] {"Just like Bomberman", "Have a fire source in inventory to prime"}, EnumRarity.uncommon, EnumChatFormatting.GRAY, false, null);
+		this.setHasSubtypes(true);
+	}
+	
+	@Override
+	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
+		
+		if (mLighters.isEmpty()) {
+			mLighters.put(ItemUtils.getSimpleStack(Items.flint_and_steel));
+			mLighters.put(ItemList.Tool_Lighter_Invar_Full.get(1));
+			mLighters.put(ItemList.Tool_Lighter_Invar_Used.get(1));
+			mLighters.put(ItemList.Tool_Lighter_Platinum_Full.get(1));
+			mLighters.put(ItemList.Tool_Lighter_Platinum_Used.get(1));
+			mLighters.put(ItemUtils.getSimpleStack(ModItems.itemBasicFireMaker));
+		}
+		
+		//Unlit
+		if (item.getItemDamage() == 0) {
+			boolean hasLighter = false;
+			for (ItemStack aPlaySlot : player.inventory.mainInventory) {
+				if (aPlaySlot != null) {
+					for (ItemStack aLighter : mLighters) {
+						if (GT_Utility.areStacksEqual(aPlaySlot, aLighter)) {
+							hasLighter = true;
+							break;
+						}					
+					}
+				}
+			}		
+			if (hasLighter) {
+				item.setItemDamage(1);
+			}
+		}
+		//Lit
+		else if (item.getItemDamage() == 1) {
+			if (!player.capabilities.isCreativeMode) {
+				--item.stackSize;
+			}
+			world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+			if (!world.isRemote) {
+				world.spawnEntityInWorld(new EntityThrowableBomb(world, player));
+			}
+			/*if (item.stackSize <= 0) {
+				item = null;
+			}*/
+		}
+		return item;		
+	}
+	
+
+
+	@Override
+	public void registerIcons(IIconRegister reg) {
+		icons[0] = reg.registerIcon(CORE.MODID + ":" + "bomb");
+		icons[1] = reg.registerIcon(CORE.MODID + ":" + "bomb_lit");
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return this.icons[meta];
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+		for (int i = 0; i < 2; i ++) {
+			list.add(new ItemStack(item, 1, i));
+		}
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+		String aLitStatus = "unlit";
+		if (stack.getItemDamage() == 0) {
+			aLitStatus = EnumChatFormatting.BLUE+"Unlit";
+		}
+		else if (stack.getItemDamage() == 1) {
+			aLitStatus = EnumChatFormatting.RED+"Lit";
+		}		
+		list.add(EnumChatFormatting.GOLD+"Fuse Status: "+aLitStatus);
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack p_77653_1_) {
+		// TODO Auto-generated method stub
+		return super.getItemStackDisplayName(p_77653_1_);
+	}
+	
+	
+	
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
index 77a06edac2..94ebb3ffcb 100644
--- a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
+++ b/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java
@@ -21,24 +21,24 @@ public class ItemsFoods {
 
 		//Raisin Bread
 		ModItems.itemIngotRaisinBread = new BaseItemFood("itemIngotRaisinBread", "Raisin Bread", 3, 1.5f, false, new PotionEffect(Potion.weakness.id, 40, 1)).setAlwaysEdible();
-		GT_OreDictUnificator.registerOre("foodRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemIngotRaisinBread", 1));
+		GT_OreDictUnificator.registerOre("foodRaisinBread", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemIngotRaisinBread", 1));
 		//Hot Raisin Bread
 		ModItems.itemHotIngotRaisinBread = new BaseItemHotFood("itemHotIngotRaisinBread", 1, 0.5f, "Raisin Bread", 120, ModItems.itemIngotRaisinBread);
-		GT_OreDictUnificator.registerOre("foodHotRaisinBread", ItemUtils.getItemStack(CORE.MODID+":itemHotIngotRaisinBread", 1));
+		GT_OreDictUnificator.registerOre("foodHotRaisinBread", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemHotIngotRaisinBread", 1));
 
 		//Raisin Bread
 		ModItems.itemFoodRaisinToast = new BaseItemFood("itemFoodRaisinToast", "Raisin Toast", 1, 0.5f, false).setAlwaysEdible();
-		GT_OreDictUnificator.registerOre("foodRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemFoodRaisinToast", 1));
+		GT_OreDictUnificator.registerOre("foodRaisinToast", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemFoodRaisinToast", 1));
 		//Hot Raisin Bread
 		ModItems.itemHotFoodRaisinToast = new BaseItemHotFood("itemHotFoodRaisinToast", 1, 0.5f, "Raisin Toast", 20, ModItems.itemFoodRaisinToast);
-		GT_OreDictUnificator.registerOre("foodHotRaisinToast", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodRaisinToast", 1));
+		GT_OreDictUnificator.registerOre("foodHotRaisinToast", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemHotFoodRaisinToast", 1));
 
 		//Raisin Bread
 		ModItems.itemFoodCurriedSausages = new BaseItemFood("itemFoodCurriedSausages", "Curried Sausages", 5, 2f, false);
-		GT_OreDictUnificator.registerOre("foodCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemFoodCurriedSausages", 1));
+		GT_OreDictUnificator.registerOre("foodCurriedSausages", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemFoodCurriedSausages", 1));
 		//Hot Raisin Bread
 		ModItems.itemHotFoodCurriedSausages = new BaseItemHotFood("itemHotFoodCurriedSausages", 1, 0.5f, "Curried Sausages", 240, ModItems.itemFoodCurriedSausages);
-		GT_OreDictUnificator.registerOre("foodHotCurriedSausages", ItemUtils.getItemStack(CORE.MODID+":itemHotFoodCurriedSausages", 1));
+		GT_OreDictUnificator.registerOre("foodHotCurriedSausages", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemHotFoodCurriedSausages", 1));
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
new file mode 100644
index 0000000000..d0f3005d00
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
@@ -0,0 +1,100 @@
+package gtPlusPlus.core.item.tool.misc;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class DebugScanner extends CoreItem {
+
+	public DebugScanner() {
+		super("gtpp.debug.scanner", AddToCreativeTab.tabTools, 1, 0, 
+				new String[] {
+					"Used to obtain information from GT/GT++ content",
+					"Right Click to use",
+					},
+				EnumRarity.epic);
+		setTextureName(CORE.MODID + ":itemStickyRubber");
+	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int p_77648_4_,
+			int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) {
+		// TODO Auto-generated method stub
+		return super.onItemUse(aStack, aPlayer, aWorld, p_77648_4_, p_77648_5_, p_77648_6_, p_77648_7_, p_77648_8_,
+				p_77648_9_, p_77648_10_);
+	}
+
+	@Override
+	public boolean isRepairable() {
+		return false;
+	}
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) {
+		// TODO Auto-generated method stub
+		return super.onItemRightClick(p_77659_1_, p_77659_2_, p_77659_3_);
+	}
+
+	@Override
+	public float getDigSpeed(ItemStack itemstack, Block block, int metadata) {
+		return 0f;
+	}
+
+	@Override
+	public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) {
+		if (entity != null && player != null) {
+			PlayerUtils.messagePlayer(player, "Entity ID: "+entity.getEntityId());
+			PlayerUtils.messagePlayer(player, "UUID: "+entity.getUniqueID());
+			PlayerUtils.messagePlayer(player, "Invulnerable? "+entity.isEntityInvulnerable());
+			PlayerUtils.messagePlayer(player, "Invisible? "+entity.isInvisible());
+			PlayerUtils.messagePlayer(player, "Age: "+entity.ticksExisted);
+			
+			if (entity instanceof EntityLiving) {
+				EntityLiving g = (EntityLiving) entity;
+				PlayerUtils.messagePlayer(player, "Health: "+g.getHealth()+"/"+g.getMaxHealth());
+				PlayerUtils.messagePlayer(player, "On ground? "+g.onGround);
+				PlayerUtils.messagePlayer(player, "Can Loot? "+g.canPickUpLoot());
+				PlayerUtils.messagePlayer(player, "Child? "+g.isChild());
+				if (entity instanceof EntityPlayer) {
+					EntityPlayer y = (EntityPlayer) entity;
+					PlayerUtils.messagePlayer(player, "Experience: "+y.experience);
+					PlayerUtils.messagePlayer(player, "Name: "+y.getCommandSenderName());				
+				}
+				
+			}
+			
+		}
+		return true;
+	}
+
+	@Override
+	public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) {
+		return false;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return true;
+	}
+
+	@Override
+	public int getHarvestLevel(ItemStack stack, String toolClass) {
+		return 0;
+	}
+
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
index b42ac41a37..4616ab0aa0 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java
@@ -19,6 +19,7 @@ import gregtech.api.interfaces.IItemBehaviour;
 import gregtech.api.interfaces.IItemContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_LanguageManager;
@@ -110,8 +111,8 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 				aPumpName, // Name
 				aEuMax, // Eu Storage
 				(short) aTier, // Tier
-				"Can be used to remove fluids from GT machine input slots.", // Tooltip
-				EnumRarity.common, // Rarity
+				"Can be used to remove fluids from GT machine input & output slots.", // Tooltip
+				aTier <= 0 ? EnumRarity.common : aTier == 1 ? EnumRarity.uncommon : aTier == 2 ? EnumRarity.rare : aTier == 3 ? EnumRarity.epic : EnumRarity.common, // Rarity
 				EnumChatFormatting.GRAY, // Desc colour
 				false // Effect?
 				);
@@ -183,7 +184,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 		return false;
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings({ "unchecked" })
 	@Override
 	public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList, final boolean aF3_H) {
 		// aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
@@ -199,7 +200,9 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 
 		if (aOffsetMeta <= 3) {
 			FluidStack f = getFluid(aStack);
-			aList.add("Can also drain any other standard fluid container block.");
+			aList.add("Can also drain any other standard fluid container block");
+			aList.add("Cannot be emptied via RMB, use inside a tank with GUI");
+			aList.add(EnumChatFormatting.DARK_GRAY+"This is technically just a fancy fluid cell");
 			aList.add(EnumChatFormatting.BLUE + (f != null ? f.getLocalizedName() : "No Fluids Contained"));
 			aList.add(EnumChatFormatting.BLUE + (f != null ? ""+f.amount : ""+0) + "L" + " / " + getCapacity(aStack) + "L");
 		}
@@ -496,7 +499,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 		return this;
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({ "unchecked" })
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void getSubItems(final Item var1, final CreativeTabs aCreativeTab, final List aList) {
@@ -968,9 +971,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 						if ((tTileEntity instanceof IGregTechTileEntity)) {
 							return this.drainTankGT(tTileEntity, aStack, aWorld, aPlayer, aX, aY, aZ);
 						} 
-						/*else if ((tTileEntity instanceof IFluidTank || tTileEntity instanceof IFluidHandler)) {
+						//Try support Standard Fluid Tanks too (May disable if dupes appear again)
+						else if ((tTileEntity instanceof IFluidTank || tTileEntity instanceof IFluidHandler)) {
 							return this.drainIFluidTank(tTileEntity, aStack, aWorld, aPlayer, aX, aY, aZ);
-						}*/
+						}
 					}
 				}
 			}
@@ -1095,7 +1099,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 		FluidStack f = aTileEntity.getFluid();
 		Logger.WARNING("Returning Fluid stack from tile. Found: "
 				+ (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing"));
-		return f.copy();
+		return f;
 	}
 
 	public FluidStack getStoredFluidOfVanillaTank(IFluidHandler aTileEntity) {
@@ -1126,7 +1130,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 				FluidStack f = ((IFluidTank) aTileEntity).getFluid();
 				if (aSetFluid == null) {
 					aSetFluid = f;
-					aSetFluid.amount = 0;
+					aSetFluid.amount = f.amount;
 				}
 				int toDrain = (f.amount - aSetFluid.amount);
 				FluidStack newStack;
@@ -1144,44 +1148,48 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 					return false;
 				}
 			}
-			else {
-				Logger.WARNING("Tile Was instanceof IFluidHandler.");
-				FluidStack containedStack = null;
-				if ((IFluidHandler) aTileEntity != null) {
-					FluidTankInfo[] a1 = (((IFluidHandler) aTileEntity).getTankInfo(ForgeDirection.UNKNOWN));
-					if (a1 != null) {
-						if (a1[0] != null) {
-							Logger.WARNING("Found Fluid in Tank.");
-							containedStack = a1[0].fluid;
-						}
-					}
+			else {			
+				
+				//Rewrite Fluid handling for Vanilla type tanks
+				if (!IFluidHandler.class.isInstance(aTileEntity)) {
+					Logger.WARNING("Tile Was not an instance of IFluidHandler.");
+					return false;
 				}
-				if (containedStack != null) {
-					if (aSetFluid == null) {
-						aSetFluid = containedStack;
-						aSetFluid.amount = 0;
-					}
-					int toDrain = (containedStack.amount - aSetFluid.amount);
-					Logger.WARNING("Found "+containedStack.amount+"L of "+containedStack.getLocalizedName()+". Trying to drain "+toDrain+"L.");
-					FluidStack newStack;
-					if (toDrain <= 0) {
-						Logger.WARNING("Draining Nothing");
-						newStack = containedStack;
-					} else {
-						Logger.WARNING("Draining Something");
-						newStack = ((IFluidTank) aTileEntity).drain(toDrain, true);
+				
+								
+				IFluidHandler aTank = (IFluidHandler) aTileEntity;				
+				FluidStack aTankContents = null;
+				FluidTankInfo[] a1 = aTank.getTankInfo(ForgeDirection.UNKNOWN);
+				if (a1 != null) {
+					if (a1[0] != null) {
+						aTankContents = a1[0].fluid;
+						Logger.WARNING("Found Fluid in Tank. "+aTankContents.getLocalizedName()+" - "+aTankContents.amount);
 					}
-
-					if (newStack.isFluidEqual(aSetFluid) && newStack.amount == aSetFluid.amount) {
-						Logger.WARNING("Removed fluid from vanilla IFluidHandler successfully.");
+				}
+				if (aSetFluid == null) {
+					Logger.WARNING("Setting fluid to tank contents, as we're going to empty it totally.");			
+					aSetFluid = aTankContents.copy();
+				}
+				else {
+					Logger.WARNING("Setting fluid to tank contents, as we're going to empty it totally.");							
+				}
+				Logger.WARNING("Tile Was instance of IFluidHandler. Trying to Drain "+aSetFluid.getLocalizedName()+" - "+aSetFluid.amount);
+				
+				if (a1 == null || aTankContents == null) {
+					Logger.WARNING("Tank is empty.");	
+					return false;
+				}
+				//Found some Fluid in the tank
+				else {
+					FluidStack aDrainedStack = aTank.drain(ForgeDirection.UNKNOWN, aSetFluid, true);					
+					if (aDrainedStack.isFluidStackIdentical(aSetFluid)) {
+						Logger.WARNING("Drained!");	
 						return true;
-					} else {
-						Logger.WARNING("Failed trying to remove fluid from vanilla IFluidHandler.");
-						return false;
 					}
-				} else {
-					Logger.WARNING("Could not drain vanilla tank, IFluidHandler claims there is no fluid.");
-					return false;
+					else {
+						Logger.WARNING("Partially Drained! This is probably an error.");	
+						return true;
+					}					
 				}
 			}
 		} else {
@@ -1214,9 +1222,36 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 
 	public FluidStack getStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) {
 		FluidStack f = aTileEntity.mFluid;
+		
+		//Let's see if this machine has output fluid too
+		if (f == null) {
+			Logger.WARNING("Could not find any input fluid, checking output if possible.");
+			if (aTileEntity instanceof GT_MetaTileEntity_BasicMachine) {
+				GT_MetaTileEntity_BasicMachine g = (GT_MetaTileEntity_BasicMachine) aTileEntity;
+				Logger.WARNING("Tile is a Basic Machine of some sort - "+g.mNEIName);
+				if (g != null) {
+					f = g.mOutputFluid;
+					if (f != null) {
+						Logger.WARNING("Found output fluid! "+f.getLocalizedName());
+					}
+					else {
+						Logger.WARNING("Did not find anything!");
+						f = g.getFluid();
+						if (f != null) {
+							Logger.WARNING("Found fluid! "+f.getLocalizedName());
+						}
+						else {
+							Logger.WARNING("Did not find anything!");
+							f = g.getFluid();
+						}
+					}					
+				}
+			}
+		}
+		
 		Logger.WARNING("Returning Fluid stack from tile. Found: "
 				+ (f != null ? f.getLocalizedName() + " - " + f.amount + "L" : "Nothing"));
-		return f.copy();
+		return f;
 	}
 
 	public boolean setStoredFluidOfGTMachine(IGregTechTileEntity aTileEntity, FluidStack aSetFluid) {
@@ -1238,6 +1273,12 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri
 
 	public boolean setStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity, FluidStack aSetFluid) {
 		try {
+			
+			//Try Handle Outputs First			
+			if (aTileEntity.setDrainableStack(aSetFluid) != null) {
+				return true;
+			}			
+			
 			aTileEntity.mFluid = aSetFluid;
 			boolean b = aTileEntity.mFluid == aSetFluid;
 			Logger.WARNING("Trying to set Tile's tank. - Behaviour Class. [3] " + b);
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index c7d09b959d..632378987a 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -9,7 +9,6 @@ import gregtech.api.GregTech_API;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.minecraft.gregtech.recipehandlers.GregtechRecipe;
 import gtPlusPlus.core.util.sys.GeoUtils;
 import gtPlusPlus.core.util.sys.NetworkUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
@@ -52,7 +51,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.7.02.24";
+	public static final String VERSION = "1.7.02.99-pre";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
@@ -203,7 +202,7 @@ public class CORE {
 		public static boolean disableIC2Recipes = false;
 		public static boolean enableAlternativeDivisionSigilRecipe = false;
 		public static int boilerSteamPerSecond = 750;
-		public static boolean requireControlCores = true;
+		public static final boolean requireControlCores = false;
 
 		//Feature Related
 		public static boolean enableCustomCapes = false;
diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
index e749885dd6..5a2b75337b 100644
--- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
@@ -54,6 +54,7 @@ public class LoadedMods {
 	public static boolean StevesCarts = false;
 	public static boolean Witchery = false;
 	public static boolean Waila = false;
+	public static boolean CropsPlusPlus = false; //Barts Crop Mod
 
 
 
@@ -96,6 +97,11 @@ public class LoadedMods {
 			Logger.INFO("Components enabled for: PlayerAPI");
 			totalMods++;
 		}
+		if (Loader.isModLoaded("berriespp")) {
+			CropsPlusPlus = true;
+			Logger.INFO("Components enabled for: Crops++");
+			totalMods++;
+		}
 		if (Loader.isModLoaded("TConstruct")){
 			TiCon = true;
 			Logger.INFO("Components enabled for: Tinkers Construct");
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index c7397962ad..4edd36c51f 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -524,11 +524,11 @@ public final class ALLOY {
 			"Zirconium Carbide", //Material Name
 			MaterialState.SOLID, //State
 			new short[]{222, 202, 180, 0}, //Material Colour
-			1855, //Melting Point in C
+			1555, //Melting Point in C
 			-1,
 			-1,
 			-1,
-			true, //Uses Blast furnace?
+			false, //Uses Blast furnace?
 			//Material Stacks with Percentage of required elements.
 			new MaterialStack[]{
 					new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50),
@@ -787,7 +787,7 @@ public final class ALLOY {
 					new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
 					new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
 					new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),					
-					new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
 					new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)
 			});
 	
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 99bc37444e..62e1163a39 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -11,6 +11,8 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class ELEMENT {
 
+	public static final String[] NAMES = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminum", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Cesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};	
+	
 	//First 50 Elements
 	public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
 	public final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
@@ -148,8 +150,8 @@ public final class ELEMENT {
 	public final Material AMERICIUM241 = new Material("Americium-241", MaterialState.SOLID, TextureSets.NUCLEAR.get(), Materials.Americium.mDurability, Materials.Americium.mRGBa, Materials.Americium.mMeltingPoint, Materials.Americium.mBlastFurnaceTemp, 95, 146, false, StringUtils.superscript("241Am"), 2, false);//Not a GT Inherited Material
 
 	public final Material MAGIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Magic, new short[] {10, 185, 140});
-	public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium);	
-
+	public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium);
+	
 	static {
 		Logger.MATERIALS("Initialising Base Elements.");
 	}
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 03e50aa7dd..58a7f68afe 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.material;
 
 import static gregtech.api.enums.GT_Values.M;
+import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,6 +15,7 @@ import gregtech.api.enums.TextureSet;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
+import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -21,7 +23,8 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
+import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
@@ -75,7 +78,9 @@ public class Material {
 	public int vToolQuality;
 	public int vHarvestLevel;
 
-	private GTPP_Aspects[] vAspects;
+	private TC_Aspect_Wrapper[] vAspects;
+	
+	public BaseTinkersMaterial vTiConHandler;
 
 
 	public static AutoMap<Materials> invalidMaterials = new AutoMap<Materials>();
@@ -317,28 +322,13 @@ public class Material {
 				this.vDurability = durability;
 			}
 			else {
-				if (inputs != null){
-					long durabilityTemp = 0;
-					int counterTemp = 0;
-					for (final MaterialStack m : inputs){
-						if (m.getStackMaterial() != null){
-							if (m.getStackMaterial().vDurability != 0){
-								durabilityTemp =  (durabilityTemp+m.getStackMaterial().vDurability);
-								counterTemp++;
-
-							}
-						}
-					}
-					if ((durabilityTemp != 0) && (counterTemp != 0)){
-						this.vDurability = (durabilityTemp/counterTemp);
-					}
-					else {
-						this.vDurability = 8196;
+				long aTempDura = 0;
+				for (MaterialStack g : this.getComposites()) {
+					if (g != null) {
+						aTempDura += safeCast_LongToInt(g.getStackMaterial().getMass() * 2000);
 					}
 				}
-				else {
-					this.vDurability = 0;
-				}
+				this.vDurability = aTempDura > 0 ? aTempDura : (this.getComposites().isEmpty() ? 51200 : 32000 * this.getComposites().size());
 			}
 
 			if ((this.vDurability >= 0) && (this.vDurability < 64000)){
@@ -362,8 +352,8 @@ public class Material {
 				this.vHarvestLevel = 4;
 			}
 			else {
-				this.vToolQuality = 0;
-				this.vHarvestLevel = 0;
+				this.vToolQuality = 1;
+				this.vHarvestLevel = 1;
 			}
 
 			//Sets the Rad level
@@ -506,6 +496,12 @@ public class Material {
 			}			
 
 			this.textureSet = setTextureSet(set, vTier);
+			
+			if (LoadedMods.TiCon && this.materialState == MaterialState.SOLID) {
+				if (this.getProtons() >= 98 || this.getComposites().size() > 1 || this.getMeltingPointC() >= 3600) {
+					this.vTiConHandler = new BaseTinkersMaterial(this);
+				}
+			}
 
 			Logger.MATERIALS("Creating a Material instance for "+materialName);
 			Logger.MATERIALS("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
@@ -759,7 +755,11 @@ public class Material {
 	}
 
 	final public Block getBlock(){
-		return Block.getBlockFromItem(getBlock(1).getItem());
+		Block b = Block.getBlockFromItem(getBlock(1).getItem());
+		if (b == null) {
+			Logger.INFO("[ERROR] Tried to get invalid block for "+this.getLocalizedName()+", returning debug block instead.");
+		}
+		return b != null ? b : Blocks.lit_furnace;
 	}
 
 	public final ItemStack getBlock(final int stacksize){
diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/Java/gtPlusPlus/core/material/ORES.java
index a8b86a142c..801e4924b3 100644
--- a/src/Java/gtPlusPlus/core/material/ORES.java
+++ b/src/Java/gtPlusPlus/core/material/ORES.java
@@ -807,15 +807,15 @@ public final class ORES {
 			-1,
 			4, //Radiation
 			new MaterialStack[]{// Na3AlF6
-					new MaterialStack(ELEMENT.getInstance().RADON, 3),
-					new MaterialStack(ELEMENT.getInstance().RADIUM, 2),
+					new MaterialStack(ELEMENT.getInstance().RADON, 2),
+					new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
 					new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
-					new MaterialStack(ELEMENT.getInstance().URANIUM238, 13),
-					new MaterialStack(ELEMENT.getInstance().THORIUM, 28),
-					new MaterialStack(ELEMENT.getInstance().THORIUM232, 5),
-					new MaterialStack(FLUORCAPHITE, 4),
-					new MaterialStack(SAMARSKITE_Y, 6),
-					new MaterialStack(TITANITE, 2)
+					new MaterialStack(ELEMENT.getInstance().URANIUM238, 10),
+					new MaterialStack(ELEMENT.getInstance().THORIUM, 25),
+					new MaterialStack(ELEMENT.getInstance().THORIUM232, 4),
+					new MaterialStack(FLUORCAPHITE, 6),
+					new MaterialStack(SAMARSKITE_Y, 8),
+					new MaterialStack(TITANITE, 4)
 			});
 	
 	
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 25103c0f5a..a4dc366aee 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.recipe;
 
 import static gtPlusPlus.core.lib.CORE.GTNH;
 
+import cpw.mods.fml.common.Loader;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.GT_Values;
@@ -17,11 +18,15 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.IonParticles;
+import gtPlusPlus.core.item.chemistry.RocketFuels;
+import gtPlusPlus.core.item.crafting.ItemDummyResearch;
+import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.MaterialStack;
+import gtPlusPlus.core.material.ORES;
 import gtPlusPlus.core.material.Particle;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
@@ -81,10 +86,34 @@ public class RECIPES_GREGTECH {
 		breweryRecipes();
 		laserEngraverRecipes();
 		assemblyLineRecipes();
+		latheRecipes();
+		vacuumFreezerRecipes();
 		
 		addFuels();
 	}
 
+	private static void vacuumFreezerRecipes() {
+		GT_Values.RA.addVacuumFreezerRecipe(GregtechItemList.Bomb_Cast_Molten.get(1), GregtechItemList.Bomb_Cast_Set.get(1), 20 * 30);		
+	}
+
+	private static void latheRecipes() {
+		
+		GT_Values.RA.addLatheRecipe(
+				ALLOY.EGLIN_STEEL.getBlock(1),
+				GregtechItemList.Bomb_Cast_Mold.get(1),
+				null,
+				20 * 60 * 15,
+				120);
+		
+		GT_Values.RA.addLatheRecipe(
+				GregtechItemList.Bomb_Cast_Set.get(1),
+				GregtechItemList.Bomb_Cast_Broken.get(2),
+				ItemUtils.getSimpleStack(ModItems.itemBombCasing, 2),
+				20 * 60 * 5,
+				30);
+		
+	}
+
 	private static void fusionRecipes() {		
 
 	    /**
@@ -122,9 +151,21 @@ public class RECIPES_GREGTECH {
 
 	private static void assemblyLineRecipes() {
 		
+
+		
+		ItemStack[] aCoilWire = new ItemStack[] {
+				ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 64 : 32),
+				ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 48 : 16),
+				ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 2, GTNH ? 32 : 8),
+				ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 3, GTNH ? 16 : 4),
+		};
+		
+		
+		
+		
 		//Containment Casings
 		CORE.RA.addAssemblylineRecipe(
-				ItemList.Field_Generator_IV.get(1), 
+				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), 
 				20 * 60 * 30,
 				new ItemStack[] {
 						ItemList.Field_Generator_IV.get(GTNH ? 32 : 16),
@@ -139,7 +180,8 @@ public class RECIPES_GREGTECH {
 						CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32),
 						CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 32 : 16),
 						CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8),
-						GregtechItemList.Laser_Lens_Special.get(1)
+						GregtechItemList.Laser_Lens_Special.get(1),
+						aCoilWire[3]
 				}, 
 				new FluidStack[] {
 						ALLOY.NITINOL_60.getFluid(144 * 9 * (GTNH ? 4 : 2)),
@@ -174,10 +216,7 @@ public class RECIPES_GREGTECH {
 						CI.getTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
 						CI.getTertiaryTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
 						CI.getAlternativeTieredFluid(6, 144 * 9 * (GTNH ? 8 : 4)),
-						CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
-						CI.getTertiaryTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
-						CI.getAlternativeTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),
-						
+						CI.getTieredFluid(5, 144 * 9 * (GTNH ? 16 : 8)),						
 				},
 				GregtechItemList.Miniature_Fusion.get(1), 
 				20 * 60 * 5 * (GTNH ? 2 : 1),
@@ -194,6 +233,7 @@ public class RECIPES_GREGTECH {
 						CI.getTieredComponent(OrePrefixes.pipeHuge, 5, GTNH ? 16 : 4),
 						CI.getTieredComponent(OrePrefixes.cableGt08, 7, GTNH ? 32 : 16),
 						CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 8 : 4),
+						aCoilWire[2]
 				}, 
 				new FluidStack[] {
 						CI.getTieredFluid(4, 144 * 9 * (GTNH ? 16 : 8)),
@@ -205,6 +245,182 @@ public class RECIPES_GREGTECH {
 				20 * 60 * 1 * (GTNH ? 2 : 1),
 				(int) GT_Values.V[5]);
 		
+		
+		/*
+		 * Contianment casings
+		 */
+		
+		ItemStack[] aGemCasings = new ItemStack[] {
+				GregtechItemList.Battery_Casing_Gem_1.get(1), 
+				GregtechItemList.Battery_Casing_Gem_2.get(1), 
+				GregtechItemList.Battery_Casing_Gem_3.get(1), 
+				GregtechItemList.Battery_Casing_Gem_4.get(1), 
+		};
+		ItemStack[] aResearch = new ItemStack[] {
+				Particle.getBaseParticle(Particle.UNKNOWN), 
+				GregtechItemList.Battery_Casing_Gem_1.get(1), 
+				GregtechItemList.Battery_Casing_Gem_2.get(1), 
+				GregtechItemList.Battery_Casing_Gem_3.get(1),
+		};
+		
+		int aCasingSlot = 0;
+		for (int j = 6; j < 10; j++) {
+			CORE.RA.addAssemblylineRecipe(
+					aResearch[aCasingSlot], 
+					20 * 60 * 60,
+					new ItemStack[] {
+							CI.getTieredComponent(OrePrefixes.plate, j-1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.circuit, j-2, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.cableGt08, j+1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.gearGt, j-1, GTNH ? 8 : 4),
+							aCoilWire[aCasingSlot]
+					}, 
+					new FluidStack[] {
+							CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)),
+							CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)),
+							
+					},
+					aGemCasings[aCasingSlot++], 
+					20 * 60 * 1 * (GTNH ? 2 : 1),
+					(int) GT_Values.V[j]);
+		}
+		
+		/*
+		 * Gem Battery Recipes
+		 */
+		
+		ItemStack[] aGemBatteries = new ItemStack[] {
+				GregtechItemList.Battery_Gem_1.get(1), 
+				GregtechItemList.Battery_Gem_2.get(1), 
+				GregtechItemList.Battery_Gem_3.get(1), 
+				GregtechItemList.Battery_Gem_4.get(1), 
+		};
+		
+		ItemStack[] aExoticInputs = new ItemStack[] {
+				Particle.getBaseParticle(Particle.PROTON), 
+				Particle.getBaseParticle(Particle.ELECTRON), 
+				Particle.getBaseParticle(Particle.CHARM), 
+				Particle.getBaseParticle(Particle.GRAVITON)			
+		};
+		aCasingSlot = 0;
+		for (int j = 6; j < 10; j++) {
+			CORE.RA.addAssemblylineRecipe(
+					aExoticInputs[aCasingSlot], 
+					20 * 60 * 60 * 5,
+					new ItemStack[] {
+							aGemCasings[aCasingSlot],
+							ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.plate, j, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.circuit, j, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.wireGt16, j+1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4),
+							CI.getTieredComponent(OrePrefixes.screw, j-1, GTNH ? 8 : 4),
+					}, 
+					new FluidStack[] {
+							CI.getTieredFluid(j, 144 * 3 * (GTNH ? 16 : 8)),
+							CI.getTertiaryTieredFluid(j-2, 144 * 4 * (GTNH ? 16 : 8)),
+							CI.getAlternativeTieredFluid(j, 144 * 6 * (GTNH ? 16 : 8)),	
+							CI.getTertiaryTieredFluid(j-1, 144 * 5 * (GTNH ? 16 : 8)),							
+					},
+					aGemBatteries[aCasingSlot++], 
+					20 * 60 * 1 * (GTNH ? 2 : 1),
+					(int) GT_Values.V[j]);
+		}
+		
+		
+		//Nano Healer
+		CORE.RA.addAssemblylineRecipe(
+				ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), 
+				20 * 60 * 10,
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2),
+						CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16),
+						CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4),
+						CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8),
+						CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3),
+						CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8),
+						CI.getTieredComponent(OrePrefixes.bolt, 5, GTNH ? 24 : 12),
+						CI.getTieredComponent(OrePrefixes.frameGt, 4, GTNH ? 12 : 6),
+						aCoilWire[3]
+				}, 
+				new FluidStack[] {
+						CI.getTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+						CI.getTertiaryTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+						CI.getAlternativeTieredFluid(6, 144 * 18 * (GTNH ? 16 : 8)),
+						CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
+						
+				},
+				ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), 
+				20 * 60 * 30 * (GTNH ? 2 : 1),
+				(int) GT_Values.V[7]);
+		
+		
+		
+		//Charge Pack LuV-UV
+
+		ItemStack[] aChargeResearch = new ItemStack[] {
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack1, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack2, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack3, 1),
+		};
+		
+		ItemStack[] aChargeOutputs = new ItemStack[] {
+				ItemUtils.getSimpleStack(ModItems.itemChargePack1, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack2, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack3, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack4, 1),			
+		};
+
+		ItemStack[] aBufferCoreInputs = new ItemStack[] {
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", GTNH ? 8 : 4),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", GTNH ? 8 : 4),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", GTNH ? 8 : 4),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", GTNH ? 8 : 4),
+		};
+		
+		int aCurrSlot = 0;
+		for (int h = 6; h < 10; h++) {
+			CORE.RA.addAssemblylineRecipe(
+					aChargeResearch[aCurrSlot], 
+					20 * 60 * 10 * (aCurrSlot + 1),
+					new ItemStack[] {
+							ItemUtils.getSimpleStack(
+							aGemBatteries[aCurrSlot], GTNH ? 4 : 2),
+							aBufferCoreInputs[aCurrSlot],
+							aCoilWire[aCurrSlot],
+							CI.getTieredComponent(OrePrefixes.plate, h, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.plate, h-1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.circuit, h, GTNH ? 16 : 4),
+							CI.getTieredComponent(OrePrefixes.circuit, h-1, GTNH ? 32 : 8),
+							CI.getTieredComponent(OrePrefixes.cableGt12, h-1, GTNH ? 32 : 16),
+							CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8),
+							CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16),
+							CI.getElectricMotor(h, GTNH ? 8 : 4),
+							CI.getFieldGenerator(h-1, 2),
+							CI.getRobotArm(h-2, GTNH ? 4 : 2),
+					}, 
+					new FluidStack[] {
+							CI.getTieredFluid(h, 144 * 18 * (GTNH ? 8 : 4)),
+							CI.getTertiaryTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
+							CI.getAlternativeTieredFluid(h-1, 144 * 18 * (GTNH ? 8 : 4)),
+							CI.getAlternativeTieredFluid(h-2, 144 * 18 * (GTNH ? 8 : 4)),							
+					},
+					aChargeOutputs[aCurrSlot], 
+					20 * 60 * 30 * (GTNH ? 2 : 1) * (aCurrSlot+1),
+					(int) GT_Values.V[h]);
+			aCurrSlot++;
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+		
 	}
 
 	private static void laserEngraverRecipes() {		
@@ -236,6 +452,15 @@ public class RECIPES_GREGTECH {
 				ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1),
 				20 * 60 * 5,
 				MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.vTier));	
+
+		
+		GT_Values.RA.addLaserEngraverRecipe(
+				CI.getFieldGenerator(6, 1),
+				CI.getEmitter(7, 2),
+				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1),
+				20 * 60 * 5,
+				MaterialUtils.getVoltageForTier(5));
+		
 		
 	}
 
@@ -496,21 +721,29 @@ public class RECIPES_GREGTECH {
 		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion),
 				ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250));
 
-		// Hydrofluoric Acid
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
-				ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
-				FluidUtils.getFluidStack("hydrofluoricacid", 250), null);
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
-				ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 250));
 
+		
+		// Hydrofluoric Acid
+		boolean addedGtExtraction = false;
+		// Try use Internal GT Fluid first
 		if (Utils.getGregtechVersionAsInt() >= 50929) {
 			// Hydrofluoric Acid
 			GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
 					ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
 					FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250), null);
-			GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+			addedGtExtraction = GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
 					ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250));
 		}
+		//Add a Fill recipe for GT++ Acid
+		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
+				ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+				FluidUtils.getFluidStack("hydrofluoricacid", 125), null);
+		//Add an empty recipe, but only if we didn't for the standard GT HF. Prevents Fluid transformation exploits.
+		if (!addedGtExtraction)
+		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+				ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 125));
+
+		
 	}
 
 	private static void cokeOvenRecipes() {
@@ -868,6 +1101,23 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) }, // Output		
 				3 * 20, // Time in ticks
 				30); // EU
+		
+		/*
+		 * Try Add custom Recipe for drying leather
+		 */		
+		if (LoadedMods.PamsHarvestcraft && Loader.isModLoaded("Backpack")) {			
+			ItemStack aLeather1, aLeather2;			
+			aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1);
+			aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1);			
+			CORE.RA.addDehydratorRecipe(
+					aLeather1,
+					GT_Values.NF,
+					new ItemStack[] {
+							aLeather2
+					},
+					5 * 20,
+					180);
+		}
 
 	}
 
@@ -1024,6 +1274,21 @@ public class RECIPES_GREGTECH {
 				FluidUtils.getFluidStack("molten.krypton", 500),
 				T6, 2000, 512000);
 
+		addAR(ItemUtils.getItemStackOfAmountFromOreDict(
+				"dustClay", 32),
+				GregtechItemList.Bomb_Cast_Mold.get(0),
+				FluidUtils.getWater(4000),
+				GregtechItemList.Bomb_Cast.get(4),
+				30, 120);
+		addAR(ItemUtils.getSimpleStack(Items.redstone, 32),
+				ItemUtils.getSimpleStack(ModItems.itemRope, 16),
+				Materials.Glue.getFluid(500),
+				ItemUtils.getSimpleStack(ModItems.itemDetCable, 24),
+				30, 
+				120);
+		
+
+
 		/*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
 				ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null,
 				GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/
@@ -1240,6 +1505,52 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallThorium", 20),
 				ELEMENT.getInstance().URANIUM232.getDust(1), GT_Values.NI, GT_Values.NI, GT_Values.NI,
 				new int[] { 0, 0, 10 }, 500 * 20, 2000);
+		
+
+		//Process Used Fuel Rods for Krypton
+		
+		//Uranium
+		GT_Values.RA.addCentrifugeRecipe(
+				CI.getNumberedCircuit(20),
+				ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumSimpledepleted", 8),
+				GT_Values.NF,
+				ELEMENT.getInstance().KRYPTON.getFluid(60),
+				ItemList.IC2_Fuel_Rod_Empty.get(8),
+				ELEMENT.getInstance().URANIUM238.getDust(2),
+				ELEMENT.getInstance().URANIUM232.getSmallDust(1),
+				ELEMENT.getInstance().URANIUM233.getSmallDust(1),
+				ELEMENT.getInstance().URANIUM235.getSmallDust(1),
+				ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
+				new int[] { 0, 0, 1000, 1000, 1000, 500 }, 500 * 20, 4000);
+		//Mox
+		GT_Values.RA.addCentrifugeRecipe(
+				CI.getNumberedCircuit(20),
+				ItemUtils.getItemStackFromFQRN("IC2:reactorMOXSimpledepleted", 8),
+				GT_Values.NF,
+				ELEMENT.getInstance().KRYPTON.getFluid(90),
+				ItemList.IC2_Fuel_Rod_Empty.get(8),
+				ELEMENT.getInstance().PLUTONIUM244.getDust(2),
+				ELEMENT.getInstance().PLUTONIUM241.getTinyDust(1),
+				ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
+				ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1),
+				ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1),
+				new int[] { 0, 0, 500, 500, 500, 500 }, 750 * 20, 4000);
+		
+		//Thorium
+		GT_Values.RA.addCentrifugeRecipe(
+				CI.getNumberedCircuit(20),
+				ItemList.Depleted_Thorium_1.get(8),
+				GT_Values.NF,
+				ELEMENT.getInstance().KRYPTON.getFluid(30),
+				ItemList.IC2_Fuel_Rod_Empty.get(8),
+				ELEMENT.getInstance().THORIUM.getDust(2),
+				ELEMENT.getInstance().THORIUM232.getDust(1),
+				ELEMENT.getInstance().LUTETIUM.getSmallDust(1),
+				ELEMENT.getInstance().POLONIUM.getSmallDust(1),
+				ELEMENT.getInstance().THALLIUM.getTinyDust(1),
+				new int[] { 0, 0, 5000, 5000, 5000, 2500 }, 250 * 20, 4000);
+		
+		
 
 	}
 
@@ -1293,6 +1604,24 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16), FluidUtils.getFluidStack("water", 1000),
 				FluidUtils.getFluidStack("lithiumhydroxide", 144 * 4),
 				CI.emptyCells(1), 300 * 20);
+		
+		//Bombs
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getSimpleStack(ModItems.itemBombCasing, 4),
+				ItemUtils.getSimpleStack(RocketFuels.Ammonium_Nitrate_Dust, 8),
+				Materials.Fuel.getFluid(1000),
+				null,
+				ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4),
+				300 * 20);
+		
+		GT_Values.RA.addChemicalRecipe(
+				ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4),
+				ItemUtils.getSimpleStack(ModItems.itemDetCable, 4),
+				FluidUtils.getFluidStack(RocketFuels.Kerosene, 100),
+				null,
+				ItemUtils.getSimpleStack(ModItems.itemBomb, 4),
+				10 * 20);
+		
 
 		// LFTR Fuel Related Compounds
 		if (GTNH) {
@@ -1369,11 +1698,45 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void blastFurnaceRecipes() {
+
+	    //public boolean addBlastRecipe(
+		//ItemStack aInput1, ItemStack aInput2, 
+		//FluidStack aFluidInput, FluidStack aFluidOutput, 
+		//ItemStack aOutput1, ItemStack aOutput2,
+		//int aDuration, int aEUt, int aLevel)		
+		
 		GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1), GT_Values.NF, GT_Values.NF,
 				ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), null, 60 * 20, 2000, 3000);
 		GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1), null, GT_Values.NF,
 				GT_Values.NF, ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1), null, 60 * 20, 340, 300);
+		
+		
+		//Synthetic Graphite
+		GT_Values.RA.addBlastRecipe(
+				CI.getNumberedCircuit(22),
+				ALLOY.SILICON_CARBIDE.getDust(16),
+				ELEMENT.getInstance().NITROGEN.getFluid(4000),
+				GT_Values.NF,
+				ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 8),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSilicon", 8),
+				60 * 20,
+				MaterialUtils.getVoltageForTier(GTNH ? 5 : 4),
+				4500);
+		
+		//Bomb Casings
+		GT_Values.RA.addBlastRecipe(
+				GregtechItemList.Bomb_Cast.get(4),
+				ALLOY.STEEL.getDust(16),
+				ELEMENT.getInstance().OXYGEN.getFluid(2000),
+				GT_Values.NF,
+				GregtechItemList.Bomb_Cast_Molten.get(4),
+				null,
+				4 * 60 * 20,
+				MaterialUtils.getVoltageForTier(GTNH ? 3 : 2),
+				2800);
+		
+		
 	}
 
 	private static void autoclaveRecipes() {
@@ -1397,6 +1760,8 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 1));
 		GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9),
 				ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1));
+		
+		CORE.RA.addCompressorRecipe(ItemList.FusionComputer_UV.get(9), GregtechItemList.Compressed_Fusion_Reactor.get(1), (int) GT_Values.V[7], (int) GT_Values.V[8]);
 	}
 
 	private static void macerationRecipes() {
@@ -1405,10 +1770,9 @@ public class RECIPES_GREGTECH {
 
 		GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9));
-		/*
-		 * GT_ModHandler.addPulverisationRecipe( FLUORIDES.FLUORITE.getOre(1),
-		 * FLUORIDES.FLUORITE.getDust(4));
-		 */
+
+		GT_ModHandler.addPulverisationRecipe(GregtechItemList.Bomb_Cast_Broken.get(1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustClay", 3));
 
 		if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) {
 			GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1),
@@ -1482,7 +1846,7 @@ public class RECIPES_GREGTECH {
 		// Quark Smash
 		CORE.RA.addCyclotronRecipe(
 				CI.getNumberedCircuit(3),
-				FluidUtils.getFluidStack("plasma.hydrogen", 1000),
+				FluidUtils.getFluidStack("plasma.hydrogen", 100),
 				new ItemStack[] {
 						Particle.getBaseParticle(Particle.UP),
 						Particle.getBaseParticle(Particle.DOWN),
@@ -1493,7 +1857,7 @@ public class RECIPES_GREGTECH {
 						}, 
 				null,
 				new int[] { 50, 50, 50, 50, 50, 50 },
-				20 * 300 * 38,
+				20 * 300 * 9,
 				(int) GT_Values.V[7],
 				750 * 20);
 
@@ -1510,8 +1874,8 @@ public class RECIPES_GREGTECH {
 						Particle.getBaseParticle(Particle.TAU_NEUTRINO),
 						}, 
 				null,
-				new int[] { 60, 40, 20, 15, 10, 5 },
-				20 * 300 * 38,
+				new int[] { 600, 40, 20, 15, 10, 5 },
+				20 * 300 * 8,
 				(int) GT_Values.V[7],
 				750 * 20);
 
@@ -1527,8 +1891,8 @@ public class RECIPES_GREGTECH {
 						Particle.getBaseParticle(Particle.HIGGS_BOSON),
 						}, 
 				null,
-				new int[] { 60, 60, 50, 50, 1 },
-				20 * 300 * 38,
+				new int[] { 160, 260, 150, 150, 1 },
+				20 * 300 * 6,
 				(int) GT_Values.V[7],
 				750 * 20);
 		
@@ -1549,7 +1913,7 @@ public class RECIPES_GREGTECH {
 						}, 
 				null,
 				new int[] { 10, 20, 20, 10, 10, 5, 5, 2 },
-				17 * 247 * 134,
+				17 * 247 * 32,
 				(int) GT_Values.V[8],
 				750 * 20);
 		
@@ -1732,6 +2096,30 @@ public class RECIPES_GREGTECH {
 				15000);
 		
 		
+		//Create Strange Dust		
+		CORE.RA.addCyclotronRecipe(
+				new ItemStack[] {
+						ELEMENT.getInstance().PLUTONIUM238.getDust(1),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						Particle.getBaseParticle(Particle.UNKNOWN),
+						},
+				FluidUtils.getFluidStack(FluidUtils.getWildcardFluidStack("ender", 1000), 1000),
+				new ItemStack[] {
+						ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT.getDust(1)
+						}, 
+				null,
+				new int[] { 2500 },
+				20 * 60 * 15,
+				(int) GT_Values.V[7],
+				15000);
+		
+		
 		
 		
 
@@ -1806,7 +2194,23 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1), new int[] { 10000, 2500, 4000 },
 				20 * 20, 24);
+		// Zircon
+		GT_Values.RA.addElectromagneticSeparatorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMagnetite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), new int[] { 10000, 1250, 2500 },
+				20 * 20, 24);
+		GT_Values.RA.addElectromagneticSeparatorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), new int[] { 10000, 1250, 2500 },
+				20 * 20, 24);
+		
+		
 
+		if (!GTNH) {		
 		// Trinium
 		GT_Values.RA.addElectromagneticSeparatorRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedNaquadah", 1),
@@ -1829,7 +2233,12 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1), new int[] { 10000, 3000, 3000 },
-				20 * 20, 24);
+				20 * 20, 24);		
+		}
+		
+		
+		
+		
 	}
 
 	private static void advancedMixerRecipes() {
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 58f9d64066..6ed5c71bcc 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -16,6 +16,7 @@ import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
@@ -49,7 +50,7 @@ public class RECIPES_General {
 			RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian);
 			RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
 			RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);	
-			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);			
+			RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1);			
 			OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(ModBlocks.blockWorkbench);
 			OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);	
 			run();
@@ -126,9 +127,9 @@ public class RECIPES_General {
 		//Iron bars
 		final ItemStack ironBars;
 		if (CORE.GTNH) {
-			ironBars = ItemUtils.getItemStack("dreamcraft:item.SteelBars", 1);
+			ironBars = ItemUtils.getItemStackFromFQRN("dreamcraft:item.SteelBars", 1);
 		} else {
-			ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
+			ironBars = ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 1);
 		}
 
 		//Fish Trap
@@ -153,12 +154,44 @@ public class RECIPES_General {
 						null, CI.craftingToolWrench, null,
 						ironRecipe, ironRecipe, ironRecipe,
 						ironRecipe, ironRecipe, ironRecipe,
-						ItemUtils.getItemStack("minecraft:iron_bars", 8))) {
+						ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 8))) {
 					Logger.INFO("Re-added old GT recipe for Iron Bars.");			
 				}
 			}
 		}
 
+
+		//Shaped Crafting for ULV Material Dusts		
+		
+		//Potin
+		if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {"dustLead", "dustBronze", "dustTin",
+				"dustLead", "dustBronze"}, ALLOY.POTIN.getDust(5))){
+			Logger.INFO("Added shapeless recipe for Potin Dust.");
+		}
+		
+		//Tumbaga
+		if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {
+				"dustGold", "dustGold", "dustCopper"}, ItemUtils.getSimpleStack(ModItems.dustTumbagaMix))){
+			Logger.INFO("Added shapeless recipe for Tumbaga Mix.");
+		}	
+		if (RecipeUtils.addShapelessGregtechRecipe(new Object[] {
+				ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+				ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+				ItemUtils.getSimpleStack(ModItems.dustTumbagaMix),
+				"dustGold"
+				},
+				ALLOY.TUMBAGA.getDust(10))){
+			Logger.INFO("Added shapeless recipe for Tumbaga Dust.");
+		}
+
+
+
+
+
+
+
+
+
 		//Mining Explosive
 		Logger.RECIPE("[Inspection] Explosives");
 		if (RecipeUtils.recipeBuilder(
@@ -202,14 +235,14 @@ public class RECIPES_General {
 			Logger.INFO("Added a recipe for Wither Cages.");
 		}
 
-		Logger.RECIPE("[Inspection] Xp Converter");
+		/*Logger.RECIPE("[Inspection] Xp Converter");
 		if (RecipeUtils.recipeBuilder(
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
 				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
 				ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){
 			Logger.INFO("Added a recipe for XP Converter.");
-		}
+		}*/
 
 
 
@@ -247,7 +280,19 @@ public class RECIPES_General {
 				ItemUtils.getSimpleStack(ModBlocks.blockNet, 2))){
 			Logger.INFO("Added a recipe for Nets.");
 		}
-		
+
+		// Slow Builders Ring
+		CORE.RA.addSixSlotAssemblingRecipe(
+				new ItemStack[] { ItemUtils.getSimpleStack(Blocks.ice, 8),
+						ItemUtils.getSimpleStack(ModBlocks.blockNet, 8), ItemUtils.getSimpleStack(Blocks.vine, 8),
+						ALLOY.TUMBAGA.getRing(1), },
+				FluidUtils.getWater(1000), // Fluid
+				ItemUtils.getItemStackFromFQRN("miscutils:SlowBuildingRing", 1), // Output
+				20 * 30, // Dur
+				16); // Eu
+
+
+
 
 
 	}
@@ -279,8 +324,8 @@ public class RECIPES_General {
 					input, input, input,
 					input, input, input,
 					output)){
-						Logger.INFO("Added a recipe for Compressed Obsidian ["+r+"]");
-					}
+				Logger.INFO("Added a recipe for Compressed Obsidian ["+r+"]");
+			}
 
 			if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{output}, ItemUtils.getSimpleStack(input, 9))){
 				Logger.INFO("Added a shapeless recipe for Compressed Obsidian ["+r+"]");
@@ -289,52 +334,52 @@ public class RECIPES_General {
 		}
 		return true;
 	}
-	
+
 	private static void addHandPumpRecipes() {
 		if (RecipeUtils.recipeBuilder(
 				CI.electricPump_LV, "circuitBasic", null,
 				"ringBrass", CI.electricMotor_LV, "circuitBasic",
 				"plateSteel", "plateSteel", "rodBrass",
 				ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1)))	
-		Logger.INFO("Added recipe for Hand Pump I - true");
+			Logger.INFO("Added recipe for Hand Pump I - true");
 		if (RecipeUtils.recipeBuilder(
 				CI.electricPump_MV, "circuitAdvanced", null,
 				"ringMagnalium", CI.electricMotor_MV, "circuitAdvanced",
 				"plateAluminium", "plateAluminium", "rodMagnalium",
 				ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1)))	
-		Logger.INFO("Added recipe for Hand Pump II - true");	
+			Logger.INFO("Added recipe for Hand Pump II - true");	
 		if (RecipeUtils.recipeBuilder(
 				CI.electricPump_HV, "circuitData", null,
 				"ringChrome", CI.electricMotor_HV, "circuitData",
 				"plateStainlessSteel", "plateStainlessSteel", "rodChrome",
 				ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1)))		
-		Logger.INFO("Added recipe for Hand Pump III - true");
+			Logger.INFO("Added recipe for Hand Pump III - true");
 		if (RecipeUtils.recipeBuilder(
 				CI.electricPump_EV, "circuitElite", null,
 				"ringTitanium", CI.electricMotor_EV, "circuitElite",
 				"plateTungstenSteel", "plateTungstenSteel", "rodTitanium",
 				ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1)))	
-		Logger.INFO("Added recipe for Hand Pump IV - true");
-		
-		
-		
+			Logger.INFO("Added recipe for Hand Pump IV - true");
+
+
+
 		GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 1, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1000, 1), 30, 30);
 		GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 2, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1001, 1), 120, 120);
 		GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 3, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1002, 1), 480, 480);
 		GT_Values.RA.addAssemblerRecipe(ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), CI.getNumberedCircuit(20), ItemUtils.simpleMetaStack(ModItems.toolGregtechPump, 1003, 1), 1820, 1820);
-		
-				
+
+
 	}
-	
+
 	private static void migratedRecipes() {
-		
+
 		RecipeUtils.generateMortarRecipe(ItemUtils.getSimpleStack(ModItems.itemPlateRawMeat), ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1));
-		
+
 		generateWireRecipes(ELEMENT.getInstance().ZIRCONIUM);
 		generateWireRecipes(ALLOY.HG1223);
 		generateWireRecipes(ALLOY.LEAGRISIUM);
 		generateWireRecipes(ALLOY.TRINIUM_TITANIUM);
-		
+
 		GT_Materials[] g = new GT_Materials[] {
 				GT_Materials.Staballoy,
 				GT_Materials.Tantalloy60,
@@ -347,7 +392,7 @@ public class RECIPES_General {
 				GT_Materials.Inconel792,
 				GT_Materials.HastelloyX,
 				GT_Materials.TriniumNaquadahCarbonite,
-				
+
 		};
 		for (GT_Materials e : g) {
 			if (e == GT_Materials.Void) {
@@ -358,16 +403,16 @@ public class RECIPES_General {
 			int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16;
 			generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
 		}
-		
+
 		Materials[] h = new Materials[] {
 				Materials.Europium,
 				Materials.Tungsten,
 				Materials.DarkSteel,
 				Materials.Clay,
 				Materials.Lead,
-				
+
 		};
-		
+
 		for (Materials e : h) {
 			if (e == Materials.DarkSteel) {
 				if (!LoadedMods.EnderIO) {
@@ -377,13 +422,13 @@ public class RECIPES_General {
 			int tVoltageMultiplier = (e.mBlastFurnaceTemp >= 2800) ? 64 : 16;
 			generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier);
 		}
-		
+
 		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK)
-		RecipeUtils.addShapedGregtechRecipe(
-				CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4],
-				CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3),
-				CI.component_Plate[4], CI.electricPump_HV, CI.component_Plate[4],
-				GregtechItemList.Hatch_Air_Intake.get(1L, new Object[0]));
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4],
+					CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3),
+					CI.component_Plate[4], CI.electricPump_HV, CI.component_Plate[4],
+					GregtechItemList.Hatch_Air_Intake.get(1L, new Object[0]));
 
 		RecipeUtils.addShapedGregtechRecipe(CI.component_Plate[6], ALLOY.MARAGING250.getGear(1), CI.component_Plate[6],
 				CI.getTieredCircuitOreDictName(4), GregtechItemList.Casing_AdvancedVacuum.get(1),
@@ -399,55 +444,55 @@ public class RECIPES_General {
 				CI.getTieredCircuitOreDictName(7), GregtechItemList.Casing_Naq_Reactor_A.get(1),
 				CI.getTieredCircuitOreDictName(7), CI.component_Plate[9], ItemList.Hatch_Input_ZPM.get(1),
 				CI.component_Plate[8], GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0]));
-		
+
 
 		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_LV.get(1) });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_MV.get(1) });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_HV.get(1) });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_EV.get(1) });		
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_IV.get(1) });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_LuV.get(1) });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_UV.get(1) });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd,
-				new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), Character.valueOf('P'),
-						GregtechItemList.Pollution_Cleaner_MAX.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_LV.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_MV.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_HV.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_EV.get(1) });		
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_IV.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_LuV.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_ZPM.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_UV.get(1) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), bitsd,
+					new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), Character.valueOf('P'),
+							GregtechItemList.Pollution_Cleaner_MAX.get(1) });
 		}
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
+
+
+
+
+
+
+
+
+
+
 	}
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index a12e8b28fd..54d9994edc 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -97,16 +97,16 @@ public class RECIPES_Machines {
 
 
 	//Buffer Cores
-	public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStack("miscutils:item.itemBufferCore1", 1);
-	public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1);
-	public static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStack("miscutils:item.itemBufferCore3", 1);
-	public static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStack("miscutils:item.itemBufferCore4", 1);
-	public static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStack("miscutils:item.itemBufferCore5", 1);
-	public static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStack("miscutils:item.itemBufferCore6", 1);
-	public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStack("miscutils:item.itemBufferCore7", 1);
-	public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStack("miscutils:item.itemBufferCore8", 1);
-	public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStack("miscutils:item.itemBufferCore9", 1);
-	public static ItemStack RECIPE_BufferCore_MAX = ItemUtils.getItemStack("miscutils:item.itemBufferCore10", 1);
+	public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore1", 1);
+	public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1);
+	public static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore3", 1);
+	public static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore4", 1);
+	public static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore5", 1);
+	public static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore6", 1);
+	public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1);
+	public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1);
+	public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1);
+	public static ItemStack RECIPE_BufferCore_MAX = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1);
 
 
 	//Wire
@@ -181,7 +181,7 @@ public class RECIPES_Machines {
 
 	//Lava Boiler
 	public static ItemStack boiler_Coal;
-	public static ItemStack blockBricks = ItemUtils.getItemStack("minecraft:brick_block", 1);
+	public static ItemStack blockBricks = ItemUtils.getItemStackFromFQRN("minecraft:brick_block", 1);
 
 	//Batteries
 	public static String batteryBasic = "batteryBasic";
@@ -207,10 +207,20 @@ public class RECIPES_Machines {
 	}
 
 	private static void run(){
+		
+		//Determines Casing Recipe Output
+		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !GTNH){
+			Casing_Amount=2;
+		}
+		else {
+			Casing_Amount=1;
+		}	
+		
 		initModItems();
 		controlCores();
 		energyCores();
 		wirelessChargers();
+		largeArcFurnace();
 	}
 
 	private static void initModItems(){
@@ -276,85 +286,128 @@ public class RECIPES_Machines {
 
 	private static void runModRecipes(){
 		if (LoadedMods.Gregtech){
-			//Determines Casing Recipe Output
-			if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !GTNH){
-				Casing_Amount=2;
-			}
-			else {
-				Casing_Amount=1;
-			}
-
-
+			
 			//Computer Cube			
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-						ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (GTNH ? 2 : 1)),						
-						ItemList.Cover_Screen.get(4),
-						CI.machineHull_IV,
-						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2)
+							ItemUtils.getSimpleStack(CI.getDataOrb(), 4 * (GTNH ? 2 : 1)),						
+							ItemList.Cover_Screen.get(4),
+							CI.machineHull_IV,
+							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2)
 					}, 
 					ELEMENT.getInstance().TANTALUM.getFluid(144 * 16), 
 					GregtechItemList.Gregtech_Computer_Cube.get(1),
 					60 * 20 * 3, 
 					8000);
-			
+
 			//Circuit programmer			
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-						ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (GTNH ? 2 : 1)),						
-						ItemList.Cover_Controller.get(1, CI.electricMotor_MV),
-						CI.machineHull_MV,
-						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2),
-						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(3), 2)
+							ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (GTNH ? 2 : 1)),						
+							ItemList.Cover_Controller.get(1, CI.electricMotor_MV),
+							CI.machineHull_MV,
+							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2),
+							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2)
 					}, 
 					ELEMENT.getInstance().IRON.getFluid(144 * 4), 
 					ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer),
 					60 * 10 * 1, 
 					30);
-			
+
 			//Lead Lined Chest		
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-						CI.machineHull_LV,
-						ItemUtils.getItemStackOfAmountFromOreDict("plateRubber", 32),
-						ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9),
-						ItemUtils.getSimpleStack(Blocks.chest)
+							CI.machineHull_LV,
+							ItemUtils.getItemStackOfAmountFromOreDict("plateRubber", 32),
+							ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9),
+							ItemUtils.getSimpleStack(Blocks.chest)
 					}, 
 					ELEMENT.getInstance().LEAD.getFluid(144 * 16), 
 					ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest),
 					60 * 10 * 3, 
 					60);
-			
+
 			//RTG	
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-						ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1),
-						ALLOY.NITINOL_60.getPlate(GTNH ? 32 : 8),
-						ALLOY.MARAGING350.getGear(GTNH ? 16 : 4),
-						ItemUtils.getSimpleStack(GTNH ? CI.fieldGenerator_IV : CI.fieldGenerator_EV, 8 ),
-						ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
-						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 7 : 6), GTNH ? 5 : 4)
+							ItemUtils.getItemStackWithMeta(true, "IC2:blockGenerator:6", "IC2-RTG", 6, 1),
+							ALLOY.NITINOL_60.getPlate(GTNH ? 32 : 8),
+							ALLOY.MARAGING350.getGear(GTNH ? 16 : 4),
+							ItemUtils.getSimpleStack(GTNH ? CI.fieldGenerator_IV : CI.fieldGenerator_EV, 8 ),
+							ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32),
+							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 7 : 6), GTNH ? 5 : 4)
 					}, 
 					ALLOY.NIOBIUM_CARBIDE.getFluid(144 * 16), 
 					GregtechItemList.RTG.get(1),
 					60 * 20 * 10, 
 					8000);
-			
+
 			// Super Jukebox		
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
-						CI.machineHull_LV,
-						ItemUtils.getItemStackOfAmountFromOreDict("circuitBaisc", 8),
-						ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
-						ItemUtils.getSimpleStack(Blocks.jukebox)
+							CI.machineHull_LV,
+							ItemUtils.getItemStackOfAmountFromOreDict("circuitBasic", 4),
+							ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8),
+							ItemUtils.getSimpleStack(Blocks.jukebox)
 					}, 
 					ELEMENT.getInstance().COPPER.getFluid(144 * 2), 
 					ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox),
 					20 * 30, 
 					30);
 			
+			//Poo Collector		
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.machineHull_MV,
+							CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2),
+							CI.getTieredComponent(OrePrefixes.pipeMedium, 2, GTNH ? 4 : 2),
+							CI.getElectricPump(2, GTNH ? 4 : 2),
+							ALLOY.EGLIN_STEEL.getPlate(GTNH ? 8 : 4),
+							ALLOY.POTIN.getScrew(GTNH ? 12 : 6)
+					}, 
+					ALLOY.TUMBAGA.getFluid(144 * 4), 
+					ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
+					20 * 60, 
+					30);
+
+			//Adv. Poo Collector		
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] {
+							CI.getTieredMachineHull(-1),
+							ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
+							CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 8 : 4),
+							CI.getTieredComponent(OrePrefixes.pipeHuge, 6, GTNH ? 8 : 4),
+							CI.getElectricPump(5, GTNH ? 12 : 6),
+							CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 32 : 16)
+					}, 
+					CI.getAlternativeTieredFluid(5, 144 * 9), 
+					ItemUtils.getSimpleStack(ModBlocks.blockPooCollector, 8, 1),
+					20 * 60 * 5, 
+					500);
+
+
+			//Basic Steam Turbine
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), "circuitPrimitive", CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1),
+					ALLOY.TUMBAGA.getRotor(1), CI.machineCasing_ULV, ALLOY.TUMBAGA.getRotor(1),
+					CI.getElectricMotor(0, 1), "cableGt01RedAlloy", CI.getElectricMotor(0, 1),
+					GregtechItemList.Generator_Steam_Turbine_ULV.get(1));
+
+			//Basic Gas Turbine
+			RecipeUtils.addShapedGregtechRecipe(
+					"circuitPrimitive", ALLOY.TUMBAGA.getRotor(1), "circuitPrimitive",
+					ALLOY.TUMBAGA.getRotor(1), CI.machineCasing_ULV, ALLOY.TUMBAGA.getRotor(1),
+					CI.getElectricMotor(0, 1), "cableGt01RedAlloy", CI.getElectricMotor(0, 1),
+					GregtechItemList.Generator_Gas_Turbine_ULV.get(1));
+
+			//Basic Combustion Turbine
+			RecipeUtils.addShapedGregtechRecipe(
+					CI.getElectricPiston(0, 1), "circuitPrimitive", CI.getElectricPiston(0, 1),
+					CI.getElectricMotor(0, 1), CI.machineCasing_ULV, CI.getElectricMotor(0, 1),
+					ALLOY.TUMBAGA.getGear(1), "cableGt01RedAlloy", ALLOY.TUMBAGA.getGear(1),
+					GregtechItemList.Generator_Diesel_ULV.get(1));
+
 
-			
 
 			//Steam Condenser
 			if (CORE.ConfigSwitches.enableMachine_SteamConverter ){
@@ -773,7 +826,7 @@ public class RECIPES_Machines {
 						"plankWood", "frameGtTumbaga", "plankWood",
 						"plankWood", "plankWood", "plankWood",
 						RECIPE_TreeFarmFrame);
-			*/}
+			 */}
 
 			if (CORE.ConfigSwitches.enableMachine_Tesseracts){
 				//Tesseracts
@@ -837,7 +890,7 @@ public class RECIPES_Machines {
 
 				//Air Intake Hatch
 
-				
+
 
 				ItemList FluidRegulator_IV = Utils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV);				
 				ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) : ItemList.Pump_IV.get(1);
@@ -967,7 +1020,7 @@ public class RECIPES_Machines {
 						"plateDoubleZeron100", CI.craftingToolHammer_Hard, "plateDoubleZeron100",
 						RECIPE_LFTRInnerCasing);
 
-				ItemStack IC2HeatPlate = ItemUtils.getItemStack("IC2:reactorPlatingHeat", 1);
+				ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1);
 				RecipeUtils.addShapedGregtechRecipe(
 						"plateDoubleHastelloyN", IC2HeatPlate, "plateDoubleHastelloyN",
 						IC2HeatPlate, "frameGtHastelloyC276", IC2HeatPlate,
@@ -1045,28 +1098,60 @@ public class RECIPES_Machines {
 				RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1);
 				RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(Casing_Amount);
 				RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1);
+				
+				//Outer Casing
+				CORE.RA.addSixSlotAssemblingRecipe(				
+						new ItemStack[] {
+								ItemList.Casing_FrostProof.get(1),
+								ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 0, GTNH ? 8 : 4),
+								ALLOY.INCOLOY_DS.getPlate(GTNH ? 16 : 8),
+								ALLOY.INCONEL_690.getScrew(GTNH ? 32 : 16),
+								ALLOY.EGLIN_STEEL.getLongRod(GTNH ? 16 : 4),
+								CI.getElectricPiston(3, GTNH ? 4 : 2)
+						},					
+						ALLOY.ZIRCONIUM_CARBIDE.getFluid(144 * 8), //Input Fluid					
+						RECIPE_CyclotronOuterCasing,					
+						30 * 20 * 2, 
+						MaterialUtils.getVoltageForTier(4));
+				
+				
+				//Inner Coil
+				CORE.RA.addSixSlotAssemblingRecipe(				
+						new ItemStack[] {
+								ItemList.Casing_Coil_Nichrome.get(1),
+								ItemUtils.simpleMetaStack("miscutils:itemDehydratorCoilWire", 1, GTNH ? 32 : 8),
+								ALLOY.INCOLOY_MA956.getPlate(GTNH ? 16 : 8),
+								ALLOY.TANTALLOY_61.getBolt(GTNH ? 32 : 16),
+								ALLOY.INCOLOY_020.getScrew(GTNH ? 64 : 32),
+								CI.getFieldGenerator(4, GTNH ? 2 : 1)
+						},					
+						ALLOY.HG1223.getFluid(144 * 5), //Input Fluid					
+						RECIPE_CyclotronInnerCoil,					
+						60 * 20 * 2, 
+						MaterialUtils.getVoltageForTier(5));
+
+
+				//Controller
+				CORE.RA.addSixSlotAssemblingRecipe(				
+						new ItemStack[] {
+								CI.machineHull_IV,
+								ItemUtils.getSimpleStack(RECIPE_CyclotronInnerCoil, GTNH ? 4 : 2),
+								ALLOY.INCOLOY_020.getPlate(GTNH ? 16 : 8),
+								ALLOY.TANTALLOY_61.getGear(GTNH ? 4 : 2),
+								ALLOY.INCOLOY_MA956.getScrew(GTNH ? 64 : 16),
+								ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 6 : 5), GTNH ? 8 : 16)
+						},					
+						ALLOY.INCOLOY_020.getFluid(144 * 9), //Input Fluid					
+						RECIPE_CyclotronController,					
+						60 * 20 * 5, 
+						MaterialUtils.getVoltageForTier(5));
+
+
+
+
+
 
-				GT_Values.RA.addAssemblerRecipe(
-						ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloyMA956", 8),
-						ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloy020", 1),
-						FluidUtils.getFluidStack("molten.hg1223", 32),
-						RECIPE_CyclotronOuterCasing,
-						30 * 20,
-						500);
-
-				GT_Values.RA.addAssemblerRecipe(
-						ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloyDS", 16),
-						ItemList.Field_Generator_HV.get(1),
-						FluidUtils.getFluidStack("molten.hg1223", 144),
-						RECIPE_CyclotronInnerCoil,
-						90 * 20,
-						1000);
 
-				RecipeUtils.recipeBuilder(
-						"plateIncoloy020", CI.getTieredCircuit(6), "plateIncoloy020",
-						RECIPE_CyclotronInnerCoil, CI.machineHull_IV, RECIPE_CyclotronInnerCoil,
-						"plateIncoloy020", "gearGtIncoloyMA956", "plateIncoloy020",
-						RECIPE_CyclotronController);
 			}
 
 			if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
@@ -1118,43 +1203,43 @@ public class RECIPES_Machines {
 				ItemStack aCoreBlock = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK
 						? ItemList.valueOf("Block_IridiumTungstensteel").get(1,
 								ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1))
-						: ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1);
-
-				aCoreBlock.stackSize = GTNH ? 2 : 1;
-
-				CORE.RA.addSixSlotAssemblingRecipe(
-						new ItemStack[] {
-								ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), GTNH ? 2 : 1),
-								aCoreBlock, 
-								CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 16),
-								CI.getTieredComponent(OrePrefixes.screw, GTNH ? 6 : 5, 32),
-								CI.getTieredComponent(OrePrefixes.bolt, GTNH ? 6 : 5, 12),
-								CI.getTieredComponent(OrePrefixes.plate, GTNH ? 7 : 6, 8), },
-						CI.getTertiaryTieredFluid(6, 144 * (GTNH ? 12 : 4)),
-						GregtechItemList.Casing_Autocrafter.get(Casing_Amount), 20 * 60 * 2,
-						MaterialUtils.getVoltageForTier(GTNH ? 7 : 6));
-
-				CORE.RA.addSixSlotAssemblingRecipe(
-						new ItemStack[] { 
-								GregtechItemList.Casing_Refinery_Structural.get(4),
-								ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, GTNH ? 2 : 1),
-								CI.getTieredComponent(OrePrefixes.cableGt08, GTNH ? 7 : 6, GTNH ? 32 : 16),
-								CI.getEmitter(GTNH ? 7 : 5, 2), 
-								CI.getSensor(GTNH ? 7 : 5, 2),
-								GregtechItemList.Gregtech_Computer_Cube.get(1),
+								: ItemUtils.getItemStackOfAmountFromOreDict("blockOsmiridium", 1);
+
+						aCoreBlock.stackSize = GTNH ? 2 : 1;
+
+						CORE.RA.addSixSlotAssemblingRecipe(
+								new ItemStack[] {
+										ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), GTNH ? 2 : 1),
+										aCoreBlock, 
+										CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 16),
+										CI.getTieredComponent(OrePrefixes.screw, GTNH ? 6 : 5, 32),
+										CI.getTieredComponent(OrePrefixes.bolt, GTNH ? 6 : 5, 12),
+										CI.getTieredComponent(OrePrefixes.plate, GTNH ? 7 : 6, 8), },
+								CI.getTertiaryTieredFluid(6, 144 * (GTNH ? 12 : 4)),
+								GregtechItemList.Casing_Autocrafter.get(Casing_Amount), 20 * 60 * 2,
+								MaterialUtils.getVoltageForTier(GTNH ? 6 : 5));
+
+						CORE.RA.addSixSlotAssemblingRecipe(
+								new ItemStack[] { 
+										GregtechItemList.Casing_Refinery_Structural.get(4),
+										ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR, GTNH ? 2 : 1),
+										CI.getTieredComponent(OrePrefixes.cableGt08, GTNH ? 7 : 6, GTNH ? 32 : 16),
+										CI.getEmitter(GTNH ? 6 : 5, 2), 
+										CI.getSensor(GTNH ? 6 : 5, 2),
+										GregtechItemList.Gregtech_Computer_Cube.get(1),
 								},
-						CI.getTieredFluid(7, 144 * (GTNH ? 32 : 8)), GregtechItemList.GT4_Multi_Crafter.get(1),
-						20 * 60 * 5, MaterialUtils.getVoltageForTier(GTNH ? 7 : 6));
-
-				CORE.RA.addSixSlotAssemblingRecipe(
-						new ItemStack[] {
-								ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), Casing_Amount),
-								CI.getEmitter(GTNH ? 5 : 4, GTNH ? 4 : 2), CI.getRobotArm(GTNH ? 5 : 4, GTNH ? 4 : 2),
-								CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 8),
-								CI.getTieredComponent(OrePrefixes.screw, GTNH ? 4 : 3, 8),
-								CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 4), },
-						CI.getAlternativeTieredFluid(5, 144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
-						20 * 30 * 3, MaterialUtils.getVoltageForTier(GTNH ? 5 : 4));
+								CI.getTieredFluid(7, 144 * (GTNH ? 32 : 8)), GregtechItemList.GT4_Multi_Crafter.get(1),
+								20 * 60 * 5, MaterialUtils.getVoltageForTier(GTNH ? 6 : 5));
+
+						CORE.RA.addSixSlotAssemblingRecipe(
+								new ItemStack[] {
+										ItemUtils.getSimpleStack(GregtechItemList.Casing_Multi_Use.get(1), Casing_Amount),
+										CI.getEmitter(GTNH ? 5 : 4, GTNH ? 4 : 2), CI.getRobotArm(GTNH ? 5 : 4, GTNH ? 4 : 2),
+										CI.getTieredComponent(OrePrefixes.circuit, GTNH ? 3 : 2, 8),
+										CI.getTieredComponent(OrePrefixes.screw, GTNH ? 4 : 3, 8),
+										CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 4), },
+								CI.getAlternativeTieredFluid(5, 144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
+								20 * 30 * 3, MaterialUtils.getVoltageForTier(GTNH ? 5 : 4));
 
 			}
 
@@ -1352,7 +1437,7 @@ public class RECIPES_Machines {
 								ItemUtils.getSimpleStack((GTNH ? CI.fieldGenerator_MAX : CI.fieldGenerator_ZPM), 5),
 								ItemList.Energy_LapotronicOrb2.get(1 * (GTNH ? 64 : 8)),
 								GTNH ? GregtechItemList.Compressed_Fusion_Reactor.get(1) : ItemList.FusionComputer_UV.get(1),
-								GregtechItemList.Casing_Fusion_Internal.get(1)
+										GregtechItemList.Casing_Fusion_Internal.get(1)
 						},
 						new FluidStack[] {
 								ALLOY.PIKYONIUM.getFluid(32 * 144 * (GTNH ? 2 : 1)),
@@ -1408,10 +1493,10 @@ public class RECIPES_Machines {
 						(int) GT_Values.V[7]);
 
 
-				
-				
+
+
 				ItemStack aDrillController = Utils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1);				
-				
+
 				//Drilling Platform
 				CORE.RA.addSixSlotAssemblingRecipe(
 						new ItemStack[] {
@@ -1425,7 +1510,7 @@ public class RECIPES_Machines {
 						GregtechItemList.BedrockMiner_MKI.get(1),
 						(int) GT_Values.V[5],
 						(int) GT_Values.V[7]);
-				
+
 				//Drilling Platform Casings
 				CORE.RA.addSixSlotAssemblingRecipe(
 						new ItemStack[] {
@@ -1478,8 +1563,8 @@ public class RECIPES_Machines {
 				ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2),					
 				45 * 20 * 1 * (6), 
 				MaterialUtils.getVoltageForTier(6));
-		
-		
+
+
 		//Player Doors
 		ItemStack[] aDoorInputs = new ItemStack[] {
 				ItemUtils.getSimpleStack(Blocks.log2),
@@ -1495,7 +1580,7 @@ public class RECIPES_Machines {
 				ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Ice),
 				ItemUtils.getSimpleStack(ModBlocks.blockPlayerDoorCustom_Cactus),	
 		};
-		
+
 		for (int y = 0; y < aDoorInputs.length; y++) {
 			CORE.RA.addSixSlotAssemblingRecipe(				
 					new ItemStack[] {
@@ -1511,18 +1596,18 @@ public class RECIPES_Machines {
 					100, 
 					MaterialUtils.getVoltageForTier(1));			
 		}
-		
-		
-		
+
+
+
 
 
 
 		Logger.INFO("Done loading recipes for the Various machine blocks.");
 	}
-	
-	
+
+
 	private static void controlCores() {
-		
+
 		Material[] aMat_A = new Material[] {
 				ALLOY.POTIN,
 				ALLOY.ZIRCONIUM_CARBIDE,
@@ -1547,19 +1632,19 @@ public class RECIPES_Machines {
 				ALLOY.ZERON_100,
 				ALLOY.CINOBITE
 		};
-		
+
 		Item aBaseCore = ModItems.itemControlCore;		
 		ItemStack[] aInputPrevTier = new ItemStack[] {
-				GTNH ? ItemUtils.getItemStack("miscutils:item.itemBufferCore3", 1) : ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 0, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 1, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 2, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 3, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 4, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 5, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 6, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 7, 1),
-				ItemUtils.simpleMetaStack(aBaseCore, 8, 1),
+				GTNH ? ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore3", 1) : ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 0, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 1, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 2, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 3, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 4, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 5, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 6, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 7, 1),
+						ItemUtils.simpleMetaStack(aBaseCore, 8, 1),
 		};		
 		ItemStack[] aOutput = new ItemStack[] {
 				ItemUtils.simpleMetaStack(aBaseCore, 0, 1),
@@ -1572,32 +1657,31 @@ public class RECIPES_Machines {
 				ItemUtils.simpleMetaStack(aBaseCore, 7, 1),
 				ItemUtils.simpleMetaStack(aBaseCore, 8, 1),
 				ItemUtils.simpleMetaStack(aBaseCore, 9, 1),
-				
+
 		};
-		
+
 		CORE.RA.addSixSlotAssemblingRecipe(				
 				new ItemStack[] {
 						CI.machineHull_HV,
 						aOutput[1],
 						aMat_A[1].getGear(GTNH ? 4 : 2),
 						aMat_B[2].getPlateDouble(GTNH ? 16 : 8),
-						ItemUtils.getItemStack("miscutils:item.itemBufferCore"+(GTNH ? "2" : "1"), GTNH ? 4 : 2),
+						ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+(GTNH ? "2" : "1"), GTNH ? 4 : 2),
 						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 3 : 2), GTNH ? 10 : 5)
 				},					
 				aMat_B[3].getFluid(144 * 8), //Input Fluid					
 				GregtechItemList.Hatch_Control_Core.get(1),					
 				60 * 20 * 5, 
 				MaterialUtils.getVoltageForTier(3));
-		
-		
-		for (int i = 0; i < 10; i++) {			
-			boolean aDub = i >= 5;	
 
+
+		for (int i = 0; i < 10; i++) {			
+			boolean aDub = false;
 			ItemStack aPlateStack = aMat_A[i].getPlateDouble((GTNH ? 16 : 8) * (aDub ? 2 : 1));
-			ItemStack aGearStack = aMat_B[i].getGear(GTNH ? 8 : 4 * (aDub ? 2 : 1));
-			ItemStack aRodStack = aMat_A[i].getLongRod(GTNH ? 32 : 16 * (aDub ? 2 : 1));
+			ItemStack aGearStack = aMat_B[i].getGear(GTNH ? 4 : 2 * (aDub ? 2 : 1));
+			ItemStack aRodStack = aMat_A[i].getLongRod(GTNH ? 16 : 8 * (aDub ? 2 : 1));
 			ItemStack aScrewStack = aMat_B[i].getScrew(32 * (aDub ? 2 : 1));
-			
+
 			if (!ItemUtils.checkForInvalidItems(aPlateStack)) {
 				aPlateStack = aMat_A[i].getPlate((GTNH ? 16 : 8) * (aDub ? 2 : 1) * 2);
 				if (!ItemUtils.checkForInvalidItems(aPlateStack)) {
@@ -1616,25 +1700,25 @@ public class RECIPES_Machines {
 			if (!ItemUtils.checkForInvalidItems(aScrewStack)) {
 				aScrewStack = aMat_A[i].getScrew(32 * (aDub ? 2 : 1));				
 			}
-			
+
 			CORE.RA.addSixSlotAssemblingRecipe(				
 					new ItemStack[] {
-							aInputPrevTier[i],
+							CI.getEnergyCore(i, 4),
 							aPlateStack,
 							aGearStack,
 							aRodStack,
 							aScrewStack,
-							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName((int) (4+Math.ceil((double) i / (double) 2))), GTNH ? (i * 2 * 2 * 2) : (i * 2 * 2))
+							ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName((int) (4+Math.ceil((double) i / (double) 2))), GTNH ? (i * 2 * 2) : (i * 2))
 					},					
-					aMat_A[i].getFluid(144 * 4 * (i+1)), //Input Fluid					
+					CI.getTieredFluid(i, 144 * 4 * (i+1)), //Input Fluid					
 					aOutput[i],					
 					60 * 20 * 1 * (i+1), 
 					MaterialUtils.getVoltageForTier(i));
 		}		
 	}
-	
+
 	private static void energyCores() {
-		
+
 		//Simpler Recipes for normal Players, Force assembly crafting in GTNH
 		if (!GTNH) {
 			//Buffer Core
@@ -1741,32 +1825,32 @@ public class RECIPES_Machines {
 					CI.circuitTier9, RECIPE_BufferCore_MAX, CI.circuitTier9,
 					RECIPE_Buffer_MAX);*/
 		}
-		
+
 
 		ItemStack[] aBufferOutput = new ItemStack[] {
 				RECIPE_Buffer_ULV, RECIPE_Buffer_LV, RECIPE_Buffer_MV,
 				RECIPE_Buffer_HV, RECIPE_Buffer_EV, RECIPE_Buffer_IV, 
 				RECIPE_Buffer_LuV, RECIPE_Buffer_ZPM, RECIPE_Buffer_UV, RECIPE_Buffer_MAX };
-		
-		
-		
+
+
+
 		ItemStack[] aOutput = new ItemStack[] {
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"1", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"2", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"3", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"4", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"5", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"6", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"7", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"8", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"9", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"10", 1)
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"1", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"2", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"3", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"4", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"5", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"6", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"7", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"8", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"9", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"10", 1)
 		};		
-		
+
 		int aCostMultiplier = GTNH ? 4 : 1;	
-		
+
 		for (int i = 0; i < 10; i++) {			
-					
+
 			ItemStack aPrevTier = (i == 0 ? CI.getTieredMachineHull(GTNH ? 2 : 1) : aOutput[i-1]);
 			aPrevTier.stackSize = GTNH ? 2 : 1;
 			int aTier = (i + 1);
@@ -1783,7 +1867,7 @@ public class RECIPES_Machines {
 					aOutput[i],					
 					45 * 10 * 1 * (aTier), 
 					MaterialUtils.getVoltageForTier(i));
-			
+
 			//Energy Buffer
 			CORE.RA.addSixSlotAssemblingRecipe(				
 					new ItemStack[] {
@@ -1798,14 +1882,14 @@ public class RECIPES_Machines {
 					aBufferOutput[i],					
 					45 * 20 * 1 * (aTier), 
 					MaterialUtils.getVoltageForTier(i));
-			
+
 		}
-		
-		
 
-		
+
+
+
 	}
-	
+
 	private static void wirelessChargers() {
 
 		ItemStack[] aChargers = new ItemStack[] {
@@ -1819,10 +1903,10 @@ public class RECIPES_Machines {
 				GregtechItemList.Charger_ZPM.get(1), 
 				GregtechItemList.Charger_UV.get(1),
 				GregtechItemList.Charger_MAX.get(1) 
-			};
-		
+		};
+
 		int aCostMultiplier = GTNH ? 2 : 1;	
-		
+
 		for (int i = 0; i < 10; i++) {			
 			if (i == 0) {
 				continue;
@@ -1842,7 +1926,37 @@ public class RECIPES_Machines {
 					aChargers[i],					
 					45 * 10 * 1 * (aTier), 
 					MaterialUtils.getVoltageForTier(i));	
-			
+
 		}
 	}
+	
+	private static void largeArcFurnace() {
+		int aCostMultiplier = GTNH ? 2 : 1;		
+		CORE.RA.addSixSlotAssemblingRecipe(				
+				new ItemStack[] {
+						CI.getTieredMachineHull(-1, 1 * aCostMultiplier),
+						CI.getEmitter(2, 2 * aCostMultiplier),
+						CI.getElectricPiston(4, 2 * aCostMultiplier),
+						CI.getSensor(4, 1 * aCostMultiplier),
+						CI.getTieredComponent(OrePrefixes.plate, 5, 4 * aCostMultiplier),
+						CI.getTieredComponent(OrePrefixes.pipeSmall, 4, 1 * aCostMultiplier),
+				},					
+				CI.getAlternativeTieredFluid(5, (144 * 2 * 4)), //Input Fluid					
+				GregtechItemList.Casing_Industrial_Arc_Furnace.get(Casing_Amount),					
+				20 * 10 * 1 * (6), 
+				MaterialUtils.getVoltageForTier(5));		
+		CORE.RA.addSixSlotAssemblingRecipe(				
+				new ItemStack[] {
+						GregtechItemList.Casing_Industrial_Arc_Furnace.get(Casing_Amount),
+						CI.getFieldGenerator(4, 2 * aCostMultiplier),
+						CI.getRobotArm(5, 4 * aCostMultiplier),
+						CI.getEnergyCore(4, 2 * aCostMultiplier),
+						CI.getTieredComponent(OrePrefixes.plate, 6, 8 * aCostMultiplier),
+						CI.getTieredComponent(OrePrefixes.circuit, 5, 8 * aCostMultiplier),
+				},					
+				CI.getAlternativeTieredFluid(6, (144 * 4 * 5)), //Input Fluid					
+				GregtechItemList.Industrial_Arc_Furnace.get(1),					
+				60 * 20 * 8, 
+				MaterialUtils.getVoltageForTier(6));
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index b473b30c3c..ba592bcb65 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -13,6 +13,7 @@ import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.LOADER_Machine_Components;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -435,8 +436,11 @@ public class CI {
 		else if (tier == 8){
 			return machineHull_UV;
 		}
+		else if (tier == 9){
+			return machineHull_MAX;
+		}
 		else {
-			return machineHull_MAX;			
+			return GregtechItemList.Casing_Multi_Use.get(1);			
 		}
 	}
 
@@ -468,8 +472,11 @@ public class CI {
 		else if (tier == 8){
 			return machineCasing_UV;
 		}
+		else if (tier == 9){
+			return machineCasing_MAX;
+		}
 		else {
-			return machineCasing_MAX;			
+			return GregtechItemList.Casing_Multi_Use.get(1);			
 		}
 	}
 
@@ -628,6 +635,38 @@ public class CI {
 		return a;
 	}
 	
+	public static ItemStack getEnergyCore(int aTier, int aAmount) {
+		ItemStack[] aOutput = new ItemStack[] {
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"1", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"2", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"3", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"4", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"5", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"6", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"7", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"8", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"9", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"10", 1)
+		};
+		return ItemUtils.getSimpleStack(aOutput[MathUtils.balance(aTier, 0, 9)], aAmount);
+	}
+	
+	public static ItemStack getPlate(int aTier, int aAmount) {
+		return getTieredComponent(OrePrefixes.plate, aTier, aAmount);
+	}
+	
+	public static ItemStack getGear(int aTier, int aAmount) {
+		return getTieredComponent(OrePrefixes.gearGt, aTier, aAmount);
+	}
+	
+	public static ItemStack getIngot(int aTier, int aAmount) {
+		return getTieredComponent(OrePrefixes.ingot, aTier, aAmount);
+	}
+	
+	public static ItemStack getBolt(int aTier, int aAmount) {
+		return getTieredComponent(OrePrefixes.bolt, aTier, aAmount);
+	}
+	
 	public static ItemStack getTieredComponent(OrePrefixes aPrefix, int aTier, int aAmount) {
 		aTier = Math.max(0, aTier);		
 	
@@ -685,6 +724,11 @@ public class CI {
 		}
 
 		if (aPrefix == OrePrefixes.pipeTiny || aPrefix == OrePrefixes.pipeSmall || aPrefix == OrePrefixes.pipe || aPrefix == OrePrefixes.pipeMedium || aPrefix == OrePrefixes.pipeLarge || aPrefix == OrePrefixes.pipeHuge) {
+			
+			if (aPrefix == OrePrefixes.pipe) {
+				aPrefix = OrePrefixes.pipeMedium;
+			}			
+			
 			if (aTier == 0) {
 				return ItemUtils.getOrePrefixStack(aPrefix, Materials.Lead, aAmount);				
 			}
@@ -1144,7 +1188,7 @@ public class CI {
 			aType = CI.machineHull_MAX;			
 		}
 		else {
-			aType = CI.machineHull_LV;			
+			aType = GregtechItemList.Casing_Multi_Use.get(1, CI.machineHull_MV);			
 		}		
 		return ItemUtils.getSimpleStack(aType, aSize);
 	}
diff --git a/src/Java/gtPlusPlus/core/slots/SlotToolBox.java b/src/Java/gtPlusPlus/core/slots/SlotToolBox.java
index c6d025fd21..87967b75b5 100644
--- a/src/Java/gtPlusPlus/core/slots/SlotToolBox.java
+++ b/src/Java/gtPlusPlus/core/slots/SlotToolBox.java
@@ -18,34 +18,34 @@ public class SlotToolBox extends SlotGtTool {
 		Class temp;
 
 		//IHL Pumps
-		temp = ReflectionUtils.getClassByName("ihl.handpump.IHLHandPump");
+		temp = ReflectionUtils.getClass("ihl.handpump.IHLHandPump");
 		if (temp != null) {
 			mSupportedCustomTools.put(temp);
 			temp = null;
 		}
 
 		//IC2 Electrics
-		temp = ReflectionUtils.getClassByName("ic2.api.item.IElectricItem");
+		temp = ReflectionUtils.getClass("ic2.api.item.IElectricItem");
 		if (temp != null) {
 			mSupportedCustomTools.put(temp);
 			temp = null;
 		}
 		
 		//IC2 Boxables
-		temp = ReflectionUtils.getClassByName(" ic2.api.item.IBoxable");
+		temp = ReflectionUtils.getClass(" ic2.api.item.IBoxable");
 		if (temp != null) {
 			mSupportedCustomTools.put(temp);
 			temp = null;
 		}
 		
 		//Tinkers Tools
-		temp = ReflectionUtils.getClassByName("tconstruct.library.tools.Weapon");
+		temp = ReflectionUtils.getClass("tconstruct.library.tools.Weapon");
 		if (temp != null) {
 			mSupportedCustomTools.put(temp);
 			temp = null;
 		}
 		//BattleGear Weapons
-		temp = ReflectionUtils.getClassByName("mods.battlegear2.api.weapons.IBattlegearWeapon");
+		temp = ReflectionUtils.getClass("mods.battlegear2.api.weapons.IBattlegearWeapon");
 		if (temp != null) {
 			mSupportedCustomTools.put(temp);
 			temp = null;
@@ -55,7 +55,7 @@ public class SlotToolBox extends SlotGtTool {
 		//OpenMods	
 		String[] OpenModsContent = new String[] {"openblocks.common.item.ItemDevNull", "openblocks.common.item.ItemHangGlider", "openblocks.common.item.ItemWrench", "openblocks.common.item.ItemSleepingBag"};
 		for (String t : OpenModsContent) {
-			temp = ReflectionUtils.getClassByName(t);
+			temp = ReflectionUtils.getClass(t);
 			if (temp != null) {
 				mSupportedCustomTools.put(temp);
 				temp = null;
@@ -63,7 +63,7 @@ public class SlotToolBox extends SlotGtTool {
 		}
 
 		//GC Wrench
-		temp = ReflectionUtils.getClassByName("micdoodle8.mods.galacticraft.core.items.ItemUniversalWrench");
+		temp = ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.items.ItemUniversalWrench");
 		if (temp != null) {
 			mSupportedCustomTools.put(temp);
 			temp = null;
@@ -72,7 +72,7 @@ public class SlotToolBox extends SlotGtTool {
 		//EIO
 		String[] EioContent = new String[] {"crazypants.enderio.api.tool.ITool", "crazypants.enderio.item.ItemMagnet", "crazypants.enderio.item.ItemConduitProbe"};
 		for (String t : EioContent) {
-			temp = ReflectionUtils.getClassByName(t);
+			temp = ReflectionUtils.getClass(t);
 			if (temp != null) {
 				mSupportedCustomTools.put(temp);
 				temp = null;
@@ -80,7 +80,7 @@ public class SlotToolBox extends SlotGtTool {
 		}
 		
 		//Forestry
-		temp = ReflectionUtils.getClassByName("forestry.core.items.ItemForestryTool");
+		temp = ReflectionUtils.getClass("forestry.core.items.ItemForestryTool");
 		if (temp != null) {
 			mSupportedCustomTools.put(temp);
 			temp = null;
diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
index da018675f3..bb7004350d 100644
--- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
+++ b/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java
@@ -14,7 +14,8 @@ public class ModTileEntities {
 
 	public static void init() {
 		Logger.INFO("Registering Tile Entities.");
-		GameRegistry.registerTileEntity(TileEntityHeliumGenerator.class, "HeliumGenerator");
+		GameRegistry.registerTileEntity(TileEntityPooCollector.class, "TileEntityPooCollector");
+		GameRegistry.registerTileEntity(TileEntityAdvPooCollector.class, "TileEntityAdvPooCollector");
 		GameRegistry.registerTileEntity(TileEntityWorkbench.class, "TileWorkbench");
 		GameRegistry.registerTileEntity(TileEntityWorkbenchAdvanced.class, "TileWorkbenchAdvanced");
 		GameRegistry.registerTileEntity(TileEntityFishTrap.class, "TileFishTrap");
diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
index 0a1c53d79d..4f9a8d3748 100644
--- a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
+++ b/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java
@@ -28,6 +28,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 import gtPlusPlus.api.interfaces.ILazyCoverable;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BTF_Inventory;
+import gtPlusPlus.core.util.data.ArrayUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import ic2.api.Direction;
 
@@ -81,6 +82,9 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 	public void updateEntity() {
 		long aTick = System.currentTimeMillis();
 		this.isDead = false;
+		if (!firstTicked) {
+			onFirstTick();			
+		}		
 		try{
 			if (this.isServerSide()){
 				onPreTick(aTick);
@@ -1297,7 +1301,22 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT
 	public boolean energyStateReady() {
 		return false;
 	}
-    
+	
+	
+	private boolean firstTicked = false;
+    	
+	public boolean onFirstTick() {
+		if (!firstTicked) {
+			firstTicked = true;
+			if (this.mInventory != null) {
+				this.mInventory.purgeNulls();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	
 
 
 
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
new file mode 100644
index 0000000000..18954f12b6
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java
@@ -0,0 +1,157 @@
+package gtPlusPlus.core.tileentities.machines;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.passive.EntityVillager;
+import net.minecraft.entity.passive.IAnimals;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+
+public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector {
+	
+	public TileEntityAdvPooCollector() {	
+		super(18, 128000);
+	}
+
+
+	@Override
+	public boolean canFill(ForgeDirection from, Fluid fluid) {
+		return false;
+	}
+
+	@Override
+	public boolean canDrain(ForgeDirection from, Fluid fluid) {
+		return true;
+	}
+	
+	public void onPreLogicTick() {
+		
+	}
+		
+	public <V> boolean addDrop(V aPooMaker) {
+		int aChance = MathUtils.randInt(0, 50000);
+		if (aChance > 0) {
+			ItemStack aPoop;
+			if (aChance<= 200) {
+				aPoop = ItemUtils.getItemStackOfAmountFromOreDict("dustManureByproducts", 1);
+			}
+			else if (aChance <= 1000) {
+				aPoop = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1);				
+			}
+			else if (aChance <= 2000) {
+				aPoop = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1);				
+			}
+			else {
+				return false;
+			}
+			
+			//Add to inventory if not full, else espawn in world
+			if (!this.mInventory.addItemStack(aPoop)) {
+				EntityItem entity = new EntityItem(worldObj, xCoord, yCoord+1.5, zCoord, aPoop);
+				worldObj.spawnEntityInWorld(entity);
+			}			
+			
+		}
+		
+		
+		return false;
+	}
+
+	private static AutoMap<Class> aEntityToDrain = new AutoMap<Class>();	
+	
+	@Override
+	public AutoMap<Class> aThingsToLookFor() {
+		if (aEntityToDrain.isEmpty()) {
+			aEntityToDrain.add(EntityAnimal.class);
+			aEntityToDrain.add(IAnimals.class);
+			aEntityToDrain.add(EntityVillager.class);
+			aEntityToDrain.add(EntityPlayer.class);
+		}
+		return aEntityToDrain;
+	}
+
+	@Override
+	public <V> int onPostTick(V aPooMaker) {
+			if (this.tank.getFluidAmount() < this.tank.getCapacity()) {				
+				int aPooAmount = 0;				
+				// Vanilla Animals
+				if (aPooMaker instanceof EntityChicken) {
+					aPooAmount = MathUtils.randInt(1, 40);
+				}
+				else if (aPooMaker instanceof EntityHorse) {
+					aPooAmount = MathUtils.randInt(20, 40);
+				}
+				else if (aPooMaker instanceof EntityCow) {
+					aPooAmount = MathUtils.randInt(18, 45);
+				}
+				else if (aPooMaker instanceof EntityMooshroom) {
+					aPooAmount = 17;
+				}
+				else if (aPooMaker instanceof EntitySheep) {
+					aPooAmount = MathUtils.randInt(8, 30);
+				}				
+				
+				else {					
+					if (aPooMaker instanceof EntityAnimal || aPooMaker instanceof IAnimals) {
+						aPooAmount = MathUtils.randInt(5, 35);						
+					}
+					else if (aPooMaker instanceof EntityVillager) {
+						aPooAmount = MathUtils.randInt(25, 30);
+					}
+					else if (aPooMaker instanceof EntityPlayer) {
+						aPooAmount = MathUtils.randInt(1, 3);
+					}
+					else {
+						aPooAmount = MathUtils.randInt(1, 10);
+					}					
+				}				
+				aPooAmount = Math.max(Math.min(this.tank.getCapacity()-this.tank.getFluidAmount(), aPooAmount), 1);				
+				return Math.max(1, (aPooAmount * MathUtils.getRandomFromArray(new int[] {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 4}) / 10));
+			}
+			else {
+				return 0;
+			}	
+	}
+
+	@Override
+	public Fluid fluidToProvide() {
+		return AgriculturalChem.PoopJuice;
+	}
+
+	@Override
+	public Item itemToSpawnInWorldIfTankIsFull() {
+		int a = MathUtils.randInt(0, 75);
+		Item aItem = null;		
+		if (a <= 30) {
+			aItem = AgriculturalChem.dustDirt;
+		}
+		else if (a <= 40) {
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustManureByproducts", 1).getItem();
+		}
+		else if (a <= 55) {
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1).getItem();
+		}		
+		return aItem;
+	}
+	
+	public int getBaseTickRate() {
+		return MathUtils.randInt(50, 200);
+	}
+	
+	
+	
+
+}
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
new file mode 100644
index 0000000000..78b8f74799
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java
@@ -0,0 +1,238 @@
+package gtPlusPlus.core.tileentities.machines;
+
+import java.util.List;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
+import gtPlusPlus.api.objects.minecraft.BlockPos;
+import gtPlusPlus.core.tileentities.base.TileEntityBase;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.Packet;
+import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidEvent;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+import net.minecraftforge.fluids.FluidTankInfo;
+import net.minecraftforge.fluids.IFluidHandler;
+
+public abstract class TileEntityBaseFluidCollector extends TileEntityBase implements IFluidHandler {
+
+	public final FluidTank tank;
+	private boolean needsUpdate = false;
+	private int updateTimer = 0;
+	private long internalTickCounter = 0;
+	private BlockPos internalBlockLocation;
+	
+	public TileEntityBaseFluidCollector(int aInvSlotCount, int aTankCapcity) {	
+		super(aInvSlotCount);
+		tank = new BTF_FluidTank(aTankCapcity);
+	}
+
+	@Override
+	public final int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
+		needsUpdate = true;
+		return this.tank.fill(resource, doFill);
+	}
+
+	@Override
+	public final FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
+		needsUpdate = true;
+		return this.tank.drain(resource.amount, doDrain);
+	}
+
+	@Override
+	public final FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
+		needsUpdate = true;
+		FluidStack fluid = this.tank.getFluid();
+		// return this.tank.drain(maxDrain, doDrain);
+		if (fluid == null) {
+			return null;
+		}
+
+		int drained = maxDrain;
+		if (fluid.amount < drained) {
+			drained = fluid.amount;
+		}
+
+		FluidStack stack = new FluidStack(fluid, drained);
+		if (doDrain) {
+			fluid.amount -= drained;
+			if (fluid.amount <= 0) {
+				fluid = null;
+			}
+
+			if (this != null) {
+				FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluid, this.getWorldObj(), this.xCoord,
+						this.yCoord, this.zCoord, this.tank, 0));
+			}
+		}
+		return stack;
+	}
+
+	@Override
+	public boolean canFill(ForgeDirection from, Fluid fluid) {
+		return false;
+	}
+
+	@Override
+	public boolean canDrain(ForgeDirection from, Fluid fluid) {
+		return true;
+	}
+
+	@Override
+	public final FluidTankInfo[] getTankInfo(ForgeDirection from) {
+		return new FluidTankInfo[] { this.tank.getInfo() };
+	}
+
+	@Override
+	public final void updateEntity() {		
+		super.updateEntity();
+		onPreLogicTick();
+		logicTick();		
+		if (needsUpdate) {			
+			if (updateTimer == 0) {
+				updateTimer = 10; // every 10 ticks it will send an update
+			} else {
+				--updateTimer;
+				if (updateTimer == 0) {
+					worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
+					needsUpdate = false;
+				}
+			}
+		}
+	}
+
+	@Override
+	public void readFromNBT(NBTTagCompound tag) {
+		tank.readFromNBT(tag);
+		super.readFromNBT(tag);
+	}
+
+	@Override
+	public void writeToNBT(NBTTagCompound tag) {
+		tank.writeToNBT(tag);
+		super.writeToNBT(tag);
+	}
+
+	@Override
+	public final Packet getDescriptionPacket() {
+		NBTTagCompound tag = new NBTTagCompound();
+		writeToNBT(tag);
+		return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, this.blockMetadata, tag);
+	}
+
+	@Override
+	public final void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
+		NBTTagCompound tag = pkt.func_148857_g();
+		readFromNBT(tag);
+	}
+	
+	public int getBaseTickRate() {
+		return MathUtils.randInt(200, 300);
+	}
+	
+	public abstract AutoMap<Class> aThingsToLookFor();
+	
+	public abstract void onPreLogicTick();
+	
+	public final void logicTick() {
+
+		if (this.worldObj == null || this.worldObj.isRemote) {
+			return;
+		}
+		if (internalTickCounter % getBaseTickRate() == 0) {
+			if (internalBlockLocation == null) {
+				internalBlockLocation = new BlockPos(this);
+			}
+			BlockPos p = internalBlockLocation;
+			if (p != null) {
+				if (p.world != null) {
+					World w = this.worldObj;
+					if (w == null) {
+						return;
+					}
+					Chunk c = w.getChunkFromBlockCoords(p.xPos, p.zPos);
+					if (c != null) {
+						if (c.isChunkLoaded) {
+							int startX = p.xPos - 2;
+							int startY = p.yPos;
+							int startZ = p.zPos - 2;
+							int endX = p.xPos + 3;
+							int endY = p.yPos + 5;
+							int endZ = p.zPos + 3;
+							AxisAlignedBB box = AxisAlignedBB.getBoundingBox(startX, startY, startZ, endX, endY, endZ);
+							if (box != null) {								
+								for (Class c2 : aThingsToLookFor()) {
+									tickEntityType(w, box, c2);										
+								}														
+							} else {
+								return;
+							}
+						}
+					}
+				}
+			}
+
+		}
+
+		internalTickCounter++;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public final void tickEntityType(World w, AxisAlignedBB box, Class aClassToFind) {
+		List<?> entities = w.getEntitiesWithinAABB(aClassToFind, box);	
+		if (entities != null && !entities.isEmpty()) {
+			interactWithEntities(entities);
+		}
+	}
+	
+	public final <V> void interactWithEntities(List<V> entities) {
+		for (V aEntity : entities) {
+			addDrop(aEntity);
+			if (this.tank.getFluidAmount() < this.tank.getCapacity()) {				
+				int aFluidAmount = onPostTick(aEntity);								
+				aFluidAmount = Math.max(Math.min(this.tank.getCapacity()-this.tank.getFluidAmount(), aFluidAmount), 1);				
+				this.tank.fill(FluidUtils.getFluidStack(fluidToProvide(), aFluidAmount), true);
+			}
+			else {
+				ItemStack aDirtStack = ItemUtils.getSimpleStack(itemToSpawnInWorldIfTankIsFull());
+				if (aDirtStack != null)
+				if (!this.mInventory.addItemStack(aDirtStack)) {
+					EntityItem entity = new EntityItem(worldObj, xCoord, yCoord+1.5, zCoord, aDirtStack);
+					worldObj.spawnEntityInWorld(entity);
+				}
+			}
+		}	
+	}
+	
+
+	/**
+	 * Return the amount of fluid for this entity type
+	 * @param aEntity
+	 * @return
+	 */
+	public abstract <V> int onPostTick(V aEntity);
+	
+	public abstract <V> boolean addDrop(V aPooMaker);
+	
+	public abstract Fluid fluidToProvide();
+	
+	public abstract Item itemToSpawnInWorldIfTankIsFull();
+	
+	
+	
+
+}
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
new file mode 100644
index 0000000000..f6570c6cc6
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java
@@ -0,0 +1,144 @@
+package gtPlusPlus.core.tileentities.machines;
+
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.passive.EntityAnimal;
+import net.minecraft.entity.passive.EntityChicken;
+import net.minecraft.entity.passive.EntityCow;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityMooshroom;
+import net.minecraft.entity.passive.EntitySheep;
+import net.minecraft.entity.passive.IAnimals;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+
+public class TileEntityPooCollector extends TileEntityBaseFluidCollector {
+	
+	public TileEntityPooCollector() {	
+		super(9, 8000);
+	}
+
+
+	@Override
+	public boolean canFill(ForgeDirection from, Fluid fluid) {
+		return false;
+	}
+
+	@Override
+	public boolean canDrain(ForgeDirection from, Fluid fluid) {
+		return true;
+	}
+	
+	public void onPreLogicTick() {
+		
+	}
+		
+	public <V> boolean addDrop(V aPooMaker) {
+		int aChance = MathUtils.randInt(0, 50000);
+		if (aChance > 0) {
+			ItemStack aPoop;
+			if (aChance<= 100) {
+				aPoop = ItemUtils.getItemStackOfAmountFromOreDict("dustManureByproducts", 1);
+			}
+			else if (aChance <= 500) {
+				aPoop = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1);				
+			}
+			else if (aChance <= 1250) {
+				aPoop = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1);				
+			}
+			else {
+				return false;
+			}
+			//Add poop to world
+			//Logger.INFO("Adding animal waste for "+aPooMaker.getCommandSenderName());
+			
+			//Add to inventory if not full, else espawn in world
+			if (!this.mInventory.addItemStack(aPoop)) {
+				EntityItem entity = new EntityItem(worldObj, xCoord, yCoord+1.5, zCoord, aPoop);
+				worldObj.spawnEntityInWorld(entity);
+			}			
+			
+		}
+		
+		
+		return false;
+	}
+
+	private static AutoMap<Class> aEntityToDrain = new AutoMap<Class>();	
+	
+	@Override
+	public AutoMap<Class> aThingsToLookFor() {
+		if (aEntityToDrain.isEmpty()) {
+			aEntityToDrain.add(EntityAnimal.class);
+			aEntityToDrain.add(IAnimals.class);
+		}
+		return aEntityToDrain;
+	}
+
+	@Override
+	public <V> int onPostTick(V aPooMaker) {
+			if (this.tank.getFluidAmount() < this.tank.getCapacity()) {				
+				int aPooAmount = 0;				
+				// Vanilla Animals
+				if (aPooMaker instanceof EntityChicken) {
+					aPooAmount = MathUtils.randInt(1, 40);
+				}
+				else if (aPooMaker instanceof EntityHorse) {
+					aPooAmount = MathUtils.randInt(20, 40);
+				}
+				else if (aPooMaker instanceof EntityCow) {
+					aPooAmount = MathUtils.randInt(18, 45);
+				}
+				else if (aPooMaker instanceof EntityMooshroom) {
+					aPooAmount = 17;
+				}
+				else if (aPooMaker instanceof EntitySheep) {
+					aPooAmount = MathUtils.randInt(8, 30);
+				}				
+				
+				else {					
+					if (aPooMaker instanceof EntityAnimal || aPooMaker instanceof IAnimals) {
+						aPooAmount = MathUtils.randInt(5, 35);						
+					}
+					else {
+						aPooAmount = MathUtils.randInt(1, 10);
+					}					
+				}				
+				aPooAmount = Math.max((Math.min(this.tank.getCapacity()-this.tank.getFluidAmount(), aPooAmount)/10), 1);				
+				return aPooAmount;
+			}
+			else {
+				return 0;
+			}	
+	}
+
+	@Override
+	public Fluid fluidToProvide() {
+		return AgriculturalChem.PoopJuice;
+	}
+
+	@Override
+	public Item itemToSpawnInWorldIfTankIsFull() {
+		int a = MathUtils.randInt(0, 100);
+		Item aItem = null;		
+		if (a <= 30) {
+			aItem = AgriculturalChem.dustDirt;
+		}
+		else if (a <= 40) {
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1).getItem();
+		}
+		else if (a <= 55) {
+			aItem = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1).getItem();
+		}		
+		return aItem;
+	}
+	
+	
+	
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index eef768e799..d032384638 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -46,6 +46,7 @@ import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -791,7 +792,13 @@ public class Utils {
 		if (GT_Mod.VERSION == 509){
 			Class<GT_Mod> clazz;
 			try {
-				clazz = (Class<GT_Mod>) Class.forName("gregtech.GT_Mod");
+				
+				if (LoadedMods.BeyondRealityCore) {
+					//Safely assume it's Beyond Reality running .28-pre (If it's not, tough shit really?)
+					return new Pair<Integer, Integer>(9, 28);
+				}
+				
+				clazz = (Class<GT_Mod>) ReflectionUtils.getClass("gregtech.GT_Mod");
 				Field mSubversion = ReflectionUtils.getField(clazz, "SUBVERSION");
 				if (mSubversion != null){
 					int mSub = 0;
@@ -802,7 +809,9 @@ public class Utils {
 					}
 				}
 			}
-			catch (Throwable t){}
+			catch (Throwable t){
+				
+			}
 		}
 		//5.08.33
 		else if (GT_Mod.VERSION == 508){
@@ -939,4 +948,16 @@ public class Utils {
 		return aOther;
 	}
 
+	public static long getMillisSince(long aStartTime, long aCurrentTime) {		
+		return (aCurrentTime - aStartTime);
+	}
+	
+	public static long getSecondsFromMillis(long aMillis) {
+		return (aMillis/1000);
+	}
+	
+	public static long getTicksFromSeconds(long aSeconds) {
+		return (aSeconds*20);
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/util/data/StringUtils.java b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
index e58b68665a..2372d04c15 100644
--- a/src/Java/gtPlusPlus/core/util/data/StringUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/StringUtils.java
@@ -1,5 +1,9 @@
 package gtPlusPlus.core.util.data;
 
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.Utils;
+
 public class StringUtils {
 
 	public static String superscript(String str) {
@@ -116,4 +120,100 @@ public class StringUtils {
 		String restLetters = data.substring(1).toLowerCase();
 		return firstLetter + restLetters;
 	}
+
+	public static <V> String getDataStringFromArray(V[] parameterTypes) {
+		if (parameterTypes == null || parameterTypes.length == 0) {
+			return "empty/null";
+		}
+		else {
+			String aData = "";
+			for (V y : parameterTypes) {
+				if (y != null) {
+					aData += ", "+y.toString();
+				}
+			}
+			return aData;
+		}		
+	}
+	
+	
+	
+	/**
+	 * Is this a special regex character for delimination? (.$|()[]{}^?*+\\)
+	 * @param aChar - The char to test
+	 * @return - Is this a special character?
+	 */
+	public static boolean isSpecialCharacter(char aChar) {
+		if (aChar == '"' || aChar == '.' || aChar == '$' || aChar == '|' || aChar == '(' || aChar == ')' || aChar == '['
+				|| aChar == ']' || aChar == '{' || aChar == '}' || aChar == '^' || aChar == '?' || aChar == '*'
+				|| aChar == '+' || aChar == '\\') {
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean isEscaped(String aString) {
+		return aString.substring(0, 1).equals("\\");
+	}
+	
+	public static String splitAndUppercase(String aInput, String aDelim) {
+		
+		if (!isEscaped(aDelim)) {
+			boolean isSpecial = false;
+			for (int o=0;o<aInput.length();o++) {
+				if (isSpecialCharacter(aInput.charAt(o))) {
+					isSpecial = true;
+				}
+			}
+			if (isSpecial) {
+				aDelim = "\\"+aDelim;
+			}
+		}
+		
+		
+		Logger.INFO("Splitting "+aInput);
+		String[] aSplit = aInput.split(aDelim);
+		Logger.INFO("Split into "+aSplit == null ? ""+0 : aSplit.length+" parts.");
+		if (aSplit == null || aSplit.length == 0) {
+			return aInput;
+		}
+		else {
+			AutoMap<String> aTemp = new AutoMap<String>();
+			for (String s : aSplit) {
+				Logger.INFO("Found: "+s);
+				s = s.replace(".", "");
+				s = Utils.sanitizeString(s);
+				s = firstLetterCaps(s);
+				Logger.INFO("Formatted & Captilized: "+s);
+				aTemp.put(s);
+			}
+			Logger.INFO("Rebuilding");
+			String aReturn = "";
+			for (String s : aTemp) {
+				aReturn += s;
+				Logger.INFO("Step: "+aReturn);
+			}
+			return aReturn;
+		}	
+	}
+	
+	public static int characterCount(String aString, char aChar) {
+		return characterCount(aString, ""+aChar);
+	}
+	
+	public static int characterCount(String aString, String aChar) {
+		int aLength = aString.length();
+		int aFound = 0;
+		if (aLength == 0 || !aString.contains(aChar)) {
+			return 0;
+		}
+		else {
+			for (int index = 0; index < aLength; index++) {
+				if (aString.substring(index, index+1).equals(aChar)) {
+					aFound++;
+				}
+			}
+			return aFound;
+		}
+	}
 }
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 40ac23a1b8..f9a4d8f548 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -463,14 +463,14 @@ public class MathUtils {
 			return 0;
 		}
 		int divisor = aDataSet.length;
-		Logger.INFO("Calculating Average Short. Divisor: "+divisor);
+		Logger.WARNING("Calculating Average Short. Divisor: "+divisor);
 		short total = 0;		
 		for (short i : aDataSet) {
-			Logger.INFO("Adding "+i);
+			Logger.WARNING("Adding "+i);
 			total += i;
 		}
 		short result = safeShort((total/divisor));
-		Logger.INFO("Average: "+result);
+		Logger.WARNING("Average: "+result);
 		return result;		
 	}
 	public static int getIntAverage(int[] aDataSet) {
@@ -681,4 +681,15 @@ public class MathUtils {
 		return i;	
 	}
 
+	/**
+	 * Balances a number within a range.
+	 * @param aInput - The number to balance
+	 * @param aMin - The minimum bounds
+	 * @param aMax - The maximum bounds
+	 * @return - An Integer which will be between the bounds, or a boundary value.
+	 */
+	public static int balance(int aInput, int aMin, int aMax) {		
+		return Math.max(Math.min(aInput, aMax), aMin);
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index ed1cbe0c64..0ae751a20b 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -10,9 +10,7 @@ import gregtech.api.util.GT_LanguageManager;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.FluidGT6;
-import gtPlusPlus.core.fluids.GenericFluid;
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.item.base.cell.BaseItemCell;
 import gtPlusPlus.core.item.base.cell.BaseItemPlasmaCell;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
@@ -93,82 +91,6 @@ public class FluidUtils {
 
 	}
 
-
-	/**
-	 * @param String displayName
-	 * @param String fluidName
-	 * @param int meltingPointC Temp
-	 * @param short[] rgba
-	 * @param byte state
-	 * States: 0 (Solid), 1 (Fluid), 2(Gas), 3(Plasma) 4(Fuel I think? Don't use.)
-	 *
-	 * @return short[]
-	 */
-	public static Fluid generateFluid(final String displayName, final String fluidName, final int tempK, final short[] rgba ,final int aState){
-		Fluid generatedFluid = null;
-		switch (aState) {
-			case 0: {
-				generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 10000, false, rgba);
-				break;
-			}
-			default:
-			case 1:
-			case 4: {
-				generatedFluid = new GenericFluid(displayName, fluidName, 0, 100, tempK, 1000, false, rgba);
-				break;
-			}
-			case 2: {
-				generatedFluid = new GenericFluid(displayName, fluidName, 0, -100, tempK, 200, true, rgba);
-				break;
-			}
-			case 3: {
-				generatedFluid = new GenericFluid(displayName, fluidName, 15, -10000, tempK, 10, true, rgba);
-				break;
-			}
-		}
-		return generatedFluid;
-	}
-	/**
-	 *
-	 * @param String fluidName
-	 * @param int meltingPointC Temp
-	 * @param short[] rgba
-	 * @param byte state
-	 * States: 0 (Solid), 1 (Fluid), 2(Gas), 3(Plasma) 4(Fuel I think? Don't use.)
-	 *
-	 * @return short[]
-	 */
-	public static Fluid generateFluid(final Material material ,final int aState){
-		final int tempK = material.getMeltingPointC();
-		Fluid generatedFluid = null;
-		switch (aState) {
-			case 0: {
-				generatedFluid = new GenericFluid(material, 0, 100, tempK, 10000, false);
-				break;
-			}
-			default:
-			case 1:
-			case 4: {
-				generatedFluid = new GenericFluid(material, 0, 100, tempK, 1000, false);
-				break;
-			}
-			case 2: {
-				generatedFluid = new GenericFluid(material, 0, -100, tempK, 200, true);
-				break;
-			}
-			case 3: {
-				generatedFluid = new GenericFluid(material, 15, -10000, tempK, 10, true);
-				break;
-			}
-		}
-		return generatedFluid;
-	}
-
-
-
-
-
-
 	public static Fluid addGtFluid(final String aName, final String aLocalized, final GT_Materials aMaterial, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) {
 		return addGtFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, true);
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java
index a1c2bf6104..9f5d4f36ca 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java
@@ -13,7 +13,7 @@ public class FoodUtils {
 	public static final Class IEdibleClass;
 	
 	static {
-		IEdibleClass = ReflectionUtils.getClassByName("squeek.applecore.api.food.IEdible");
+		IEdibleClass = ReflectionUtils.getClass("squeek.applecore.api.food.IEdible");
 	}
 	
 	public static boolean isFood(ItemStack food) {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index a5cf9527a9..d32ff4e160 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -35,6 +35,7 @@ import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
@@ -123,7 +124,7 @@ public class ItemUtils {
 			final int meta) {
 		try {
 			Item em = null;
-			final Item em1 = getItem(FQRN);
+			final Item em1 = getItemFromFQRN(FQRN);
 			// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
 			if (em1 != null) {
 				em = em1;
@@ -157,7 +158,7 @@ public class ItemUtils {
 		if (MOD) {
 			try {
 				Item em = null;
-				final Item em1 = getItem(FQRN);
+				final Item em1 = getItemFromFQRN(FQRN);
 				// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
 				if (em1 != null) {
 					if (null == em) {
@@ -180,7 +181,7 @@ public class ItemUtils {
 	public static ItemStack simpleMetaStack(final String FQRN, final int meta, final int itemstackSize) {
 		try {
 			Item em = null;
-			final Item em1 = getItem(FQRN);
+			final Item em1 = getItemFromFQRN(FQRN);
 			// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
 			if (em1 != null) {
 				if (null == em) {
@@ -232,7 +233,7 @@ public class ItemUtils {
 		ItemStack temp;
 		if (fqrn.toLowerCase().contains(oreDict.toLowerCase())) {
 			final String sanitizedName = fqrn.replace(oreDict, "");
-			temp = ItemUtils.getItemStack(sanitizedName, stackSize);
+			temp = ItemUtils.getItemStackFromFQRN(sanitizedName, stackSize);
 			return temp;
 		}
 		final String[] fqrnSplit = fqrn.split(":");
@@ -257,13 +258,13 @@ public class ItemUtils {
 		return null;
 	}
 
-	public static Item getItem(final String fqrn) // fqrn = fully qualified resource name
+	public static Item getItemFromFQRN(final String fqrn) // fqrn = fully qualified resource name
 	{
 		final String[] fqrnSplit = fqrn.split(":");
 		return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]);
 	}
 
-	public static ItemStack getItemStack(final String fqrn, final int Size) // fqrn = fully qualified resource name
+	public static ItemStack getItemStackFromFQRN(final String fqrn, final int Size) // fqrn = fully qualified resource name
 	{
 		final String[] fqrnSplit = fqrn.split(":");
 		return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
@@ -395,6 +396,61 @@ public class ItemUtils {
 				new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"),
 				new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"),
 				new BaseItemDustUnique("itemDustTiny" + unlocalizedName, materialName, mChemForm, Colour, "Tiny") };
+		
+		//Generate Shaped/Shapeless Recipes
+
+		final ItemStack normalDust = ItemUtils.getSimpleStack(output[0]);
+		final ItemStack smallDust = ItemUtils.getSimpleStack(output[1]);
+		final ItemStack tinyDust = ItemUtils.getSimpleStack(output[2]);
+
+
+		if (ItemUtils.checkForInvalidItems(tinyDust) && ItemUtils.checkForInvalidItems(normalDust)) {
+			if (RecipeUtils.recipeBuilder(
+					tinyDust,	tinyDust, tinyDust,
+					tinyDust, tinyDust, tinyDust,
+					tinyDust, tinyDust, tinyDust,
+					normalDust)){
+				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+materialName+" - Failed");
+			}
+
+			if (RecipeUtils.recipeBuilder(
+					normalDust, null, null,
+					null, null, null,
+					null, null, null,
+					ItemUtils.getSimpleStack(tinyDust, 9))){
+				Logger.WARNING("9 Tiny dust from 1 Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("9 Tiny dust from 1 Recipe: "+materialName+" - Failed");
+			}
+		}
+
+		if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(normalDust)) {
+			if (RecipeUtils.recipeBuilder(
+					smallDust, smallDust, null,
+					smallDust, smallDust, null,
+					null, null, null,
+					normalDust)){
+				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+materialName+" - Failed");
+			}
+			if (RecipeUtils.recipeBuilder(
+					null, normalDust, null,
+					null, null, null,
+					null, null, null,
+					ItemUtils.getSimpleStack(smallDust, 4))){
+				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+materialName+" - Failed");
+			}
+		}
+		
 		return output;
 	}
 
@@ -607,7 +663,7 @@ public class ItemUtils {
 	}
 
 	public static String getArrayStackNames(final ItemStack[] aStack) {
-		String itemNames = "Item Array: ";
+		String itemNames = "";
 		int aPos = 0;
 		for (final ItemStack alph : aStack) {			
 			if (alph == null) {
@@ -1012,4 +1068,50 @@ public class ItemUtils {
 	
 	}
 
+	public static String getItemName(ItemStack aStack) {
+		if (aStack == null) {
+			return "ERROR - Empty Stack";
+		}
+		String aDisplay = null;
+		try {
+			aDisplay = ("" + StatCollector
+					.translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name"))
+							.trim();
+			if (aStack.hasTagCompound()) {
+				if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("display", 10)) {
+					NBTTagCompound nbttagcompound = aStack.stackTagCompound.getCompoundTag("display");
+
+					if (nbttagcompound.hasKey("Name", 8)) {
+						aDisplay = nbttagcompound.getString("Name");
+					}
+				}
+			}
+		} catch (Throwable t) {
+
+		}
+		if (aDisplay == null || aDisplay.length() <= 0) {
+			aDisplay = aStack.getUnlocalizedName() + ":" + aStack.getItemDamage();
+		} else {
+			aDisplay += " | Meta: " + aStack.getItemDamage();
+		}
+		return aDisplay;
+	}
+
+	public static String getUnlocalizedItemName(ItemStack aStack) {
+		if (aStack == null) {
+			return "ERROR.Empty.Stack";
+		}
+		String aDisplay = null;
+		try {
+			aDisplay = (aStack.getUnlocalizedName()).trim();
+			
+		} catch (Throwable t) {
+			aDisplay = aStack.getItem().getUnlocalizedName();
+		}
+		if (aDisplay == null || aDisplay.length() <= 0) {
+			aDisplay = aStack.getItem().getUnlocalizedNameInefficiently(aStack);
+		}
+		return aDisplay;
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 45d21a3016..a7fc4507e8 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -322,7 +322,7 @@ public class MaterialUtils {
 				mName = (String) ReflectionUtils.getField(Materials.class, "mName").get(mat);
 			}
 		}
-		catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
+		catch (IllegalArgumentException | IllegalAccessException e) {
 		}
 
 
@@ -348,12 +348,30 @@ public class MaterialUtils {
 		TextureSet o =  (r != null && r.isPresent() && r.get() != null) ? r.get() : null;
 		return o;*/
 	}
+	
+
+
+	public static Materials getMaterial(String aMaterialName, String aFallbackMaterialName) {
+		Materials g = getMaterial(aMaterialName);
+		if (g == null) {
+			g = getMaterial(aFallbackMaterialName);
+		}
+		if (g == null) {
+			Logger.INFO("Failed finding material '"+aMaterialName+"' & fallback '"+aFallbackMaterialName+"', returning _NULL.");
+			g = Materials._NULL;
+		}
+		return g;		
+	}
 
 	public static Materials getMaterial(String aMaterialName) {
 		Materials m = gtPlusPlus.xmod.gregtech.common.StaticFields59.getMaterial(aMaterialName);
 		if (m == null) {
 			m = getMaterialByName(aMaterialName);
 		}
+		if (m == null) {
+			Logger.INFO("Failed finding material '"+aMaterialName+"', returning _NULL.");
+			m = Materials._NULL;
+		}
 		return m;
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index e7ced98f5a..080b5665a3 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -152,7 +152,7 @@ public class MiningUtils {
 					
 					try {
 						aTextWorldGen = (String) ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "aTextWorldgen").get(h);
-					} catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
+					} catch (IllegalArgumentException | IllegalAccessException e) {
 						aTextWorldGen = h.mWorldGenName;
 					}
 					
@@ -180,27 +180,27 @@ public class MiningUtils {
 		
 		boolean aEndAsteroids;		
 		try {
-			if (Class.forName("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore") != null && mMoonID == -99) {
-				mMoonID = ReflectionUtils.getField(Class.forName("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"), "idDimensionMoon").getInt(null);
+			if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore") != null && mMoonID == -99) {
+				mMoonID = ReflectionUtils.getField(ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"), "idDimensionMoon").getInt(null);
 			}
 		}
-		catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {}
+		catch (IllegalArgumentException | IllegalAccessException e) {}
 		
 		//Gets Mars ID
 		try {
-			if (Class.forName("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars") != null && mMarsID == -99) {
-				mMarsID = ReflectionUtils.getField(Class.forName("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars"), "dimensionIDMars").getInt(null);
+			if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars") != null && mMarsID == -99) {
+				mMarsID = ReflectionUtils.getField(ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars"), "dimensionIDMars").getInt(null);
 			}
 		}
-		catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {}
+		catch (IllegalArgumentException | IllegalAccessException e) {}
 		
 		//Get Comets ID
 		try {
-			if (Class.forName("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids") != null && mCometsID == -99) {
-				mCometsID = ReflectionUtils.getField(Class.forName("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids"), "dimensionIDAsteroids").getInt(null);
+			if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids") != null && mCometsID == -99) {
+				mCometsID = ReflectionUtils.getField(ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids"), "dimensionIDAsteroids").getInt(null);
 			}
 		}
-		catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {}
+		catch (IllegalArgumentException | IllegalAccessException e) {}
 
 		//Clear Cache
 		Ores_Overworld.clear();
@@ -215,7 +215,7 @@ public class MiningUtils {
 				try {
 					aEndAsteroids = ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "mEndAsteroid").getBoolean(x);
 				}
-				catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
+				catch (IllegalArgumentException | IllegalAccessException e) {
 					aEndAsteroids = false;
 				}
 				
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index a5f5c778bf..774c8b6f13 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -5,15 +5,10 @@ import java.util.Iterator;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
@@ -22,9 +17,12 @@ import gtPlusPlus.api.objects.minecraft.ShapedRecipe;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
@@ -33,7 +31,8 @@ public class RecipeUtils {
 public static int mInvalidID = 1;
 	public static boolean recipeBuilder(final Object slot_1, final Object slot_2, final Object slot_3, final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7, final Object slot_8, final Object slot_9, ItemStack resultItem){
 		
-		if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
+		//Old Debug Code, useful for finding recipes loading too early.
+		/*if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
 			Logger.INFO(ReflectionUtils.getMethodName(1));
 			Logger.INFO(ReflectionUtils.getMethodName(2));
 			Logger.INFO(ReflectionUtils.getMethodName(3));
@@ -44,7 +43,7 @@ public static int mInvalidID = 1;
 			Logger.INFO(ReflectionUtils.getMethodName(8));
 			Logger.INFO(ReflectionUtils.getMethodName(9));
 			System.exit(1);
-		}
+		}*/
 		
 		if (resultItem == null){
 			Logger.RECIPE("[Fix] Found a recipe with an invalid output, yet had a valid inputs. Using Dummy output so recipe can be found..");
@@ -212,7 +211,7 @@ public static int mInvalidID = 1;
 	public static boolean removeCraftingRecipe(Object x){
 		if (null == x){return false;}
 		if (x instanceof String){
-			final Item R = ItemUtils.getItem((String) x);
+			final Item R = ItemUtils.getItemFromFQRN((String) x);
 			if (R != null){
 				x = R;
 			}
@@ -395,6 +394,7 @@ public static int mInvalidID = 1;
 				else {
 					Logger.RECIPE("[Fix] Output is Null for a recipe. Report to Alkalus.");
 					output = ItemUtils.getItemStackOfAmountFromOreDict("sadibasdkjnad", 1);
+					RegistrationHandler.recipesFailed++;
 				}
 			}
 		}
@@ -574,5 +574,13 @@ public static int mInvalidID = 1;
 	}
 
 
+	public static boolean removeGtRecipe(GT_Recipe aRecipeToRemove, GT_Recipe_Map aRecipeMap) {		
+		if (aRecipeMap.mRecipeList.contains(aRecipeToRemove)) {
+			return aRecipeMap.mRecipeList.remove(aRecipeToRemove);
+		}
+		return false;		
+	}
+
+
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index dde785cee6..aeeb4ae5be 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -39,7 +39,7 @@ public class PollutionUtils {
 					return mPollution.getBoolean(GT_Pollution);
 				}
 			}
-		} catch (SecurityException | IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {
+		} catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {
 		}
 		return false;
 	}
@@ -53,16 +53,16 @@ public class PollutionUtils {
 				if (mAddPollution != null) {
 					mAddPollution.invoke(null, te, pollutionValue);
 				}
-				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
 				if (GT_Pollution != null) {
-					Method addPollution = GT_Pollution.getMethod("addPollution", IGregTechTileEntity.class, int.class);
+					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", IGregTechTileEntity.class, int.class);
 					if (addPollution != null) {
 						mAddPollution = addPollution;
 						addPollution.invoke(null, te, pollutionValue);
 						return true;
 					}
 				}
-			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+			} catch (SecurityException | IllegalAccessException
 					| IllegalArgumentException | InvocationTargetException e) {
 			}
 		return false;
@@ -92,16 +92,16 @@ public class PollutionUtils {
 					mAddPollution2.invoke(null, aChunk, pollutionValue);
 					return true;
 				}
-				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
 				if (GT_Pollution != null) {
-					Method addPollution = GT_Pollution.getMethod("addPollution", Chunk.class, int.class);
+					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", Chunk.class, int.class);
 					if (addPollution != null) {
 						mAddPollution2 = addPollution;
 						mAddPollution2.invoke(null, aChunk, pollutionValue);
 						return true;
 					}
 				}
-			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+			} catch (SecurityException | IllegalAccessException
 					| IllegalArgumentException | InvocationTargetException e) {
 			}
 		return false;
@@ -128,15 +128,15 @@ public class PollutionUtils {
 				if (mGetPollution != null) {
 					mGetPollution.invoke(null, te);
 				}
-				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
 				if (GT_Pollution != null) {
-					Method addPollution = GT_Pollution.getMethod("getPollution", IGregTechTileEntity.class);
+					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "getPollution", IGregTechTileEntity.class);
 					if (addPollution != null) {
 						mGetPollution = addPollution;
 						return (int) addPollution.invoke(null, te);
 					}
 				}
-			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+			} catch (SecurityException | IllegalAccessException
 					| IllegalArgumentException | InvocationTargetException e) {
 			}
 		return 0;
@@ -151,15 +151,15 @@ public class PollutionUtils {
 				if (mGetPollution2 != null) {
 					mGetPollution2.invoke(null, te);
 				}
-				Class<?> GT_Pollution = Class.forName("gregtech.common.GT_Pollution");
+				Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution");
 				if (GT_Pollution != null) {
-					Method addPollution = GT_Pollution.getMethod("getPollution", Chunk.class);
+					Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "getPollution", Chunk.class);
 					if (addPollution != null) {
 						mGetPollution2 = addPollution;
 						return (int) addPollution.invoke(null, te);
 					}
 				}
-			} catch (ClassNotFoundException | SecurityException | NoSuchMethodException | IllegalAccessException
+			} catch (SecurityException | IllegalAccessException
 					| IllegalArgumentException | InvocationTargetException e) {
 			}
 		return 0;
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
deleted file mode 100644
index 99a9bf2fa9..0000000000
--- a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gtPlusPlus.core.util.reflect;
-
-import java.lang.reflect.Field;
-
-import cpw.mods.fml.common.SidedProxy;
-
-public class ClientProxyFinder {
-
-	public static Object getInstance(final Object modInstance) throws ReflectiveOperationException {
-		for(final Field field : modInstance.getClass().getDeclaredFields()) {
-			if(field.isAnnotationPresent(SidedProxy.class)) {
-				final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class);
-				final Object fieldValue = field.get(modInstance);
-				try {
-					final Class<?> clientSideClass = Class.forName(sidedProxy.clientSide());
-					if(clientSideClass.isAssignableFrom(fieldValue.getClass())) {
-						final Object clientProxy = clientSideClass.cast(fieldValue);
-						//do what you want with client proxy instance
-						return clientProxy;
-					}
-
-				} catch (final NoClassDefFoundError err) {
-					//its server side
-					return null;
-				}
-				break;
-			}
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java
index 85599e4695..d22fafb37b 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java
@@ -12,7 +12,7 @@ public class ProxyFinder {
 				final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class);
 				final Object fieldValue = field.get(modInstance);
 				try {
-					final Class<?> serverSideClass = Class.forName(sidedProxy.serverSide());
+					final Class<?> serverSideClass = ReflectionUtils.getClass(sidedProxy.serverSide());
 					if(serverSideClass.isAssignableFrom(fieldValue.getClass())) {
 						final Object serverProxy = serverSideClass.cast(fieldValue);
 						//do what you want with server proxy instance
@@ -35,7 +35,7 @@ public class ProxyFinder {
 				final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class);
 				final Object fieldValue = field.get(modInstance);
 				try {
-					final Class<?> clientSideClass = Class.forName(sidedProxy.clientSide());
+					final Class<?> clientSideClass = ReflectionUtils.getClass(sidedProxy.clientSide());
 					if(clientSideClass.isAssignableFrom(fieldValue.getClass())) {
 						final Object clientProxy = clientSideClass.cast(fieldValue);
 						//do what you want with client proxy instance
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index dee9d76a4c..722a4f3ff7 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -1,110 +1,245 @@
 package gtPlusPlus.core.util.reflect;
 
 import java.io.IOException;
-import java.lang.reflect.*;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Scanner;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 import com.google.common.reflect.ClassPath;
 
-import net.minecraft.client.Minecraft;
-
-import gregtech.GT_Mod;
-import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.data.StringUtils;
 
 public class ReflectionUtils {
 
-	public static Field getField(final Class<?> clazz, final String fieldName) throws NoSuchFieldException {
-		try {
-			Field k = clazz.getDeclaredField(fieldName);
-			makeAccessible(k);
-			//Logger.REFLECTION("Got Field from Class. "+fieldName+" did exist within "+clazz.getCanonicalName()+".");
-			return k;
-		} catch (final NoSuchFieldException e) {
-			final Class<?> superClass = clazz.getSuperclass();
-			if (superClass == null) {
-				//Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+".");
-				throw e;
-			}
-			//Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+". Trying super class.");
-			return getField(superClass, fieldName);
+	public static Map<String, Class> mCachedClasses = new LinkedHashMap<String, Class>();
+	public static Map<String, CachedMethod> mCachedMethods = new LinkedHashMap<String, CachedMethod>();
+	public static Map<String, CachedField> mCachedFields = new LinkedHashMap<String, CachedField>();
+
+	private static class CachedMethod {
+
+		private final boolean STATIC;
+		private final Method METHOD;
+
+		public CachedMethod(Method aMethod, boolean isStatic) {
+			METHOD = aMethod;
+			STATIC = isStatic;
+		}
+
+		public Method get() {
+			return METHOD;
 		}
+
+		public boolean type() {
+			return STATIC;
+		}
+
 	}
 
-	public static void makeAccessible(final Field field) {
-		if (!Modifier.isPublic(field.getModifiers()) ||
-				!Modifier.isPublic(field.getDeclaringClass().getModifiers()))
-		{
-			field.setAccessible(true);
+	private static class CachedField {
+
+		private final boolean STATIC;
+		private final Field FIELD;
+
+		public CachedField(Field aField, boolean isStatic) {
+			FIELD = aField;
+			STATIC = isStatic;
 		}
+
+		public Field get() {
+			return FIELD;
+		}
+
+		public boolean type() {
+			return STATIC;
+		}
+
 	}
 
-	//Some Reflection utils - http://stackoverflow.com/questions/14374878/using-reflection-to-set-an-object-property
-	@SuppressWarnings("unchecked")
-	public static <V> V getField(final Object object, final String fieldName) {
-		Class<?> clazz = object.getClass();
-		while (clazz != null) {
-			try {
-				final Field field = clazz.getDeclaredField(fieldName);
-				field.setAccessible(true);
-				return (V) field.get(object);
-			} catch (final NoSuchFieldException e) {
-				Logger.REFLECTION("getField("+object.toString()+", "+fieldName+") failed.");
-				clazz = clazz.getSuperclass();
-			} catch (final Exception e) {
-				Logger.REFLECTION("getField("+object.toString()+", "+fieldName+") failed.");
-				throw new IllegalStateException(e);
+	private static boolean cacheClass(Class aClass) {		
+		if (aClass == null) {
+			return false;
+		}		
+		Class y = mCachedClasses.get(aClass.getCanonicalName());
+		if (y == null) {
+			mCachedClasses.put(aClass.getCanonicalName(), aClass);
+			return true;
+		}		
+		return false;
+	}
+
+	private static boolean cacheMethod(Class aClass, Method aMethod) {		
+		if (aMethod == null) {
+			return false;
+		}		
+		boolean isStatic = Modifier.isStatic(aMethod.getModifiers());		
+		CachedMethod y = mCachedMethods.get(aClass.getName()+"."+aMethod.getName()+"."+ArrayUtils.toString(aMethod.getParameterTypes()));
+		if (y == null) {
+			mCachedMethods.put(aClass.getName()+"."+aMethod.getName()+"."+ArrayUtils.toString(aMethod.getParameterTypes()), new CachedMethod(aMethod, isStatic));
+			return true;
+		}		
+		return false;
+	}
+
+	private static boolean cacheField(Class aClass, Field aField) {		
+		if (aField == null) {
+			return false;
+		}		
+		boolean isStatic = Modifier.isStatic(aField.getModifiers());
+		CachedField y = mCachedFields.get(aClass.getName()+"."+aField.getName());
+		if (y == null) {
+			mCachedFields.put(aClass.getName()+"."+aField.getName(), new CachedField(aField, isStatic));
+			return true;
+		}		
+		return false;
+	}
+
+
+	/**
+	 * Returns a cached {@link Class} object.
+	 * @param aClassCanonicalName - The canonical name of the underlying class.
+	 * @return - Valid, {@link Class} object, or {@link null}.
+	 */
+	public static Class getClass(String aClassCanonicalName) {
+		if (aClassCanonicalName == null || aClassCanonicalName.length() <= 0) {
+			return null;
+		}		
+		Class y = mCachedClasses.get(aClassCanonicalName);
+		if (y == null) {
+			y = getClass_Internal(aClassCanonicalName);
+			if (y != null) {
+				Logger.REFLECTION("Caching Class: "+aClassCanonicalName);
+				cacheClass(y);
 			}
 		}
-		return null;
+		return y;
 	}
 
-	public static boolean setField(final Object object, final String fieldName, final Object fieldValue) {
-		Class<?> clazz = object.getClass();
-		while (clazz != null) {
+
+
+	/**
+	 * Returns a cached {@link Method} object. Wraps {@link #getMethod(Class, String, Class...)}.
+	 * @param aObject - Object containing the Method.
+	 * @param aMethodName - Method's name in {@link String} form.
+	 * @param aTypes - Class Array of Types for {@link Method}'s constructor.
+	 * @return - Valid, non-final, {@link Method} object, or {@link null}.
+	 */
+	public static Method getMethod(Object aObject, String aMethodName, Class[] aTypes) {
+		return getMethod(aObject.getClass(), aMethodName, aTypes);
+	}
+	
+	
+	/**
+	 * Returns a cached {@link Method} object.
+	 * @param aClass - Class containing the Method.
+	 * @param aMethodName - Method's name in {@link String} form.
+	 * @param aTypes - Varags Class Types for {@link Method}'s constructor.
+	 * @return - Valid, non-final, {@link Method} object, or {@link null}.
+	 */
+	public static Method getMethod(Class aClass, String aMethodName, Class... aTypes) {
+		if (aClass == null || aMethodName == null || aMethodName.length() <= 0) {
+			return null;
+		}		
+		String aMethodKey = ArrayUtils.toString(aTypes);
+		//Logger.REFLECTION("Looking up method in cache: "+(aClass.getName()+"."+aMethodName + "." + aMethodKey));
+		CachedMethod y = mCachedMethods.get(aClass.getName()+"."+aMethodName + "." + aMethodKey);
+		if (y == null) {
+			Method u = getMethod_Internal(aClass, aMethodName, aTypes);
+			if (u != null) {
+				Logger.REFLECTION("Caching Method: "+aMethodName + "." + aMethodKey);
+				cacheMethod(aClass, u);
+				return u;
+			} else {
+				return null;
+			}
+		} else {
+			return y.get();
+		}
+	}
+
+
+
+	/**
+	 * Returns a cached {@link Field} object.
+	 * @param aClass - Class containing the Method.
+	 * @param aFieldName - Field name in {@link String} form.
+	 * @return - Valid, non-final, {@link Field} object, or {@link null}.
+	 */
+	public static Field getField(final Class aClass, final String aFieldName) {
+		if (aClass == null || aFieldName == null || aFieldName.length() <= 0) {
+			return null;
+		}		
+		CachedField y = mCachedFields.get(aClass.getName()+"."+aFieldName);
+		if (y == null) {
+			Field u;
 			try {
-				final Field field = getField(clazz, fieldName);
-				if (field != null) {
-					setValue(object, field, fieldValue);					
-					return true;
+				u = getField_Internal(aClass, aFieldName);
+				if (u != null) {
+					Logger.REFLECTION("Caching Field '"+aFieldName+"' from "+aClass.getName());
+					cacheField(aClass, u);
+					return u;
 				}
-			} catch (final NoSuchFieldException e) {
-				Logger.REFLECTION("setField("+object.toString()+", "+fieldName+") failed.");
-				clazz = clazz.getSuperclass();
-			} catch (final Exception e) {
-				Logger.REFLECTION("setField("+object.toString()+", "+fieldName+") failed.");
-				throw new IllegalStateException(e);
+			} catch (NoSuchFieldException e) {
 			}
+			return null;
+
+		} else {
+			return y.get();
 		}
-		return false;
 	}
-
-	public static boolean becauseIWorkHard(){
-		/* TODO: fix this stuff \u002a\u002f\u0066\u0069\u006e\u0061\u006c\u0020\u0048\u0061\u0073\u0068\u0053\u0065\u0074\u003c\u0053\u0074\u0072\u0069\u006e\u0067\u003e\u0020\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u0020\u003d\u0020\u006e\u0065\u0077\u0020\u0048\u0061\u0073\u0068\u0053\u0065\u0074\u003c\u003e\u0028\u0029\u003b\u000a\u0009\u0009\u004f\u0062\u006a\u0065\u0063\u0074\u0020\u0070\u0072\u006f\u0078\u0079\u0043\u006c\u0069\u0065\u006e\u0074\u0047\u0054\u003b\u0009\u000a\u0009\u0009\u0074\u0072\u0079\u0020\u007b\u000a\u0009\u0009\u0009\u0070\u0072\u006f\u0078\u0079\u0043\u006c\u0069\u0065\u006e\u0074\u0047\u0054\u0020\u003d\u0020\u0043\u006c\u0069\u0065\u006e\u0074\u0050\u0072\u006f\u0078\u0079\u0046\u0069\u006e\u0064\u0065\u0072\u002e\u0067\u0065\u0074\u0049\u006e\u0073\u0074\u0061\u006e\u0063\u0065\u0028\u0047\u0054\u005f\u004d\u006f\u0064\u002e\u0069\u006e\u0073\u0074\u0061\u006e\u0063\u0065\u0029\u003b\u0009\u0009\u0009\u0009\u000a\u0009\u0009\u007d\u0020\u0063\u0061\u0074\u0063\u0068\u0020\u0028\u0066\u0069\u006e\u0061\u006c\u0020\u0052\u0065\u0066\u006c\u0065\u0063\u0074\u0069\u0076\u0065\u004f\u0070\u0065\u0072\u0061\u0074\u0069\u006f\u006e\u0045\u0078\u0063\u0065\u0070\u0074\u0069\u006f\u006e\u0020\u0065\u0031\u0029\u0020\u007b\u000a\u0009\u0009\u0009\u0070\u0072\u006f\u0078\u0079\u0043\u006c\u0069\u0065\u006e\u0074\u0047\u0054\u0020\u003d\u0020\u006e\u0075\u006c\u006c\u003b\u000a\u0009\u0009\u0009Logger\u002eINFO\u0028\u0022\u0046\u0061\u0069\u006c\u0065\u0064\u0020\u006f\u0062\u0074\u0061\u0069\u006e\u0065\u0064\u0020\u0069\u006e\u0073\u0074\u0061\u006e\u0063\u0065\u0020\u006f\u0066\u0020\u0061\u0020\u0063\u006c\u0069\u0065\u006e\u0074\u0020\u0070\u0072\u006f\u0078\u0079\u002e\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0072\u0065\u0074\u0075\u0072\u006e\u0020\u0066\u0061\u006c\u0073\u0065\u003b\u000a\u0009\u0009\u007d\u000a\u0009\u0009\u0074\u0072\u0079\u0020\u007b\u000a\u0009\u0009\u0009\u0066\u0069\u006e\u0061\u006c\u0020\u0053\u0063\u0061\u006e\u006e\u0065\u0072\u0020\u0074\u0053\u0063\u0061\u006e\u006e\u0065\u0072\u0020\u003d\u0020\u006e\u0065\u0077\u0020\u0053\u0063\u0061\u006e\u006e\u0065\u0072\u0028\u006e\u0065\u0077\u0020\u0055\u0052\u004c\u0028\u0022\u0068\u0074\u0074\u0070\u003a\u002f\u002f\u0067\u0072\u0065\u0067\u0074\u0065\u0063\u0068\u002e\u006f\u0076\u0065\u0072\u006d\u0069\u006e\u0064\u0064\u006c\u0031\u002e\u0063\u006f\u006d\u002f\u0063\u006f\u006d\u002f\u0067\u0072\u0065\u0067\u006f\u0072\u0069\u0075\u0073\u0074\u002f\u0067\u0072\u0065\u0067\u0074\u0065\u0063\u0068\u002f\u0073\u0075\u0070\u0070\u006f\u0072\u0074\u0065\u0072\u006c\u0069\u0073\u0074\u002e\u0074\u0078\u0074\u0022\u0029\u002e\u006f\u0070\u0065\u006e\u0053\u0074\u0072\u0065\u0061\u006d\u0028\u0029\u0029\u003b\u000a\u0009\u0009\u0009Logger\u002eWARNING\u0028\u0022\u0054\u0072\u0079\u0069\u006e\u0067\u0020\u0074\u006f\u0020\u0062\u0075\u0069\u006c\u0064\u0020\u0061\u0020\u0048\u0061\u0073\u0068\u0053\u0065\u0074\u002e\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0077\u0068\u0069\u006c\u0065\u0020\u0028\u0074\u0053\u0063\u0061\u006e\u006e\u0065\u0072\u002e\u0068\u0061\u0073\u004e\u0065\u0078\u0074\u004c\u0069\u006e\u0065\u0028\u0029\u0029\u0020\u007b\u000a\u0009\u0009\u0009\u0009\u0066\u0069\u006e\u0061\u006c\u0020\u0053\u0074\u0072\u0069\u006e\u0067\u0020\u0074\u004e\u0061\u006d\u0065\u0020\u003d\u0020\u0074\u0053\u0063\u0061\u006e\u006e\u0065\u0072\u002e\u006e\u0065\u0078\u0074\u004c\u0069\u006e\u0065\u0028\u0029\u003b\u000a\u000a\u0009\u0009\u0009\u0009\u0069\u0066\u0020\u0028\u0021\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u002e\u0063\u006f\u006e\u0074\u0061\u0069\u006e\u0073\u0028\u0074\u004e\u0061\u006d\u0065\u002e\u0074\u006f\u004c\u006f\u0077\u0065\u0072\u0043\u0061\u0073\u0065\u0028\u0029\u0029\u0029\u0020\u007b\u000a\u0009\u0009\u0009\u0009\u0009\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u002e\u0061\u0064\u0064\u0028\u0074\u004e\u0061\u006d\u0065\u002e\u0074\u006f\u004c\u006f\u0077\u0065\u0072\u0043\u0061\u0073\u0065\u0028\u0029\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u007d\u000a\u0009\u0009\u0009\u0009\u000a\u0009\u0009\u0009\u0009\u002f\u002f\u0041\u0064\u0064\u0020\u004d\u0079\u0073\u0065\u006c\u0066\u000a\u0009\u0009\u0009\u0009\u0069\u0066\u0020\u0028\u0021\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u002e\u0063\u006f\u006e\u0074\u0061\u0069\u006e\u0073\u0028\u0022\u0064\u0072\u0061\u006b\u006e\u0079\u0074\u0065\u0031\u0022\u0029\u0029\u0020\u007b\u000a\u0009\u0009\u0009\u0009\u0009Logger\u002eWARNING\u0028\u0022\u0041\u0064\u0064\u0065\u0064\u0020\u006d\u0069\u0073\u0073\u0069\u006e\u0067\u0020\u0076\u0061\u006c\u0075\u0065\u002e\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u0009\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u002e\u0061\u0064\u0064\u0028\u0022\u0064\u0072\u0061\u006b\u006e\u0079\u0074\u0065\u0031\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u007d\u000a\u0009\u0009\u0009\u0009\u000a\u0009\u0009\u0009\u0009\u002f\u002f\u0041\u0064\u0064\u0020\u0074\u0068\u0065\u0020\u0063\u0061\u0070\u0065\u0064\u0020\u0074\u0065\u0073\u0074\u0020\u0068\u0065\u0072\u006f\u000a\u0009\u0009\u0009\u0009\u0069\u0066\u0020\u0028\u0043\u004f\u0052\u0045\u002e\u0044\u0045\u0056\u0045\u004e\u0056\u0029\u007b\u000a\u0009\u0009\u0009\u0009\u0009\u0074\u0072\u0079\u0020\u007b\u000a\u0009\u0009\u0009\u0009\u0009\u0009\u0053\u0074\u0072\u0069\u006e\u0067\u0020\u0064\u0065\u0076\u0050\u006c\u0061\u0079\u0065\u0072\u0020\u003d\u0020\u004d\u0069\u006e\u0065\u0063\u0072\u0061\u0066\u0074\u002e\u0067\u0065\u0074\u004d\u0069\u006e\u0065\u0063\u0072\u0061\u0066\u0074\u0028\u0029\u002e\u0067\u0065\u0074\u0053\u0065\u0073\u0073\u0069\u006f\u006e\u0028\u0029\u002e\u0067\u0065\u0074\u0055\u0073\u0065\u0072\u006e\u0061\u006d\u0065\u0028\u0029\u002e\u0074\u006f\u004c\u006f\u0077\u0065\u0072\u0043\u0061\u0073\u0065\u0028\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u0009\u0009Logger\u002eINFO\u0028\u0022\u0046\u006f\u0075\u006e\u0064\u0020\u0022\u002b\u0064\u0065\u0076\u0050\u006c\u0061\u0079\u0065\u0072\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u0009\u0009\u0069\u0066\u0020\u0028\u0021\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u002e\u0063\u006f\u006e\u0074\u0061\u0069\u006e\u0073\u0028\u0064\u0065\u0076\u0050\u006c\u0061\u0079\u0065\u0072\u0029\u0029\u0020\u007b\u000a\u0009\u0009\u0009\u0009\u0009\u0009\u0009Logger\u002eWARNING\u0028\u0022\u0041\u0064\u0064\u0065\u0064\u0020\u006d\u0069\u0073\u0073\u0069\u006e\u0067\u0020\u0076\u0061\u006c\u0075\u0065\u002e\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u0009\u0009\u0009\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u002e\u0061\u0064\u0064\u0028\u0064\u0065\u0076\u0050\u006c\u0061\u0079\u0065\u0072\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u0009\u0009\u007d\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0009\u000a\u0009\u0009\u0009\u0009\u0009\u007d\u0020\u0063\u0061\u0074\u0063\u0068\u0020\u0028\u0054\u0068\u0072\u006f\u0077\u0061\u0062\u006c\u0065\u0020\u0074\u0029\u007b\u000a\u0009\u0009\u0009\u0009\u0009\u0009Logger\u002eINFO\u0028\u0022\u0046\u0061\u0069\u006c\u0065\u0064\u0020\u0061\u0064\u0064\u0069\u006e\u0067\u0020\u006d\u0069\u0073\u0073\u0069\u006e\u0067\u0020\u0076\u0061\u006c\u0075\u0065\u0020\u0069\u006e\u0020\u0063\u0075\u0072\u0072\u0065\u006e\u0074\u0020\u0065\u006e\u0076\u0069\u0072\u006f\u006e\u006d\u0065\u006e\u0074\u002e\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0009\u0009\u007d\u000a\u0009\u0009\u0009\u0009\u007d\u000a\u000a\u0009\u0009\u0009\u007d\u000a\u0009\u0009\u0009\u0074\u0053\u0063\u0061\u006e\u006e\u0065\u0072\u002e\u0063\u006c\u006f\u0073\u0065\u0028\u0029\u003b\u000a\u0009\u0009\u007d\u0020\u0063\u0061\u0074\u0063\u0068\u0020\u0028\u0066\u0069\u006e\u0061\u006c\u0020\u0054\u0068\u0072\u006f\u0077\u0061\u0062\u006c\u0065\u0020\u0065\u0029\u0020\u007b\u000a\u0009\u0009\u0009Logger\u002eWARNING\u0028\u0022\u0046\u0061\u0069\u006c\u0065\u0064\u0020\u0067\u0065\u0074\u0074\u0069\u006e\u0067\u0020\u0074\u0068\u0065\u0020\u0077\u0065\u0062\u0020\u006c\u0069\u0073\u0074\u002e\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0072\u0065\u0074\u0075\u0072\u006e\u0020\u0066\u0061\u006c\u0073\u0065\u003b\u0020\u0020\u0020\u0020\u0020\u0009\u000a\u0009\u0009\u007d\u0009\u0009\u000a\u000a\u0009\u0009\u0074\u0072\u0079\u0020\u007b\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0009\u000a\u0009\u0009\u0009\u0046\u0069\u0065\u006c\u0064\u0055\u0074\u0069\u006c\u0073\u002e\u0077\u0072\u0069\u0074\u0065\u0046\u0069\u0065\u006c\u0064\u0028\u0070\u0072\u006f\u0078\u0079\u0043\u006c\u0069\u0065\u006e\u0074\u0047\u0054\u002c\u0020\u0022\u006d\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u0022\u002c\u0020\u0078\u0043\u0061\u0070\u0065\u004c\u0069\u0073\u0074\u002c\u0020\u0074\u0072\u0075\u0065\u0029\u003b\u000a\u0009\u0009\u0009Logger\u002eWARNING\u0028\u0022\u0041\u0064\u0064\u0065\u0064\u0020\u006d\u006f\u0064\u0069\u0066\u0069\u0065\u0064\u0020\u0068\u0061\u0073\u0068\u0073\u0065\u0074\u0020\u0062\u0061\u0063\u006b\u0020\u0069\u006e\u0074\u006f\u0020\u0074\u0068\u0065\u0020\u0069\u006e\u0073\u0074\u0061\u006e\u0063\u0065\u002e\u0022\u0029\u003b\u0020\u0020\u0009\u0009\u0009\u000a\u0009\u0009\u0009\u0072\u0065\u0074\u0075\u0072\u006e\u0020\u0074\u0072\u0075\u0065\u003b\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u0020\u000a\u0009\u0009\u007d\u0020\u0063\u0061\u0074\u0063\u0068\u0020\u0028\u0066\u0069\u006e\u0061\u006c\u0020\u0054\u0068\u0072\u006f\u0077\u0061\u0062\u006c\u0065\u0020\u0065\u0029\u0020\u007b\u000a\u0009\u0009\u0009Logger\u002eINFO\u0028\u0022\u0052\u0065\u0066\u006c\u0065\u0063\u0074\u0069\u006f\u006e\u0020\u0069\u006e\u0074\u006f\u0020\u0061\u0063\u0074\u0069\u0076\u0065\u0020\u0063\u006c\u0069\u0065\u006e\u0074\u0020\u0070\u0072\u006f\u0078\u0079\u0020\u0069\u006e\u0073\u0074\u0061\u006e\u0063\u0065\u0020\u0066\u0061\u0069\u006c\u0065\u0064\u002e\u0022\u0029\u003b\u000a\u0009\u0009\u0009\u0065\u002e\u0070\u0072\u0069\u006e\u0074\u0053\u0074\u0061\u0063\u006b\u0054\u0072\u0061\u0063\u0065\u0028\u0029\u003b\u0020\u0020\u0020\u0020\u0020\u0020\u000a\u0009\u0009\u0009\u0072\u0065\u0074\u0075\u0072\u006e\u0020\u0066\u0061\u006c\u0073\u0065\u003b\u0020\u0020\u0009\u000a\u0009\u0009\u007d\u002f\u002a */
+	
+	/**
+	 * Returns a cached {@link Field} object.
+	 * @param aInstance - {@link Object} to get the field instance from.
+	 * @param aFieldName - Field name in {@link String} form.
+	 * @return - Valid, non-final, {@link Field} object, or {@link null}.
+	 */
+	public static <T> T getField(final Object aInstance, final String aFieldName) {
+		try {
+			return (T) getField(aInstance.getClass(), aFieldName).get(aInstance);
+		} catch (IllegalArgumentException | IllegalAccessException e) {
+			return null;
+		}
 	}
 
+
+
+
+	/*
+	 * Utility Functions
+	 */
+
 	public static boolean doesClassExist(final String classname) {
-		boolean exists = true;
-		try {
-			// Load any class that should be present if driver's available
-			Class.forName(classname);
-		} catch (final ClassNotFoundException e) {
-			// Driver is not available
-			exists = false;
+		return isClassPresent(classname);
+	}
+
+	public static void makeFieldAccessible(final Field field) {
+		if (!Modifier.isPublic(field.getModifiers()) ||
+				!Modifier.isPublic(field.getDeclaringClass().getModifiers()))
+		{
+			field.setAccessible(true);
+		}
+	}
+
+	public static void makeMethodAccessible(final Method field) {
+		if (!Modifier.isPublic(field.getModifiers()) ||
+				!Modifier.isPublic(field.getDeclaringClass().getModifiers()))
+		{
+			field.setAccessible(true);
 		}
-		return exists;
 	}
 
 	/**
 	 * Get the method name for a depth in call stack. <br />
 	 * Utility function
 	 * @param depth depth in the call stack (0 means current method, 1 means call method, ...)
-	 * @return method name
+	 * @return Method name
 	 */
 	public static String getMethodName(final int depth) {
 		final StackTraceElement[] ste = new Throwable().getStackTrace();
@@ -114,42 +249,60 @@ public class ReflectionUtils {
 
 
 	/**
-	 * Allows to change the state of an immutable instance. Huh?!?
+	 * 
+	 * @param aPackageName - The full {@link Package} name in {@link String} form. 
+	 * @return - {@link Boolean} object. True if loaded > 0 classes.
 	 */
-	public static void setFieldValue(Class<?> clazz,  String fieldName, Object newValue) throws Exception {
-		Field nameField = getField(clazz, fieldName);
-		setValue(clazz, nameField, newValue);
-	}
+	public static boolean dynamicallyLoadClassesInPackage(String aPackageName) {
+		ClassLoader classLoader = ReflectionUtils.class.getClassLoader();
+		int loaded = 0;
+		try {
+			ClassPath path = ClassPath.from(classLoader);
+			for (ClassPath.ClassInfo info : path.getTopLevelClassesRecursive(aPackageName)) {
+				Class<?> clazz = Class.forName(info.getName(), true, classLoader);
+				if (clazz != null) {
+					loaded++;
+					Logger.INFO("Found "+clazz.getCanonicalName()+". ["+loaded+"]");
+				}
+			}
+		} catch (ClassNotFoundException | IOException e) {
 
-	/**
-	 * Allows to change the state of final statics. Huh?!?
-	 */
-	public static void setDefault(Class<?> clazz, String fieldName, Object newValue) throws Exception {
-		Field staticField = clazz.getDeclaredField(fieldName);
-		setValue(null, staticField, newValue);
+		}
+
+		return loaded > 0;
 	}
+	
 
-	/**
-	 * 
-	 * Set the value of a field reflectively.
-	 */
-	protected static void setValue(Object owner, Field field, Object value) throws Exception {
-		makeModifiable(field);
-		field.set(owner, value);
+	public static boolean setField(final Object object, final String fieldName, final Object fieldValue) {
+		Class<?> clazz = object.getClass();
+		while (clazz != null) {
+			try {
+				final Field field = getField(clazz, fieldName);
+				if (field != null) {
+					setFieldValue_Internal(object, field, fieldValue);					
+					return true;
+				}
+			} catch (final NoSuchFieldException e) {
+				Logger.REFLECTION("setField("+object.toString()+", "+fieldName+") failed.");
+				clazz = clazz.getSuperclass();
+			} catch (final Exception e) {
+				Logger.REFLECTION("setField("+object.toString()+", "+fieldName+") failed.");
+				throw new IllegalStateException(e);
+			}
+		}
+		return false;
 	}
 
+
 	/**
-	 * Force the field to be modifiable and accessible.
+	 * Allows to change the state of an immutable instance. Huh?!?
 	 */
-	protected static void makeModifiable(Field nameField) throws Exception {
-		nameField.setAccessible(true);
-		int modifiers = nameField.getModifiers();
-		Field modifierField = nameField.getClass().getDeclaredField("modifiers");
-		modifiers = modifiers & ~Modifier.FINAL;
-		modifierField.setAccessible(true);
-		modifierField.setInt(nameField, modifiers);
+	public static void setFinalFieldValue(Class<?> clazz,  String fieldName, Object newValue) throws Exception {
+		Field nameField = getField(clazz, fieldName);
+		setFieldValue_Internal(clazz, nameField, newValue);
 	}
 
+	@Deprecated
 	public static void setFinalStatic(Field field, Object newValue) throws Exception {
 		field.setAccessible(true);
 		Field modifiersField = Field.class.getDeclaredField("modifiers");
@@ -258,13 +411,58 @@ public class ReflectionUtils {
 		return null;
 	}
 
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+
+
 	/*
-	 * @ if (isPresent("com.optionaldependency.DependencyClass")) { // This
-	 * block will never execute when the dependency is not present // There is
+	 * Internal Magic that probably should not get exposed.
+	 */	
+
+
+	private static Field getField_Internal(final Class<?> clazz, final String fieldName) throws NoSuchFieldException {
+		try {
+			Logger.REFLECTION("Field: Internal Lookup: "+fieldName);
+			Field k = clazz.getDeclaredField(fieldName);
+			makeFieldAccessible(k);
+			//Logger.REFLECTION("Got Field from Class. "+fieldName+" did exist within "+clazz.getCanonicalName()+".");
+			return k;
+		} catch (final NoSuchFieldException e) {
+			Logger.REFLECTION("Field: Internal Lookup Failed: "+fieldName);
+			final Class<?> superClass = clazz.getSuperclass();
+			if (superClass == null) {
+				Logger.REFLECTION("Unable to find field '"+fieldName+"'");	
+				//Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+".");
+				throw e;
+			}
+			Logger.REFLECTION("Method: Recursion Lookup: "+fieldName+" - Checking in "+superClass.getName());
+			//Logger.REFLECTION("Failed to get Field from Class. "+fieldName+" does not existing within "+clazz.getCanonicalName()+". Trying super class.");
+			return getField_Internal(superClass, fieldName);
+		}
+	}	
+
+	/**
+	 * if (isPresent("com.optionaldependency.DependencyClass")) || 
+	 * This block will never execute when the dependency is not present. There is
 	 * therefore no more risk of code throwing NoClassDefFoundException.
-	 * executeCodeLinkingToDependency(); }
 	 */
-	public static boolean isPresent(final String className) {
+	private static boolean isClassPresent(final String className) {
 		try {
 			Class.forName(className);
 			return true;
@@ -274,7 +472,6 @@ public class ReflectionUtils {
 		}
 	}
 
-	@SuppressWarnings("rawtypes")
 	@Deprecated
 	public static Method getMethodViaReflection(final Class<?> lookupClass, final String methodName,
 			final boolean invoke) throws Exception {
@@ -287,16 +484,10 @@ public class ReflectionUtils {
 		return m;
 	}
 
-	/**
-	 * Removes final modifier & returns a {@link Method} object.
-	 * @param aClass - Class containing the Method.
-	 * @param aMethodName - Method's name in {@link String} form.
-	 * @param aTypes - Varags Class Types for {@link Method}'s constructor.
-	 * @return - Valid, non-final, {@link Method} object.
-	 */
-	public static Method getMethod(Class aClass, String aMethodName, Class... aTypes) {
+	private static Method getMethod_Internal(Class aClass, String aMethodName, Class... aTypes) {
 		Method m = null;
 		try {
+			Logger.REFLECTION("Method: Internal Lookup: "+aMethodName);
 			m = aClass.getDeclaredMethod(aMethodName, aTypes);	
 			if (m != null) {
 				m.setAccessible(true);
@@ -308,35 +499,55 @@ public class ReflectionUtils {
 			}
 		}
 		catch (Throwable t) {
+			Logger.REFLECTION("Method: Internal Lookup Failed: "+aMethodName);
+			try {
+				m = getMethodRecursively(aClass, aMethodName);
+			} catch (NoSuchMethodException e) {
+				Logger.REFLECTION("Unable to find method '"+aMethodName+"'");	
+				e.printStackTrace();
+				dumpClassInfo(aClass);
+			}
 		}
 		return m;
 	}
-	
-	public static Method getMethodRecursively(final Class<?> clazz, final String fieldName) throws NoSuchMethodException {
+
+	private static Method getMethodRecursively(final Class<?> clazz, final String aMethodName) throws NoSuchMethodException {
 		try {
-			Method k = clazz.getDeclaredMethod(fieldName);
+			Logger.REFLECTION("Method: Recursion Lookup: "+aMethodName);
+			Method k = clazz.getDeclaredMethod(aMethodName);
 			makeMethodAccessible(k);
 			return k;
 		} catch (final NoSuchMethodException e) {
 			final Class<?> superClass = clazz.getSuperclass();
-			if (superClass == null) {
+			if (superClass == null || superClass == Object.class) {
 				throw e;
 			}
-			return getMethod(superClass, fieldName);
-		}
-	}
-
-	public static void makeMethodAccessible(final Method field) {
-		if (!Modifier.isPublic(field.getModifiers()) ||
-				!Modifier.isPublic(field.getDeclaringClass().getModifiers()))
-		{
-			field.setAccessible(true);
+			return getMethod_Internal(superClass, aMethodName);
 		}
-	}
-	
+	}	
 	
+	private static void dumpClassInfo(Class aClass) {
+		Logger.INFO("We ran into an error processing reflection in "+aClass.getName()+", dumping all data for debugging.");	
+		// Get the methods
+	    Method[] methods = aClass.getDeclaredMethods();
+	    Field[] fields = aClass.getDeclaredFields();
+	    Constructor[] consts = aClass.getDeclaredConstructors(); 
+
+		Logger.INFO("Dumping all Methods.");	
+	    for (Method method : methods) {
+		      System.out.println(method.getName()+" | "+StringUtils.getDataStringFromArray(method.getParameterTypes()));
+		    }
+		Logger.INFO("Dumping all Fields.");	
+	    for (Field f : fields) {
+		      System.out.println(f.getName());
+		    }
+		Logger.INFO("Dumping all Constructors.");	
+	    for (Constructor c : consts) {
+		      System.out.println(c.getName()+" | "+c.getParameterCount()+" | "+StringUtils.getDataStringFromArray(c.getParameterTypes()));
+		    }
+	}
 
-	public static Class<?> getNonPublicClass(final String className) {
+	private static Class<?> getNonPublicClass(final String className) {
 		Class<?> c = null;
 		try {
 			c = Class.forName(className);
@@ -377,7 +588,7 @@ public class ReflectionUtils {
 		return null;
 	}
 
-	public static Class<?> getClassByName(String string) {
+	private static Class<?> getClass_Internal(String string) {
 		if (ReflectionUtils.doesClassExist(string)) {
 			try {
 				return Class.forName(string);
@@ -389,23 +600,25 @@ public class ReflectionUtils {
 		return null;
 	}
 
-	public static boolean dynamicallyLoadClassesInPackage(String aPackageName) {
-		ClassLoader classLoader = GTplusplus.class.getClassLoader();
-		int loaded = 0;
-		try {
-			ClassPath path = ClassPath.from(classLoader);
-			for (ClassPath.ClassInfo info : path.getTopLevelClassesRecursive(aPackageName)) {
-				Class<?> clazz = Class.forName(info.getName(), true, classLoader);
-				if (clazz != null) {
-					loaded++;
-					Logger.INFO("Found "+clazz.getCanonicalName()+". ["+loaded+"]");
-				}
-			}
-		} catch (ClassNotFoundException | IOException e) {
-
-		}
+	/**
+	 * 
+	 * Set the value of a field reflectively.
+	 */
+	private static void setFieldValue_Internal(Object owner, Field field, Object value) throws Exception {
+		makeModifiable(field);
+		field.set(owner, value);
+	}
 
-		return loaded > 0;
+	/**
+	 * Force the field to be modifiable and accessible.
+	 */
+	private static void makeModifiable(Field nameField) throws Exception {
+		nameField.setAccessible(true);
+		int modifiers = nameField.getModifiers();
+		Field modifierField = nameField.getClass().getDeclaredField("modifiers");
+		modifiers = modifiers & ~Modifier.FINAL;
+		modifierField.setAccessible(true);
+		modifierField.setInt(nameField, modifiers);
 	}