diff --git a/atomic/src/main/scala/resonantinduction/atomic/Atomic.java b/atomic/src/main/scala/resonantinduction/atomic/Atomic.java
index 8498e0e07..85dddcff0 100644
--- a/atomic/src/main/scala/resonantinduction/atomic/Atomic.java
+++ b/atomic/src/main/scala/resonantinduction/atomic/Atomic.java
@@ -29,7 +29,6 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
-import net.minecraftforge.event.world.WorldEvent.Save;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -53,7 +52,6 @@ import resonant.lib.prefab.ore.OreGenerator;
 import resonant.lib.recipe.UniversalRecipe;
 import resonant.lib.render.RenderUtility;
 import resonant.lib.thermal.EventThermal.EventThermalUpdate;
-import resonant.lib.utility.nbt.NBTUtility;
 import resonantinduction.atomic.blocks.BlockToxicWaste;
 import resonantinduction.atomic.blocks.BlockUraniumOre;
 import resonantinduction.atomic.blocks.TileElectromagnet;
@@ -66,7 +64,6 @@ import resonantinduction.atomic.items.ItemFissileFuel;
 import resonantinduction.atomic.items.ItemHazmat;
 import resonantinduction.atomic.items.ItemRadioactive;
 import resonantinduction.atomic.items.ItemUranium;
-import resonantinduction.atomic.machine.accelerator.BlockAccelerator;
 import resonantinduction.atomic.machine.accelerator.EntityParticle;
 import resonantinduction.atomic.machine.accelerator.TileAccelerator;
 import resonantinduction.atomic.machine.boiler.BlockNuclearBoiler;
@@ -305,7 +302,7 @@ public class Atomic
         blockElectromagnet = contentRegistry.newBlock(TileElectromagnet.class);
         blockSiren = contentRegistry.newBlock(TileSiren.class);
         blockSteamFunnel = contentRegistry.newBlock(TileFunnel.class);
-        blockAccelerator = contentRegistry.createTile(BlockAccelerator.class, TileAccelerator.class);
+        blockAccelerator = contentRegistry.newBlock(TileAccelerator.class);
         blockFulmination = contentRegistry.newBlock(TileFulmination.class);
         blockQuantumAssembler = contentRegistry.newBlock(TileQuantumAssembler.class);
         blockToxicWaste = contentRegistry.createBlock(BlockToxicWaste.class).setCreativeTab(null);
diff --git a/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/BlockAccelerator.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/BlockAccelerator.java
deleted file mode 100644
index 992ea0607..000000000
--- a/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/BlockAccelerator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package resonantinduction.atomic.machine.accelerator;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import resonant.lib.prefab.block.BlockRotatable;
-import resonantinduction.atomic.Atomic;
-import universalelectricity.api.UniversalElectricity;
-
-/** Accelerator block */
-public class BlockAccelerator extends BlockRotatable
-{
-    public BlockAccelerator(int id)
-    {
-        super(id, UniversalElectricity.machine);
-
-    }
-
-    @Override
-    public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ)
-    {
-        int metadata = par1World.getBlockMetadata(x, y, z);
-
-        if (!par1World.isRemote)
-        {
-            par5EntityPlayer.openGui(Atomic.INSTANCE, 0, par1World, x, y, z);
-        }
-
-        return true;
-    }
-
-    @Override
-    public TileEntity createNewTileEntity(World var1)
-    {
-        return new TileAccelerator();
-    }
-}
diff --git a/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java
index 83d32ba81..4217bf3c8 100644
--- a/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java
+++ b/atomic/src/main/scala/resonantinduction/atomic/machine/accelerator/TileAccelerator.java
@@ -1,6 +1,7 @@
 package resonantinduction.atomic.machine.accelerator;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
@@ -18,6 +19,7 @@ import resonantinduction.atomic.items.ItemDarkMatter;
 import resonantinduction.core.Reference;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.Settings;
+import universalelectricity.api.UniversalElectricity;
 import universalelectricity.api.electricity.IVoltageInput;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.energy.IEnergyInterface;
@@ -57,6 +59,7 @@ public class TileAccelerator extends TileElectricalInventory implements IElectro
 
     public TileAccelerator()
     {
+        super(UniversalElectricity.machine);
         energy = new EnergyStorageHandler(energyPerTick * 2, energyPerTick / 20);
         maxSlots = 4;
         antiMatterDensityMultiplyer = DENSITY_MULTIPLYER_DEFAULT;
@@ -240,6 +243,16 @@ public class TileAccelerator extends TileElectricalInventory implements IElectro
             lastSpawnTick++;
         }
     }
+    
+    @Override
+    protected boolean use(EntityPlayer player, int side, Vector3 hit)
+    {
+        if (!world().isRemote)
+        {
+            player.openGui(Atomic.INSTANCE, 0, world(), x(), y(), z());
+        }
+        return true;
+    }
 
     private void CalculateParticleDensity()
     {