diff --git a/src/client/models/crafting/simple_inventory.coffee b/src/client/models/crafting/simple_inventory.coffee
index 240134654..052c85b8a 100644
--- a/src/client/models/crafting/simple_inventory.coffee
+++ b/src/client/models/crafting/simple_inventory.coffee
@@ -79,7 +79,7 @@ module.exports = class SimpleInventory
 
             if qualifiedSlug?
                 newSlugs.push qualifiedSlug
-                newStacks.push new Stack itemSlug:qualifiedSlug, quantity:stack.quantity
+                newStacks.push new SimpleStack itemSlug:qualifiedSlug, quantity:stack.quantity
             else
                 newSlugs.push itemSlug
                 newStacks.push stack
diff --git a/src/client/site/craft_page/step/step.jade b/src/client/site/craft_page/step/step.jade
index 9c15b014e..eb1e3806d 100644
--- a/src/client/site/craft_page/step/step.jade
+++ b/src/client/site/craft_page/step/step.jade
@@ -11,5 +11,5 @@
         .view__inventory
         .view__recipe
     .buttons
+        a.button.tool: .bezel: p show plan for tools
         .button.complete: .bezel: p complete step
-        .button.tool: .bezel: p make this tool
diff --git a/src/client/site/craft_page/step/step_controller.coffee b/src/client/site/craft_page/step/step_controller.coffee
index 899265683..c2215fea0 100644
--- a/src/client/site/craft_page/step/step_controller.coffee
+++ b/src/client/site/craft_page/step/step_controller.coffee
@@ -8,6 +8,7 @@
 BaseController      = require '../../base_controller'
 InventoryController = require '../../common/inventory/inventory_controller'
 RecipeController    = require '../../common/recipe/recipe_controller'
+SimpleInventory     = require '../../../models/crafting/simple_inventory'
 
 ########################################################################################################################
 
@@ -42,10 +43,6 @@ module.exports = class StepController extends BaseController
         return if @$completeButton.hasClass 'disabled'
         @onComplete this
 
-    onToolButtonClicked: (event)->
-        return if @$toolButton.hasClass 'disabled'
-        @onAddTools this
-
     # BaseController Overrides #####################################################################
 
     onDidRender: ->
@@ -93,11 +90,18 @@ module.exports = class StepController extends BaseController
     events: ->
         return _.extend super,
             'click .button.complete': 'onCompleteButtonClicked'
-            'click .button.tool':     'onToolButtonClicked'
 
     # Private Methods ##############################################################################
 
     _refreshToolButton: ->
+        inventory = new SimpleInventory {}, modPack:@_modPack
+        for toolStack in @model.recipe.tools
+            inventory.add toolStack.itemSlug, toolStack.quantity
+        inventory.localize()
+
+        @$toolButton.attr 'href', "/craft/#{inventory.unparse()}"
+        @$toolButton.attr 'target', 'new'
+
         if @canAddTools this
             @$toolButton.removeClass 'disabled'
         else