diff --git a/js/cam/Assembler.js b/js/cam/Assembler.js
index eb0d2e784da7937043e0f130cba89986f191568e..e91e14ea8db14488322ed8f4f199ef20311c10c4 100644
--- a/js/cam/Assembler.js
+++ b/js/cam/Assembler.js
@@ -7,6 +7,7 @@ Assembler = Backbone.Model.extend({
     defaults: {
         camStrategy: "xRaster",
         camProcess: "shopbot",
+        machine: "shopbot",
         exporter: null,
         dataOut: "",
         needsPostProcessing: true,
diff --git a/js/menus/AssemblerMenuView.js b/js/menus/AssemblerMenuView.js
index a56c4e1e7a6e5967794d81b41f2bee392c5bbe4d..21b7330b35fc4be7cb69b1b53b1c3785486fee93 100644
--- a/js/menus/AssemblerMenuView.js
+++ b/js/menus/AssemblerMenuView.js
@@ -8,7 +8,8 @@ AssemblerMenuView = Backbone.View.extend({
     el: "#menuContent",
 
     events: {
-        "click .camStrategy":                            "_selectCamStrategy"
+        "click .camStrategy":                            "_selectCamStrategy",
+        "click .machineType":                            "_selectMachine"
     },
 
     initialize: function(options){
@@ -24,12 +25,26 @@ AssemblerMenuView = Backbone.View.extend({
         this.assembler.set("camStrategy", $(e.target).data("type"));
     },
 
+    _selectMachine: function(e){
+        e.preventDefault();
+        this.assembler.set("machine", $(e.target).data("type"));
+    },
+
     render: function(){
         if (this.model.get("currentTab") != "assembler") return;
         this.$el.html(this.template(_.extend(this.model.toJSON(), this.assembler.toJSON())));
     },
 
     template: _.template('\
+        Machine:   \
+            <div class="btn-group">\
+                <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allMachineTypes[machine] %><span class="caret"></span></button>\
+                <ul role="menu" class="dropdown-menu">\
+                    <% _.each(_.keys(allMachineTypes), function(key){ %>\
+                        <li><a class="machineType" data-type="<%= key %>" href="#"><%= allMachineTypes[key] %></a></li>\
+                    <% }); %>\
+                </ul>\
+            </div><br/><br/>\
         Strategy: &nbsp;&nbsp;\
             <div class="btn-group">\
                 <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allAssemblyStrategies[camStrategy] %><span class="caret"></span></button>\
diff --git a/js/models/AppState.js b/js/models/AppState.js
index f29aa16f3ff84ef64860d22515b4768fd646bc37..80bbdfe9d65d363ff5b1578031d7f63010195f7a 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -95,7 +95,8 @@ AppState = Backbone.Model.extend({
         },
 
         allMachineTypes:{
-            shopbot: "Shopbot"
+            shopbot: "Shopbot",
+            oneBit: "One Bit Bot"
         },
 //        allAssemblyStrategies:{
 //            octa:{