diff --git a/common/mekanism/client/ThreadTankSparkle.java b/common/mekanism/client/ThreadTankSparkle.java
index c396953ac..b925f8a4f 100644
--- a/common/mekanism/client/ThreadTankSparkle.java
+++ b/common/mekanism/client/ThreadTankSparkle.java
@@ -33,7 +33,7 @@ public class ThreadTankSparkle extends Thread
 		try {
 			if(Mekanism.dynamicTankEasterEgg)
 			{
-				MekanismClient.audioHandler.quickPlay("cj/CJ_" + (random.nextInt(3)+1) + ".ogg", pointer.worldObj, Coord4D.get(pointer));
+				MekanismClient.audioHandler.quickPlay("cj/CJ_" + (random.nextInt(8)+1) + ".ogg", pointer.worldObj, Coord4D.get(pointer));
 			}
 			
 			loop(pointer);
diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java
index c1b9cfbe0..eed2c8406 100644
--- a/common/mekanism/common/Mekanism.java
+++ b/common/mekanism/common/Mekanism.java
@@ -404,7 +404,7 @@ public class Mekanism
 			"RCR", "ECE", "RCR", Character.valueOf('C'), Item.ingotGold, Character.valueOf('R'), Item.redstone, Character.valueOf('E'), EnrichedAlloy
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 0), new Object[] {
-			"ARA", "CIC", "ARA", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('R'), Item.redstone, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('C'), ControlCircuit
+			"ARA", "CIC", "ARA", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('R'), Item.redstone, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('C'), "circuitBasic"
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 1), new Object[] {
 			"RCR", "GIG", "RCR", Character.valueOf('R'), Item.redstone, Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), Block.glass, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8)
@@ -470,13 +470,13 @@ public class Mekanism
 			" S ", "SPS", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('P'), "ingotOsmium"
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 10), new Object[] {
-			"SCS", "GIG", "SCS", Character.valueOf('S'), Block.cobblestone, Character.valueOf('C'), ControlCircuit, Character.valueOf('G'), Block.glass, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8)
+			"SCS", "GIG", "SCS", Character.valueOf('S'), Block.cobblestone, Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), Block.glass, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8)
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 12), new Object[] {
 			" B ", "ECE", "OOO", Character.valueOf('B'), Item.bucketEmpty, Character.valueOf('E'), EnrichedAlloy, Character.valueOf('C'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium"
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 13), new Object[] {
-			"SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), Block.glass, Character.valueOf('C'), Block.chest, Character.valueOf('c'), ControlCircuit
+			"SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), Block.glass, Character.valueOf('C'), Block.chest, Character.valueOf('c'), "circuitBasic"
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 8, 9), new Object[] {
 			" I ", "ISI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('S'), Block.cobblestone
@@ -485,7 +485,7 @@ public class Mekanism
 			" I ", "IGI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('G'), Block.glass
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 2, 11), new Object[] {
-			" I ", "ICI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('C'), ControlCircuit
+			" I ", "ICI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('C'), "circuitBasic"
 		}));
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 14), new Object[] {
 			"PPP", "SES", Character.valueOf('P'), Block.pressurePlateStone, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), EnergyTablet.getUnchargedItem()
diff --git a/resources/assets/mekanism/sound/cj/CJ_4.ogg b/resources/assets/mekanism/sound/cj/CJ_4.ogg
new file mode 100644
index 000000000..d0f57a66c
Binary files /dev/null and b/resources/assets/mekanism/sound/cj/CJ_4.ogg differ
diff --git a/resources/assets/mekanism/sound/cj/CJ_5.ogg b/resources/assets/mekanism/sound/cj/CJ_5.ogg
new file mode 100644
index 000000000..44008bb65
Binary files /dev/null and b/resources/assets/mekanism/sound/cj/CJ_5.ogg differ
diff --git a/resources/assets/mekanism/sound/cj/CJ_6.ogg b/resources/assets/mekanism/sound/cj/CJ_6.ogg
new file mode 100644
index 000000000..9c5c8c5dc
Binary files /dev/null and b/resources/assets/mekanism/sound/cj/CJ_6.ogg differ
diff --git a/resources/assets/mekanism/sound/cj/CJ_7.ogg b/resources/assets/mekanism/sound/cj/CJ_7.ogg
new file mode 100644
index 000000000..2f997dff8
Binary files /dev/null and b/resources/assets/mekanism/sound/cj/CJ_7.ogg differ
diff --git a/resources/assets/mekanism/sound/cj/CJ_8.ogg b/resources/assets/mekanism/sound/cj/CJ_8.ogg
new file mode 100644
index 000000000..71d49b3b2
Binary files /dev/null and b/resources/assets/mekanism/sound/cj/CJ_8.ogg differ