diff --git a/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java b/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java
index 1a82983..1c691c4 100644
--- a/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java
+++ b/src/main/java/com/watschman/betterenhancement/BetterEnhancement.java
@@ -6,8 +6,11 @@
 import com.watschman.betterenhancement.config.ConfigurationHandler;
 import com.watschman.betterenhancement.items.ModItems;
 import com.watschman.betterenhancement.reference.Reference;
+import com.watschman.betterenhancement.tile.TileEntityHandler;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -15,6 +18,9 @@
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+
+import java.util.Map;
 
 import static com.watschman.betterenhancement.reference.Reference.*;
 
@@ -108,6 +114,18 @@
             }
 
             MOD_LOGGER.info("Ending Block Registering Event...");
+            MOD_LOGGER.info("Starting Tile Entity Registering Event...");
+            TileEntityHandler.registerTileEntities();
+
+            for(Map.Entry<Class<? extends TileEntity>, String> entry : Reference.MOD_TILE_ENTITIES.entrySet()) {
+                Class<? extends TileEntity> tileEntityClass = entry.getKey();
+                String tileEntityName = entry.getValue();
+                MOD_LOGGER.info("Registering following Tile Entity: " + tileEntityName + " with Class: " + tileEntityClass.getSimpleName());
+                GameRegistry.registerTileEntity(tileEntityClass, new ResourceLocation(Reference.MOD_ID + ":" + tileEntityName));
+            }
+
+
+            MOD_LOGGER.info("Ending Tile Entity Registering Event...");
         }
     }
 }