diff --git a/src/main/java/nmd/primal/energy/Main.java b/src/main/java/nmd/primal/energy/Main.java
index 358a2a4..9244b48 100644
--- a/src/main/java/nmd/primal/energy/Main.java
+++ b/src/main/java/nmd/primal/energy/Main.java
@@ -3,6 +3,8 @@ package nmd.primal.energy;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 @Mod(modid = Main.MODID, version = Main.VERSION)
 public class Main
@@ -10,10 +12,29 @@ public class Main
     public static final String MODID = "energy";
     public static final String VERSION = "1.0";
     
+    @EventHandler
+    public void preinit(FMLPreInitializationEvent event)
+    {
+		// some example code
+        //System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
+    }
+    
     @EventHandler
     public void init(FMLInitializationEvent event)
     {
 		// some example code
         //System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
     }
+<<<<<<< HEAD
+=======
+    
+	@EventHandler
+	public void postInit(FMLPostInitializationEvent e) {
+
+		System.out.println("U want some Body Massage?");
+		//RenderingRegistry.registerEntityRenderingHandler(EntityShit.class, new RenderSnowball(ModItems.itemShit));
+	}
+    
+    //Fluids comment
+>>>>>>> 71867cff5f48b73b986b837d8f6e04f57d3ee247
 }