diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java
new file mode 100644
index 00000000..fc5bacf3
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java
@@ -0,0 +1,47 @@
+package tconstruct.plugins.waila;
+
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.ForgeDirection;
+import tconstruct.blocks.logic.CastingTableLogic;
+
+import java.util.List;
+
+public class TableDataProvider implements IWailaDataProvider {
+
+    @Override
+    public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        if (accessor.getTileEntity() instanceof CastingTableLogic)
+        {
+            CastingTableLogic te = (CastingTableLogic)accessor.getTileEntity();
+            return te.getStackInSlot(0);
+        }
+        return null;
+    }
+
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
+        if (accessor.getTileEntity() instanceof CastingTableLogic)
+        {
+            CastingTableLogic te = (CastingTableLogic)accessor.getTileEntity();
+            if (te.getStackInSlot(1) != null)
+            {
+                currenttip.add("Contains: " + te.getStackInSlot(1).getDisplayName());
+            }
+            if (te.getFluid() != null)
+            {
+                currenttip.add("Fluid: " + WailaRegistrar.fluidNameHelper(te.getFluid()));
+                currenttip.add("Amount: " + te.getFluidAmount() + "/" + te.getCapacity());
+            }
+        }
+        return currenttip;
+    }
+
+}
diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java
index 52345e01..7e023705 100644
--- a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java
+++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java
@@ -9,6 +9,7 @@ import tconstruct.blocks.LavaTankBlock;
 import tconstruct.blocks.SmelteryBlock;
 import tconstruct.blocks.logic.CastingBasinLogic;
 import tconstruct.blocks.logic.CastingChannelLogic;
+import tconstruct.blocks.logic.CastingTableLogic;
 
 public class WailaRegistrar
 {
@@ -20,7 +21,10 @@ public class WailaRegistrar
         registrar.registerBodyProvider(new SearedTankDataProvider(), LavaTankBlock.class);
         registrar.registerBodyProvider(new CastingChannelDataProvider(), CastingChannelLogic.class);
         //registrar.registerBodyProvider(new EssenceExtractorDataProvider(), EssenceExtractor.class);
+
+        // Casting systems
         registrar.registerBodyProvider(new BasinDataProvider(), CastingBasinLogic.class);
+        registrar.registerBodyProvider(new TableDataProvider(), CastingTableLogic.class);
 
         // Smeltery
         registrar.registerBodyProvider(new SmelteryDataProvider(), SmelteryBlock.class);