diff --git a/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java
index d5b53e90..304af551 100644
--- a/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java
+++ b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java
@@ -1,5 +1,6 @@
 package com.glodblock.github.coremod;
 
+import com.glodblock.github.coremod.transform.ContainerInterfaceTerminalTransformer;
 import com.glodblock.github.coremod.transform.CraftingCpuTransformer;
 import com.glodblock.github.coremod.transform.CraftingTreeNodeTransformer;
 import com.glodblock.github.coremod.transform.DualityInterfaceTransformer;
@@ -23,9 +24,9 @@ public class FCClassTransformer implements IClassTransformer {
             case "appeng.helpers.DualityInterface":
                 tform = DualityInterfaceTransformer.INSTANCE;
                 break;
-            /*case "appeng.container.implementations.ContainerInterfaceTerminal":
+            case "appeng.container.implementations.ContainerInterfaceTerminal":
                 tform = ContainerInterfaceTerminalTransformer.INSTANCE;
-                break;*/ //To-Do
+                break;
             default:
                 return code;
         }
diff --git a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java
index 86ee63a6..5b777cd4 100644
--- a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java
+++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java
@@ -1,13 +1,18 @@
 package com.glodblock.github.coremod.hooker;
 
+import appeng.api.networking.IGrid;
+import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.IMachineSet;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.me.MachineSet;
+import appeng.parts.misc.PartInterface;
 import appeng.tile.misc.TileInterface;
 import appeng.util.InventoryAdaptor;
 import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidPacket;
+import com.glodblock.github.common.parts.PartFluidInterface;
+import com.glodblock.github.common.tile.TileFluidInterface;
 import com.glodblock.github.inventory.FluidConvertingInventoryAdaptor;
 import com.glodblock.github.inventory.FluidConvertingInventoryCrafting;
 import com.glodblock.github.loader.ItemAndBlockHolder;
@@ -58,15 +63,15 @@ public class CoreModHooks {
         return stacks;
     }
 
-    /*public static IMachineSet getMachines(IGrid grid, Class<? extends IGridHost> c) {
+    public static IMachineSet getMachines(IGrid grid, Class<? extends IGridHost> c) {
         if (c == TileInterface.class) {
-            return unionMachineSets(grid.getMachines(c), grid.getMachines(TileDualInterface.class));
+            return unionMachineSets(grid.getMachines(c), grid.getMachines(TileFluidInterface.class));
         } else if (c == PartInterface.class) {
-            return unionMachineSets(grid.getMachines(c), grid.getMachines(PartDualInterface.class));
+            return unionMachineSets(grid.getMachines(c), grid.getMachines(PartFluidInterface.class));
         } else {
             return grid.getMachines(c);
         }
-    }*/ //unfinished
+    }
 
     private static IMachineSet unionMachineSets(IMachineSet a, IMachineSet b) {
         if (a.isEmpty()) {
diff --git a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java
index a3cb37da..275f6374 100644
--- a/src/main/java/com/glodblock/github/util/FluidPatternDetails.java
+++ b/src/main/java/com/glodblock/github/util/FluidPatternDetails.java
@@ -158,6 +158,9 @@ public class FluidPatternDetails implements ICraftingPatternDetails, Comparable<
         NBTTagCompound tag = new NBTTagCompound();
         tag.setTag("Inputs", writeStackArray(checkInitialized(inputs)));
         tag.setTag("Outputs", writeStackArray(checkInitialized(outputs)));
+        //Shits
+        tag.setTag("in", writeStackArray(checkInitialized(inputs)));
+        tag.setTag("out", writeStackArray(checkInitialized(outputs)));
         patternStack.setTagCompound(tag);
         patternStackAe = Objects.requireNonNull(AEItemStack.create(patternStack));
         return patternStack;