diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/models.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/models.resource.js
new file mode 100644
index 0000000000..fb3cb0f68c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/models.resource.js
@@ -0,0 +1,25 @@
+function modelsResource($q, $http, umbRequestHelper) {
+
+    // fixme - should use BackOfficeController to register urls? How can we extend it?
+
+    return {
+        getModelsOutOfDateStatus: function() {
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    /*umbRequestHelper.getApiUrl(
+                        "modelsApiBaseUrl",
+                        "GetModelsOutOfDateStatus")*/ "/Umbraco/BackOffice/Zbu/ModelsBuilderApi/GetModelsOutOfDateStatus"),
+                "Failed to get models out-of-date status");
+        },
+
+        buildModels: function() {
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    /*umbRequestHelper.getApiUrl(
+                        "modelsApiBaseUrl",
+                        "BuildModels")*/ "/Umbraco/BackOffice/Zbu/ModelsBuilderApi/BuildModels"),
+                "Failed to build models");
+        }
+    };
+}
+angular.module("umbraco.resources").factory("modelsResource", modelsResource);
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index 64157d3183..5c5654bb88 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -9,7 +9,7 @@
 (function() {
 	"use strict";
 
-	function DocumentTypesEditController($scope, $routeParams, contentTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter) {
+	function DocumentTypesEditController($scope, $routeParams, modelsResource, contentTypeResource, dataTypeResource, editorState, contentEditingHelper, formHelper, navigationService, iconHelper, contentTypeHelper, notificationsService, $filter) {
 
 		var vm = this;
 
@@ -17,6 +17,7 @@
 
 		vm.currentNode = null;
 		vm.contentType = {};
+
 		vm.page = {};
 		vm.page.loading = false;
 		vm.page.saveButtonState = "init";
@@ -44,6 +45,51 @@
 			}
 		];
 
+
+        
+        //disable by default, turn on if detected correctly.
+		vm.page.modelsBuilder = false;
+		modelsResource.getModelsOutOfDateStatus().then(function () {
+		    vm.page.modelsBuilder = true;
+		});
+
+	    //Models builder mode:
+
+		vm.page.defaultButton = {
+			hotKey: "ctrl+s",
+			labelKey: "buttons_save",
+			letter: "S",
+			type: "submit",
+			handler: function () { vm.save(); }
+		};
+		vm.page.subButtons = [{
+			hotKey: "ctrl+g",
+			labelKey: "buttons_generateModels",
+			letter: "G",
+			handler: function(){
+
+				vm.page.saveButtonState = "busy";
+				notificationsService.info("Building models", "this can take abit of time, don't worry");
+				
+				modelsResource.buildModels().then(function(){
+					vm.page.saveButtonState = "init";
+
+					//clear and add success
+					notificationsService.success("Models Generated");
+
+					//just calling this to get the servar back to life
+					modelsResource.getModelsOutOfDateStatus();
+
+				}, function(){
+                    notificationsService.error("Models could not be generated");
+                    vm.page.saveButtonState = "error";
+				});
+
+			}
+		}];
+
+
+
 		vm.page.keyboardShortcutsOverview = [
 			{
 				"name": "Sections",
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
index 3a475fa959..c1dd63910b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
@@ -6,6 +6,7 @@
           ng-show="!vm.page.loading"
           ng-submit="vm.save()"
           val-form-manager>
+
         <umb-editor-view>
 
             <umb-editor-header
@@ -34,14 +35,25 @@
 
                <umb-editor-footer-content-right>
 
-                  <umb-button
-                     type="submit"
-                     state="vm.page.saveButtonState"
-                     button-style="success"
-                     shortcut="ctrl+s"
-                     label="Save"
-                     label-key="buttons_save">
-                  </umb-button>
+                <umb-button 
+                            ng-if="!vm.page.modelsBuilder"
+                            type="submit"
+                            state="vm.page.saveButtonState"
+                            button-style="success"
+                            shortcut="ctrl+s"
+                            label="Save"
+                            label-key="buttons_save">
+                </umb-button>
+                       
+                <umb-button-group
+                      ng-if="vm.page.modelsBuilder"              
+                      default-button="vm.page.defaultButton"
+                      sub-buttons="vm.page.subButtons"
+                      state="vm.page.saveButtonState"
+                      direction="up"
+                      float="right">
+                </umb-button-group>
+
 
                </umb-editor-footer-content-right>
 
diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config
index c189e7dd93..fe293e7dfd 100644
--- a/src/Umbraco.Web.UI/Views/Web.config
+++ b/src/Umbraco.Web.UI/Views/Web.config
@@ -22,6 +22,8 @@
         <add namespace="Umbraco.Web.Mvc" />
         <add namespace="umbraco" />
         <add namespace="Examine" />
+        <add namespace="Umbraco.Web.PublishedContentModels"/>
+        
       </namespaces>
     </pages>
   </system.web.webPages.razor>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 7a93e71098..20ba032010 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -89,6 +89,7 @@
     <key alias="styleChoose">Vælg formattering</key>
     <key alias="styleShow">Vis koder</key>
     <key alias="tableInsert">Indsæt tabel</key>
+    <key alias="generateModels">Generer modeller</key>
   </area>
   <area alias="changeDocType">
     <key alias="changeDocTypeInstruction">For at skifte det valgte indholds dokumenttype, skal du først vælge en ny dokumenttype, som er gyldig på denne placering.</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index dc93dd2fc0..b1a2821ca5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -94,6 +94,7 @@
     <key alias="styleChoose">Choose style</key>
     <key alias="styleShow">Show styles</key>
     <key alias="tableInsert">Insert table</key>
+    <key alias="generateModels">Generate models</key>
   </area>
   <area alias="changeDocType">
     <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index dfbf72173e..997edcc123 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -62,6 +62,8 @@
     <add key="autoFormsAuthentication" value="false" />
     <add key="log4net.Config" value="config\log4net.config" />
     <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Transform="InsertIfMissing" xdt:Locator="Match(key)"  />
+
+    <add key="Zbu.ModelsBuilder.EnableDllModels" value="true" />
   </appSettings>
 
   <connectionStrings xdt:Transform="Remove" xdt:Locator="Condition(@configSource != '')" />
@@ -97,6 +99,7 @@
       <assemblies>
         <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="Insert" />
         <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="Insert" />
+        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"  xdt:Locator="Match(assembly)" xdt:Transform="Insert" />
       </assemblies>
     </compilation>
     <!-- We no longer support medium trust so just remove it -->
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 924a5436f8..49174edf01 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -121,6 +121,7 @@
         <remove assembly="System.Net.Http" />	  
         <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
         <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
       </assemblies>
       <buildProviders>
         <add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />