diff --git a/src/main/java/assets/hbm/textures/blocks/armor_table_bottom.png b/src/main/java/assets/hbm/textures/blocks/armor_table_bottom.png
new file mode 100644
index 000000000..f211c4645
Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/armor_table_bottom.png differ
diff --git a/src/main/java/assets/hbm/textures/blocks/armor_table_side.png b/src/main/java/assets/hbm/textures/blocks/armor_table_side.png
new file mode 100644
index 000000000..fe7d78475
Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/armor_table_side.png differ
diff --git a/src/main/java/assets/hbm/textures/blocks/armor_table_top.png b/src/main/java/assets/hbm/textures/blocks/armor_table_top.png
new file mode 100644
index 000000000..faad67b64
Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/armor_table_top.png differ
diff --git a/src/main/java/assets/hbm/textures/gui/generic_54.png b/src/main/java/assets/hbm/textures/gui/generic_54.png
new file mode 100755
index 000000000..0b880ef98
Binary files /dev/null and b/src/main/java/assets/hbm/textures/gui/generic_54.png differ
diff --git a/src/main/java/assets/hbm/textures/gui/gui_armor_modifier.png b/src/main/java/assets/hbm/textures/gui/gui_armor_modifier.png
new file mode 100644
index 000000000..0ff74fa7e
Binary files /dev/null and b/src/main/java/assets/hbm/textures/gui/gui_armor_modifier.png differ
diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java
index 7dd39cc37..c2986187c 100644
--- a/src/main/java/com/hbm/blocks/ModBlocks.java
+++ b/src/main/java/com/hbm/blocks/ModBlocks.java
@@ -746,6 +746,9 @@ public class ModBlocks {
 	public static Block machine_keyforge;
 	public static final int guiID_keyforge = 67;
 
+	public static Block machine_armor_table;
+	public static final int guiID_armor_taable = 67;
+
 	public static Block machine_reactor_small;
 	public static final int guiID_reactor_small = 65;
 
@@ -1304,6 +1307,7 @@ public class ModBlocks {
 		machine_satlinker = new MachineSatLinker(Material.iron).setBlockName("machine_satlinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_satlinker_side");
 		machine_telelinker = new MachineTeleLinker(Material.iron).setBlockName("machine_telelinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.nukeTab).setBlockTextureName(RefStrings.MODID + ":machine_telelinker_side");
 		machine_keyforge = new MachineKeyForge(Material.iron).setBlockName("machine_keyforge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":machine_keyforge_side");
+		machine_armor_table = new BlockArmorTable(Material.iron).setBlockName("machine_armor_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab);
 
 		machine_solar_boiler = new MachineSolarBoiler(Material.iron).setBlockName("machine_solar_boiler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_solar_boiler");
 		solar_mirror = new SolarMirror(Material.iron).setBlockName("solar_mirror").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":solar_mirror");
@@ -2104,6 +2108,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(machine_satlinker, machine_satlinker.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_telelinker, machine_telelinker.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_keyforge, machine_keyforge.getUnlocalizedName());
+		GameRegistry.registerBlock(machine_armor_table, machine_armor_table.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_forcefield, machine_forcefield.getUnlocalizedName());
 		GameRegistry.registerBlock(radiorec, radiorec.getUnlocalizedName());
 		GameRegistry.registerBlock(radiobox, radiobox.getUnlocalizedName());
diff --git a/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java b/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java
new file mode 100644
index 000000000..eafe59b1c
--- /dev/null
+++ b/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java
@@ -0,0 +1,53 @@
+package com.hbm.blocks.machine;
+
+import com.hbm.lib.RefStrings;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class BlockArmorTable extends Block {
+
+	@SideOnly(Side.CLIENT)
+	private IIcon iconTop;
+	@SideOnly(Side.CLIENT)
+	private IIcon iconBottom;
+
+	public BlockArmorTable(Material p_i45394_1_) {
+		super(p_i45394_1_);
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister iconRegister) {
+
+		this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":armor_table_top");
+		this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":armor_table_bottom");
+		this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":armor_table_side");
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int metadata) {
+		return side == 0 ? this.iconBottom : (side == 1 ? this.iconTop : this.blockIcon);
+	}
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		
+		if(world.isRemote) {
+			return true;
+		} else if(!player.isSneaking()) {
+
+			return true;
+		}
+		
+		return false;
+	}
+
+}
diff --git a/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java b/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java
index 873724220..2b3880812 100644
--- a/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java
+++ b/src/main/java/com/hbm/blocks/machine/BlockConverterHeRf.java
@@ -1,10 +1,7 @@
 package com.hbm.blocks.machine;
 
-import com.hbm.blocks.ModBlocks;
-import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityConverterHeRf;
 
-import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java
index b4793ee36..ad3bfa72f 100644
--- a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java
+++ b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java
@@ -1,10 +1,7 @@
 package com.hbm.blocks.machine;
 
-import com.hbm.blocks.ModBlocks;
-import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityConverterRfHe;
 
-import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;