diff --git a/src/main/java/com/goodbird/npcgecko/CommonProxy.java b/src/main/java/com/goodbird/npcgecko/CommonProxy.java
index ea7a912..9b4ae89 100644
--- a/src/main/java/com/goodbird/npcgecko/CommonProxy.java
+++ b/src/main/java/com/goodbird/npcgecko/CommonProxy.java
@@ -1,12 +1,21 @@
 package com.goodbird.npcgecko;
 
 import com.goodbird.npcgecko.entity.EntityCustomModel;
+import com.goodbird.npcgecko.handler.EventHandler;
+import com.goodbird.npcgecko.network.NetworkHandler;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.EntityRegistry;
+import noppes.npcs.scripted.NpcAPI;
 
 public class CommonProxy {
 
     public void preInit(FMLPreInitializationEvent ev){
         EntityRegistry.registerModEntity(EntityCustomModel.class, "CustomModelEntity", 0, CustomNpcPlusGecko.instance, 64, 10, false);
+        NpcAPI.EVENT_BUS.register(new EventHandler());
+    }
+
+    public void init(FMLInitializationEvent ev){
+        NetworkHandler.init();
     }
 }
diff --git a/src/main/java/com/goodbird/npcgecko/CustomNpcPlusGecko.java b/src/main/java/com/goodbird/npcgecko/CustomNpcPlusGecko.java
index 94738aa..6366343 100644
--- a/src/main/java/com/goodbird/npcgecko/CustomNpcPlusGecko.java
+++ b/src/main/java/com/goodbird/npcgecko/CustomNpcPlusGecko.java
@@ -2,6 +2,7 @@ package com.goodbird.npcgecko;
 
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 @Mod(modid = "npcgecko",
@@ -20,4 +21,8 @@ public class CustomNpcPlusGecko {
     public void preInit(FMLPreInitializationEvent ev) {
         proxy.preInit(ev);
     }
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent ev) {
+        proxy.init(ev);
+    }
 }