diff --git a/src/main/java/ley/modding/dartcraft/Dartcraft.java b/src/main/java/ley/modding/dartcraft/Dartcraft.java
index bc471fe..6f4ff64 100644
--- a/src/main/java/ley/modding/dartcraft/Dartcraft.java
+++ b/src/main/java/ley/modding/dartcraft/Dartcraft.java
@@ -6,22 +6,11 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.relauncher.Side;
-import ley.modding.dartcraft.block.BlockForceLeaves;
-import ley.modding.dartcraft.block.BlockForceLog;
-import ley.modding.dartcraft.block.BlockForceSapling;
-import ley.modding.dartcraft.block.BlockPowerOre;
 import ley.modding.dartcraft.block.Blocks;
 import ley.modding.dartcraft.entity.*;
 import ley.modding.dartcraft.event.EventHandler;
 import ley.modding.dartcraft.internal.Registry;
-import ley.modding.dartcraft.item.BaseItem;
-import ley.modding.dartcraft.item.ItemEntityBottle;
-import ley.modding.dartcraft.item.ItemForceFlask;
 import ley.modding.dartcraft.item.Items;
-import ley.modding.dartcraft.item.tool.ItemForceMitts;
-import ley.modding.dartcraft.item.tool.ItemForcePickaxe;
-import ley.modding.dartcraft.item.tool.ItemForceShears;
 import ley.modding.dartcraft.proxy.CommonProxy;
 import ley.modding.dartcraft.tab.DartcraftTab;
 import ley.modding.tileralib.api.IRegistry;
@@ -49,23 +38,9 @@ public class Dartcraft {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent e) {
-        // TODO: wtf is this?! this belongs into the Items and Blocks classes!
         registry = new Registry();
-        Items.forcegem = registry.registerItem(new BaseItem("forcegem"));
-        Items.forceingot = registry.registerItem(new BaseItem("forceingot"));
-        Items.forcenugget = registry.registerItem(new BaseItem("forcenugget"));
-        Items.forcestick = registry.registerItem(new BaseItem("forcestick"));
-        Items.forceshard = registry.registerItem(new BaseItem("forceshard"));
-        Items.forcemitts = registry.registerItem(new ItemForceMitts());
-        Items.forcepickaxe = registry.registerItem(new ItemForcePickaxe());
-        Items.forceshears = registry.registerItem(new ItemForceShears());
-        Items.forceflask = registry.registerItem(new ItemForceFlask());
-        Items.entitybottle = registry.registerItem(new ItemEntityBottle());
-
-        Blocks.forcesapling = registry.registerBlock(new BlockForceSapling());
-        Blocks.powerore = registry.registerBlock(new BlockPowerOre());
-        Blocks.forcelog = registry.registerBlock(new BlockForceLog());
-        Blocks.forceleaves = registry.registerBlock(new BlockForceLeaves());
+        Items.regsiter(registry);
+        Blocks.register(registry);
 
         proxy.init();
 
diff --git a/src/main/java/ley/modding/dartcraft/block/Blocks.java b/src/main/java/ley/modding/dartcraft/block/Blocks.java
index 2771d8a..a6a5f17 100644
--- a/src/main/java/ley/modding/dartcraft/block/Blocks.java
+++ b/src/main/java/ley/modding/dartcraft/block/Blocks.java
@@ -1,12 +1,18 @@
 package ley.modding.dartcraft.block;
 
+import ley.modding.tileralib.api.IRegistry;
 import net.minecraft.block.Block;
 
 public class Blocks {
-
     public static Block powerore;
     public static Block forcesapling;
     public static Block forcelog;
     public static Block forceleaves;
 
+    public static void register(IRegistry reg) {
+        Blocks.forcesapling = reg.registerBlock(new BlockForceSapling());
+        Blocks.powerore = reg.registerBlock(new BlockPowerOre());
+        Blocks.forcelog = reg.registerBlock(new BlockForceLog());
+        Blocks.forceleaves = reg.registerBlock(new BlockForceLeaves());
+    }
 }
diff --git a/src/main/java/ley/modding/dartcraft/item/Items.java b/src/main/java/ley/modding/dartcraft/item/Items.java
index a02bb1c..764ea18 100644
--- a/src/main/java/ley/modding/dartcraft/item/Items.java
+++ b/src/main/java/ley/modding/dartcraft/item/Items.java
@@ -1,5 +1,9 @@
 package ley.modding.dartcraft.item;
 
+import ley.modding.dartcraft.item.tool.ItemForceMitts;
+import ley.modding.dartcraft.item.tool.ItemForcePickaxe;
+import ley.modding.dartcraft.item.tool.ItemForceShears;
+import ley.modding.tileralib.api.IRegistry;
 import net.minecraft.item.Item;
 
 public class Items {
@@ -15,4 +19,16 @@ public class Items {
     public static Item forceflask;
     public static Item entitybottle;
 
+    public static void regsiter(IRegistry reg) {
+        Items.forcegem = reg.registerItem(new BaseItem("forcegem"));
+        Items.forceingot = reg.registerItem(new BaseItem("forceingot"));
+        Items.forcenugget = reg.registerItem(new BaseItem("forcenugget"));
+        Items.forcestick = reg.registerItem(new BaseItem("forcestick"));
+        Items.forceshard = reg.registerItem(new BaseItem("forceshard"));
+        Items.forcemitts = reg.registerItem(new ItemForceMitts());
+        Items.forcepickaxe = reg.registerItem(new ItemForcePickaxe());
+        Items.forceshears = reg.registerItem(new ItemForceShears());
+        Items.forceflask = reg.registerItem(new ItemForceFlask());
+        Items.entitybottle = reg.registerItem(new ItemEntityBottle());
+    }
 }