diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java
index da06b405..f99ad2a5 100644
--- a/src/main/java/electroblob/wizardry/Wizardry.java
+++ b/src/main/java/electroblob/wizardry/Wizardry.java
@@ -1,7 +1,5 @@
 package electroblob.wizardry;
 
-import org.apache.logging.log4j.Logger;
-
 import electroblob.wizardry.command.CommandCastSpell;
 import electroblob.wizardry.command.CommandDiscoverSpell;
 import electroblob.wizardry.command.CommandSetAlly;
@@ -30,6 +28,7 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
+import org.apache.logging.log4j.Logger;
 
 @Mod(modid = Wizardry.MODID, name = Wizardry.NAME, version = Wizardry.VERSION, guiFactory = "electroblob.wizardry.WizardryGuiFactory")
 public class Wizardry {
@@ -136,7 +135,6 @@ public class Wizardry {
 
 		// Event Handlers
 		GameRegistry.registerWorldGenerator(generator, 0);
-		MinecraftForge.EVENT_BUS.register(new WizardryKeyHandler());
 		MinecraftForge.EVENT_BUS.register(instance);
 		proxy.registerSpellHUD(); // This can't easily be converted to use the new @Mod.EventBusSubscriber system
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new WizardryGuiHandler());
diff --git a/src/main/java/electroblob/wizardry/WizardryKeyHandler.java b/src/main/java/electroblob/wizardry/client/WizardryKeyHandler.java
similarity index 82%
rename from src/main/java/electroblob/wizardry/WizardryKeyHandler.java
rename to src/main/java/electroblob/wizardry/client/WizardryKeyHandler.java
index b3fe5cfb..09bcadc0 100644
--- a/src/main/java/electroblob/wizardry/WizardryKeyHandler.java
+++ b/src/main/java/electroblob/wizardry/client/WizardryKeyHandler.java
@@ -1,25 +1,30 @@
-package electroblob.wizardry;
+package electroblob.wizardry.client;
 
-import electroblob.wizardry.client.ClientProxy;
+import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.item.ItemWand;
 import electroblob.wizardry.packet.PacketControlInput;
 import electroblob.wizardry.packet.WizardryPacketHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
+@SideOnly(Side.CLIENT)
+@Mod.EventBusSubscriber(Side.CLIENT)
 public class WizardryKeyHandler {
 
-	boolean NkeyPressed = false;
-	boolean BkeyPressed = false;
+	static boolean NkeyPressed = false;
+	static boolean BkeyPressed = false;
 
 	// Changed to a tick event to allow mouse button keybinds
 	// The 'lag' that happened previously was actually because the code only fired when a keyboard key was pressed!
 	@SubscribeEvent
-	public void onTickEvent(TickEvent.ClientTickEvent event){
+	public static void onTickEvent(TickEvent.ClientTickEvent event){
 
 		if(event.phase == TickEvent.Phase.END) return; // Only really needs to be once per tick