diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java
new file mode 100644
index 00000000..f919afe7
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java
@@ -0,0 +1,321 @@
+package tconstruct.plugins.nei;
+
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.nei.FastTransferManager;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.api.IOverlayHandler;
+import codechicken.nei.recipe.IRecipeHandler;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import java.util.*;
+
+import tconstruct.tools.gui.CraftingStationGui;
+
+/**
+ * Modified copy of DefaultOverlayHandler from NotEnoughItems
+ */
+public class CraftingStationOverlayHandler implements IOverlayHandler
+{
+    public static class DistributedIngred
+    {
+        public DistributedIngred(ItemStack item)
+        {
+            stack = InventoryUtils.copyStack(item, 1);
+        }
+        
+        public ItemStack stack;
+        public int invAmount;
+        public int distributed;
+        public int numSlots;
+        public int recipeAmount;
+    }
+    
+    public static class IngredientDistribution
+    {
+        public IngredientDistribution(DistributedIngred distrib, ItemStack permutation)
+        {
+            this.distrib = distrib;
+            this.permutation = permutation;
+        }
+        
+        public DistributedIngred distrib;
+        public ItemStack permutation;
+        public Slot[] slots;
+    }
+    
+    @Override
+    public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeIndex, boolean shift)
+    {
+        List<PositionedStack> ingredients = recipe.getIngredientStacks(recipeIndex);
+        List<DistributedIngred> ingredStacks = getPermutationIngredients(ingredients);
+
+        if(!clearIngredients(gui, ingredients))
+            return;
+        
+        findInventoryQuantities(gui, ingredStacks);
+        
+        List<IngredientDistribution> assignedIngredients = assignIngredients(ingredients, ingredStacks);
+        if(assignedIngredients == null)
+            return;
+        
+        assignIngredSlots(gui, ingredients, assignedIngredients);
+        int quantity = calculateRecipeQuantity(assignedIngredients);
+        
+        if(quantity != 0)
+            moveIngredients(gui, assignedIngredients, quantity);             
+    }
+    
+    @SuppressWarnings("unchecked")
+    private boolean clearIngredients(GuiContainer gui, List<PositionedStack> ingreds) {
+        int offsetx = getOffsetX(gui);
+        int offsety = getOffsetY(gui);
+        for(PositionedStack pstack : ingreds)
+            for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)
+                if(slot.xDisplayPosition == pstack.relx+offsetx && slot.yDisplayPosition == pstack.rely+offsety) {
+                    if(!slot.getHasStack())
+                        continue;
+                    
+                    FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1);
+                    if(slot.getHasStack())
+                        return false;
+                }
+        
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    private void moveIngredients(GuiContainer gui, List<IngredientDistribution> assignedIngredients, int quantity)
+    {        
+        for(IngredientDistribution distrib : assignedIngredients)
+        {
+            ItemStack pstack = distrib.permutation;
+            int transferCap = quantity*pstack.stackSize;
+            int transferred = 0;
+            
+            int destSlotIndex = 0;
+            Slot dest = distrib.slots[0];
+            int slotTransferred = 0;
+            int slotTransferCap = pstack.getMaxStackSize();
+            
+            for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)
+            {
+                if(!slot.getHasStack() || !canMoveFrom(slot, gui))
+                    continue;
+                
+                ItemStack stack = slot.getStack();
+                if(!InventoryUtils.canStack(stack, pstack))
+                    continue;
+                
+                FastTransferManager.clickSlot(gui, slot.slotNumber);
+                int amount = Math.min(transferCap-transferred, stack.stackSize);
+                for(int c = 0; c < amount; c++)
+                {
+                    FastTransferManager.clickSlot(gui, dest.slotNumber, 1);
+                    transferred++;
+                    slotTransferred++;
+                    if(slotTransferred >= slotTransferCap)
+                    {
+                        destSlotIndex++;
+                        if(destSlotIndex == distrib.slots.length)
+                        {
+                            dest = null;
+                            break;
+                        }
+                        dest = distrib.slots[destSlotIndex];
+                        slotTransferred = 0;
+                    }
+                }
+                FastTransferManager.clickSlot(gui, slot.slotNumber);
+                if(transferred >= transferCap || dest == null)
+                    break;
+            }
+        }       
+    }
+
+    private int calculateRecipeQuantity(List<IngredientDistribution> assignedIngredients)
+    {
+        int quantity = Integer.MAX_VALUE;
+        for(IngredientDistribution distrib : assignedIngredients)
+        {
+            DistributedIngred istack = distrib.distrib;
+            if(istack.numSlots == 0)
+                return 0;
+            
+            int allSlots = istack.invAmount;
+            if(allSlots/istack.numSlots > istack.stack.getMaxStackSize())
+                allSlots = istack.numSlots*istack.stack.getMaxStackSize();
+            
+            quantity = Math.min(quantity, allSlots/istack.distributed);
+        }
+        
+        return quantity;
+    }
+
+    private Slot[][] assignIngredSlots(GuiContainer gui, List<PositionedStack> ingredients, List<IngredientDistribution> assignedIngredients)
+    {
+        Slot[][] recipeSlots = mapIngredSlots(gui, ingredients);//setup the slot map
+        
+        HashMap<Slot, Integer> distribution = new HashMap<Slot, Integer>();
+        for(int i = 0; i < recipeSlots.length; i++)
+            for(Slot slot : recipeSlots[i])
+                if(!distribution.containsKey(slot))
+                    distribution.put(slot, -1);
+        
+        HashSet<Slot> avaliableSlots = new HashSet<Slot>(distribution.keySet());
+        HashSet<Integer> remainingIngreds = new HashSet<Integer>();
+        ArrayList<LinkedList<Slot>> assignedSlots = new ArrayList<LinkedList<Slot>>();
+        for(int i = 0; i < ingredients.size(); i++)
+        {
+            remainingIngreds.add(i);
+            assignedSlots.add(new LinkedList<Slot>());
+        }
+                
+        while(avaliableSlots.size() > 0 && remainingIngreds.size() > 0)
+        {
+            for(Iterator<Integer> iterator = remainingIngreds.iterator(); iterator.hasNext();)
+            {
+                int i = iterator.next();
+                boolean assigned = false;
+                DistributedIngred istack = assignedIngredients.get(i).distrib;
+                
+                for(Slot slot : recipeSlots[i])
+                {
+                    if(avaliableSlots.contains(slot))
+                    {
+                        avaliableSlots.remove(slot);
+                        if(slot.getHasStack())
+                            continue;
+                        
+                        istack.numSlots++;
+                        assignedSlots.get(i).add(slot);
+                        assigned = true;
+                        break;
+                    }
+                }
+                
+                if(!assigned || istack.numSlots*istack.stack.getMaxStackSize() >= istack.invAmount)
+                    iterator.remove();
+            }
+        }
+        
+        for(int i = 0; i < ingredients.size(); i++)
+            assignedIngredients.get(i).slots = assignedSlots.get(i).toArray(new Slot[0]);
+        return recipeSlots;
+    }
+
+    private List<IngredientDistribution> assignIngredients(List<PositionedStack> ingredients, List<DistributedIngred> ingredStacks)
+    {
+        ArrayList<IngredientDistribution> assignedIngredients = new ArrayList<IngredientDistribution>();
+        for(PositionedStack posstack : ingredients)//assign what we need and have
+        {
+            DistributedIngred biggestIngred = null;
+            ItemStack permutation = null;
+            int biggestSize = 0;
+            for(ItemStack pstack : posstack.items)
+            {
+                for(int j = 0; j < ingredStacks.size(); j++)
+                {
+                    DistributedIngred istack = ingredStacks.get(j);
+                    if(!InventoryUtils.canStack(pstack, istack.stack) || istack.invAmount-istack.distributed < pstack.stackSize)
+                        continue;
+                    
+                    int relsize = (istack.invAmount-istack.invAmount/istack.recipeAmount*istack.distributed)/pstack.stackSize;
+                    if(relsize > biggestSize)
+                    {
+                        biggestSize = relsize;
+                        biggestIngred = istack;
+                        permutation = pstack;
+                        break;
+                    }
+                }
+            }
+            
+            if(biggestIngred == null)//not enough ingreds
+                return null;
+
+            biggestIngred.distributed+=permutation.stackSize;
+            assignedIngredients.add(new IngredientDistribution(biggestIngred, permutation));
+        }
+        
+        return assignedIngredients;
+    }
+
+    @SuppressWarnings("unchecked")
+    private void findInventoryQuantities(GuiContainer gui, List<DistributedIngred> ingredStacks)
+    {
+        for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)//work out how much we have to go round
+        {
+            if(slot.getHasStack() && canMoveFrom(slot, gui))
+            {
+                ItemStack pstack = slot.getStack();
+                DistributedIngred istack = findIngred(ingredStacks, pstack);
+                if(istack != null)
+                    istack.invAmount+=pstack.stackSize;
+            }
+        }
+    }
+
+    private List<DistributedIngred> getPermutationIngredients(List<PositionedStack> ingredients)
+    {
+        ArrayList<DistributedIngred> ingredStacks = new ArrayList<DistributedIngred>();
+        for(PositionedStack posstack : ingredients)//work out what we need
+        {
+            for(ItemStack pstack : posstack.items)
+            {
+                DistributedIngred istack = findIngred(ingredStacks, pstack);
+                if(istack == null)
+                    ingredStacks.add(istack = new DistributedIngred(pstack));
+                istack.recipeAmount+=pstack.stackSize;
+            }
+        }
+        return ingredStacks;
+    }
+
+    public boolean canMoveFrom(Slot slot, GuiContainer gui) {
+        return slot.inventory instanceof InventoryPlayer;
+    }
+
+    @SuppressWarnings("unchecked")
+    public Slot[][] mapIngredSlots(GuiContainer gui, List<PositionedStack> ingredients)
+    {
+        int offsetx = getOffsetX(gui);
+        int offsety = getOffsetY(gui);
+        Slot[][] recipeSlotList = new Slot[ingredients.size()][];
+        for(int i = 0; i < ingredients.size(); i++)//identify slots
+        {
+            LinkedList<Slot> recipeSlots = new LinkedList<Slot>();
+            PositionedStack pstack = ingredients.get(i);
+            for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)
+            {
+                if(slot.xDisplayPosition == pstack.relx+offsetx && slot.yDisplayPosition == pstack.rely+offsety)
+                {
+                    recipeSlots.add(slot);
+                    break;
+                }
+            }
+            recipeSlotList[i] = recipeSlots.toArray(new Slot[0]);
+        }
+        return recipeSlotList;
+    }
+
+    public DistributedIngred findIngred(List<DistributedIngred> ingredStacks, ItemStack pstack)
+    {
+        for(DistributedIngred istack : ingredStacks)
+            if(InventoryUtils.canStack(pstack, istack.stack))
+                return istack;
+        return null;
+    }
+    
+    private int getOffsetX(GuiContainer gui)
+    {
+        return ((CraftingStationGui) gui).hasChest() ? 5 + CraftingStationGui.CHEST_WIDTH : 5;
+    }
+    
+    private int getOffsetY(GuiContainer gui)
+    {
+        return 11;
+    }
+}
diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java
new file mode 100644
index 00000000..d0d31ddc
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java
@@ -0,0 +1,44 @@
+package tconstruct.plugins.nei;
+
+import java.util.ArrayList;
+
+import tconstruct.TConstruct;
+import tconstruct.tools.gui.CraftingStationGui;
+import net.minecraft.client.Minecraft;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.api.IStackPositioner;
+import codechicken.nei.recipe.GuiRecipe;
+
+public class CraftingStationStackPositioner implements IStackPositioner
+{
+
+    @Override
+    public ArrayList<PositionedStack> positionStacks (ArrayList<PositionedStack> stacks)
+    {
+
+        if (Minecraft.getMinecraft().currentScreen instanceof GuiRecipe)
+        {
+            GuiRecipe recipeGui = (GuiRecipe) Minecraft.getMinecraft().currentScreen;
+
+            if (!(recipeGui.firstGui instanceof CraftingStationGui))
+            {
+                TConstruct.logger.warn("No CraftingStationGui found!");
+                return stacks;
+            }
+
+            CraftingStationGui gui = (CraftingStationGui) recipeGui.firstGui;
+
+            int offsetX = gui.hasChest() ? 5 + CraftingStationGui.CHEST_WIDTH : 5;
+            int offsetY = 11;
+
+            for (PositionedStack stack : stacks)
+            {
+                stack.relx += offsetX;
+                stack.rely += offsetY;
+            }
+        }
+
+        return stacks;
+    }
+
+}
diff --git a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java
index ee869255..a9499af6 100644
--- a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java
+++ b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java
@@ -3,7 +3,6 @@ package tconstruct.plugins.nei;
 import tconstruct.tools.gui.CraftingStationGui;
 import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
