diff --git a/src/main/java/nmd/primal/forgecraft/ForgeCraft.java b/src/main/java/nmd/primal/forgecraft/ForgeCraft.java
index 56a88493..161111f0 100644
--- a/src/main/java/nmd/primal/forgecraft/ForgeCraft.java
+++ b/src/main/java/nmd/primal/forgecraft/ForgeCraft.java
@@ -11,6 +11,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import nmd.primal.forgecraft.init.ModBlocks;
 import nmd.primal.forgecraft.init.ModCrafting;
 import nmd.primal.forgecraft.init.ModItems;
+import nmd.primal.forgecraft.init.ModTiles;
 import nmd.primal.forgecraft.proxy.CommonProxy;
 //import nmd.primal.forgecraft.common.init.*;
 
@@ -39,7 +40,7 @@ public class ForgeCraft
         ModBlocks.init();
         ModItems.register();
         ModBlocks.register();
-
+        ModTiles.registerTileEntities();
     }
 
     @EventHandler
diff --git a/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java b/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java
index eee43b98..fc89521d 100644
--- a/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java
+++ b/src/main/java/nmd/primal/forgecraft/blocks/Firebox.java
@@ -122,3 +122,10 @@ public class Firebox extends BlockContainer implements ITileEntityProvider {
         return true;
     }
 }
+
+/*
+Firebox States
+Off
+On
+
+ */
\ No newline at end of file
diff --git a/src/main/java/nmd/primal/forgecraft/init/ModTiles.java b/src/main/java/nmd/primal/forgecraft/init/ModTiles.java
new file mode 100644
index 00000000..5d8843c2
--- /dev/null
+++ b/src/main/java/nmd/primal/forgecraft/init/ModTiles.java
@@ -0,0 +1,20 @@
+package nmd.primal.forgecraft.init;
+
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityNote;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import nmd.primal.forgecraft.tiles.TileFirebox;
+
+/**
+ * Created by kitsu on 12/2/2016.
+ */
+public class ModTiles {
+
+    public static void registerTileEntities () {
+        registerTileEntity(TileFirebox.class, "firebox");
+    }
+
+    private static void registerTileEntity(Class<? extends TileEntity> tile_class, String baseName) {
+        GameRegistry.registerTileEntity(tile_class, "tile.forgecraft." + baseName);
+    }
+}