diff --git a/fml/client/net/minecraft/src/ModLoader.java b/fml/client/net/minecraft/src/ModLoader.java
index 99042ac71..ab2015bb5 100644
--- a/fml/client/net/minecraft/src/ModLoader.java
+++ b/fml/client/net/minecraft/src/ModLoader.java
@@ -594,7 +594,7 @@ public class ModLoader
      */
     public static void registerPacketChannel(BaseMod mod, String channel)
     {
-        NetworkRegistry.instance().registerChannel(FMLCommonHandler.instance().findContainerFor(mod), channel);
+        NetworkRegistry.instance().registerChannel(ModLoaderHelper.buildPacketHandlerFor(mod), channel);
     }
 
     /**
diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
index 01bab75bd..d1de4e50b 100644
--- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
+++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
@@ -284,14 +284,9 @@ public class FMLCommonHandler
         if (forge==null && !noForge)
         {
             try {
-                forge = Class.forName("forge.MinecraftForge");
+                forge = Class.forName("net.minecraftforge.common.MinecraftForge");
             } catch (Exception ex) {
-                try {
-                    forge = Class.forName("net.minecraft.src.forge.MinecraftForge");
-                } catch (Exception ex2) {
-                    // Ignore- forge isn't loaded
-                    noForge = true;
-                }
+                noForge = true;
             }
         }
         return forge;
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
index e5ae582eb..b76818005 100644
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
@@ -22,7 +22,6 @@
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Start"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="FML-Client"/>
-<booleanAttribute key="org.eclipse.jdt.launching.STOP_IN_MAIN" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:FML-Client/jars}"/>
 <booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_AUTO_POLLING" value="true"/>
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
index e7e10d808..d522fdede 100644
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
+++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
@@ -12,6 +12,13 @@
 <stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_PROJECT" value="ProfileProject"/>
 <booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILE_TO_FILE" value="false"/>
 <stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILING_SET" value="tptp-dummy-profiling-set-FML-Server"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6&quot; javaProject=&quot;FML-Server&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;FML-Server&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;FML-MockMod&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;simpletestmod&quot; type=&quot;1&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraft.server.MinecraftServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="FML-Server"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
diff --git a/fml/eclipse/Clean-Client/.classpath b/fml/eclipse/Clean-Client/.classpath
index 89a5eec4e..6dd00b061 100644
--- a/fml/eclipse/Clean-Client/.classpath
+++ b/fml/eclipse/Clean-Client/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src-common"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-common"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/bin/jinput.jar">
 		<attributes>
diff --git a/fml/eclipse/FML-Client/.classpath b/fml/eclipse/FML-Client/.classpath
index 18fbd49a6..ed424204a 100644
--- a/fml/eclipse/FML-Client/.classpath
+++ b/fml/eclipse/FML-Client/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-common"/>
+	<classpathentry kind="src" path="common"/>
 	<classpathentry kind="src" path="transformers"/>
 	<classpathentry kind="src" path="client"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
diff --git a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
index a8164b7da..56e4f698c 100644
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
+++ b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
@@ -1,6 +1,8 @@
 package cpw.mods.mockmod;
 
 import net.minecraft.src.ItemBlock;
+import net.minecraft.src.NetworkManager;
+import net.minecraft.src.Packet250CustomPayload;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.Block;
 import cpw.mods.fml.common.Mod.Init;
@@ -9,11 +11,21 @@ import cpw.mods.fml.common.Mod.Metadata;
 import cpw.mods.fml.common.Mod.PreInit;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.IPacketHandler;
+import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.ModMetadata;
 
 @Mod(modid="MockMod", name="Mock Mod",version="1.2.3", dependencies="before:mod_testMod", useMetadata=true)
+@NetworkMod(channels={"MockMod"},clientSideRequired=true,packetHandler=MockMod.PacketHandler.class)
 public class MockMod
 {
+    public static class PacketHandler implements IPacketHandler
+    {
+        @Override
+        public void onPacketData(NetworkManager manager, Packet250CustomPayload packet)
+        {
+        }
+    }
     public class TestItem extends ItemBlock
     {
 
diff --git a/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java b/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
index 47e1577c9..19f0a4ade 100644
--- a/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
+++ b/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
@@ -6,10 +6,21 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.IScheduledTickHandler;
 import cpw.mods.fml.common.ITickHandler;
 import cpw.mods.fml.common.TickType;
+import cpw.mods.fml.common.network.IPacketHandler;
+import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.registry.TickRegistry;
 import net.minecraft.client.Minecraft;
 
+@NetworkMod(channels={"mod_TestMod"},clientSideRequired=true,packetHandler=mod_testMod.PacketHandler.class)
 public class mod_testMod extends BaseMod {
+    public static class PacketHandler implements IPacketHandler
+    {
+        @Override
+        public void onPacketData(NetworkManager manager, Packet250CustomPayload packet)
+        {
+        }
+    }
+
     private long ts;
     @Override
     public String getVersion() {
diff --git a/fml/server/net/minecraft/src/ModLoader.java b/fml/server/net/minecraft/src/ModLoader.java
index feaeab818..11138048a 100644
--- a/fml/server/net/minecraft/src/ModLoader.java
+++ b/fml/server/net/minecraft/src/ModLoader.java
@@ -24,6 +24,8 @@ import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 import cpw.mods.fml.common.modloader.ModLoaderHelper;
 import cpw.mods.fml.common.modloader.ModLoaderModContainer;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.server.FMLServerHandler;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -423,7 +425,7 @@ public class ModLoader
      */
     public static boolean isChannelActive(EntityPlayer player, String channel)
     {
-        return FMLCommonHandler.instance().isChannelActive(channel, player);
+        return NetworkRegistry.instance().isChannelActive(channel, (Player) player);
     }
 
     public static boolean isGUIOpen(Class<?> gui)
@@ -568,7 +570,7 @@ public class ModLoader
      */
     public static void registerPacketChannel(BaseMod mod, String channel)
     {
-        FMLCommonHandler.instance().registerChannel(FMLCommonHandler.instance().findContainerFor(mod), channel);
+        NetworkRegistry.instance().registerChannel(ModLoaderHelper.buildPacketHandlerFor(mod), channel);
     }
 
     /**