-import codechicken.nei.recipe.DefaultOverlayHandler;
 
 public class NEITConstructConfig implements IConfigureNEI
 {
@@ -11,8 +10,8 @@ public class NEITConstructConfig implements IConfigureNEI
     @Override
     public void loadConfig ()
     {
-        API.registerGuiOverlay(CraftingStationGui.class, "crafting");
-        API.registerGuiOverlayHandler(CraftingStationGui.class, new DefaultOverlayHandler(), "crafting");
+        API.registerGuiOverlay(CraftingStationGui.class, "crafting", new CraftingStationStackPositioner());
+        API.registerGuiOverlayHandler(CraftingStationGui.class, new CraftingStationOverlayHandler(), "crafting");
 
         registerHandler(new RecipeHandlerDryingRack());
         registerHandler(new RecipeHandlerToolMaterials());
diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java
index 227bf3b1..e75ae7a8 100644
--- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java
+++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java
@@ -43,6 +43,8 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler
     ToolMaterial materialEnum;
     String centerTitle;
     NBTTagCompound tags;
+    
+    public static final int CHEST_WIDTH = 116;
 
     // Panel positions
 
@@ -91,8 +93,8 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler
 
         if (logic.chest != null)
         {
-            this.xSize += 116;
-            this.guiLeft -= 116;
+            this.xSize += CHEST_WIDTH;
+            this.guiLeft -= CHEST_WIDTH;
             this.chestLeft = this.guiLeft;
             this.chestTop = this.craftingTop;
             if (logic.doubleChest != null)
@@ -645,5 +647,10 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler
 
         return true;
     }
+    
+    public boolean hasChest()
+    {
+        return logic.chest != null;
+    }
 
 }