diff --git a/src/main/java/com/watschman/beeriffic/Beeriffic.java b/src/main/java/com/watschman/beeriffic/Beeriffic.java
index 253d398..e3fdc91 100644
--- a/src/main/java/com/watschman/beeriffic/Beeriffic.java
+++ b/src/main/java/com/watschman/beeriffic/Beeriffic.java
@@ -1,7 +1,9 @@
 package com.watschman.beeriffic;
 
-import com.watschman.beeriffic.bees.EnumSpecies;
+import com.watschman.beeriffic.blocks.ModBlocks;
 import com.watschman.beeriffic.items.ModItems;
+import com.watschman.beeriffic.util.RegistryHandler;
+import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -27,6 +29,7 @@
     */
 
     public static final List<Item> MOD_ITEMS = new ArrayList<>();
+    public static final List<Block> MOD_BLOCKS = new ArrayList<>();
 
     public static Logger LOGGER;
 
@@ -60,8 +63,11 @@
     public void init(FMLInitializationEvent event) {
         LOGGER.info("Init Started");
 
-        EnumSpecies.STONY.registerGeneTemplate();
-        ModItems.initColorHandlers();
+        RegistryHandler.registerBees();
+
+        RegistryHandler.registerHiveGen();
+
+        RegistryHandler.registerColorHandlers();
 
         LOGGER.info("Init Ended");
     }
@@ -80,13 +86,34 @@
     public static class ObjectRegistryHandler {
         @SubscribeEvent
         public static void addItems(RegistryEvent.Register<Item> event) {
+            Beeriffic.LOGGER.info("ItemInit started...");
+
             ModItems.init();
 
             for(Item item : Beeriffic.MOD_ITEMS) {
                 event.getRegistry().register(item);
             }
 
-            ModItems.initRenders();
+            RegistryHandler.registerItemModels();
+
+            RegistryHandler.registerOreDictEntries();
+
+            Beeriffic.LOGGER.info("ItemInit ended...");
+        }
+
+        @SubscribeEvent
+        public static void addBlocks(RegistryEvent.Register<Block> event) {
+            Beeriffic.LOGGER.info("BlockInit started...");
+
+            ModBlocks.init();
+
+            for(Block block : Beeriffic.MOD_BLOCKS) {
+                event.getRegistry().register(block);
+            }
+
+            RegistryHandler.registerBlockModels();
+
+            Beeriffic.LOGGER.info("BlockInit ended...");
         }
     }
 }