diff --git a/Notification/packages.config b/Notification/packages.config
index 6004e3e8..298c42d8 100644
--- a/Notification/packages.config
+++ b/Notification/packages.config
@@ -24,6 +24,7 @@
   <package id="Microsoft.AspNet.WebPages.WebData" version="3.2.3" targetFramework="net451" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net451" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net451" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net451" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net451" />
   <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net451" />
diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js
new file mode 100644
index 00000000..7d75e25b
--- /dev/null
+++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.controller.js
@@ -0,0 +1,22 @@
+function modelsBuilderController($scope, umbRequestHelper, $log, $http, modelsBuilderResource) {
+
+    $scope.generate = function() {
+        $scope.generating = true;
+        umbRequestHelper.resourcePromise(
+                $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
+                'Failed to generate.')
+            .then(function (result) {
+                $scope.generating = false;
+            });
+    };
+
+    function init() {
+        modelsBuilderResource.getDashboard().then(function(result) {
+            $scope.dashboard = result;
+            $scope.ready = true;
+        });
+    }
+
+    init();
+}
+angular.module("umbraco").controller("Umbraco.Dashboard.ModelsBuilderController", modelsBuilderController);
\ No newline at end of file
diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm
new file mode 100644
index 00000000..7d1716cb
--- /dev/null
+++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.htm
@@ -0,0 +1,31 @@
+<div id="modelsBuilder" ng-controller="Umbraco.Dashboard.ModelsBuilderController">
+
+    <h3>Models Builder</h3>
+
+    <div ng-show="!ready">
+        Loading...
+    </div>
+
+    <div ng-show="ready">
+        <div ng-bind-html-unsafe="dashboard.text"></div>
+
+        <div ng-if="dashboard.outOfDateModels">
+            <p>Models are <strong>out-of-date</strong>.</p>
+        </div>
+
+        <div ng-if="dashboard.canGenerate">
+            <div ng-if="dashboard.generateCausesRestart">
+                <p style="color: red; font-weight: bold;">Generating models will restart the application.</p>
+            </div>
+            <div ng-show="!generating">
+                <button type="button" ng-click="generate()" class="btn btn-danger">
+                    <span>Generate models</span>
+                </button>
+            </div>
+            <div class="umb-loader-wrapper" ng-show="generating">
+                <div class="umb-loader"></div>
+            </div>
+        </div>
+    </div>
+
+</div>
diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.resource.js b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.resource.js
new file mode 100644
index 00000000..58ca77cb
--- /dev/null
+++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/modelsbuilder.resource.js
@@ -0,0 +1,23 @@
+function modelsBuilderResource($q, $http, umbRequestHelper) {
+
+    return {
+        getModelsOutOfDateStatus: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetModelsOutOfDateStatus")),
+                "Failed to get models out-of-date status");
+        },
+
+        buildModels: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
+                "Failed to build models");
+        },
+
+        getDashboard: function () {
+            return umbRequestHelper.resourcePromise(
+                $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")),
+                "Failed to get dashboard");
+        }
+    };
+}
+angular.module("umbraco.resources").factory("modelsBuilderResource", modelsBuilderResource);
diff --git a/OurUmbraco.Site/App_Plugins/ModelsBuilder/package.manifest b/OurUmbraco.Site/App_Plugins/ModelsBuilder/package.manifest
new file mode 100644
index 00000000..d8352351
--- /dev/null
+++ b/OurUmbraco.Site/App_Plugins/ModelsBuilder/package.manifest
@@ -0,0 +1,7 @@
+{
+    //array of files we want to inject into the application on app_start
+    javascript: [
+        '~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js',
+		'~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js'
+    ]
+}
\ No newline at end of file
diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj
index 0eb6027b..137f3e2d 100644
--- a/OurUmbraco.Site/OurUmbraco.Site.csproj
+++ b/OurUmbraco.Site/OurUmbraco.Site.csproj
@@ -136,6 +136,14 @@
       <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -193,6 +201,10 @@
       <HintPath>..\packages\UmbracoCms.Core.7.4.0-RC1\lib\SQLCE4Umbraco.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.7.4.0-RC1\lib\System.Data.SqlServerCe.dll</HintPath>
@@ -216,6 +228,10 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Reflection.Metadata, Version=1.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -286,6 +302,10 @@
       <HintPath>..\packages\UmbracoCms.Core.7.4.0-RC1\lib\umbraco.MacroEngines.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.0.80, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.0-RC1\lib\Umbraco.ModelsBuilder.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="umbraco.providers, Version=1.0.5878.33807, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\UmbracoCms.Core.7.4.0-RC1\lib\umbraco.providers.dll</HintPath>
       <Private>True</Private>
@@ -330,6 +350,9 @@
     <Content Include="App_Browsers\w3cvalidator.browser" />
     <Content Include="App_Data\access.xml" />
     <Content Include="App_Data\YouTrack\dummy.txt" />
+    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.controller.js" />
+    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.htm" />
+    <Content Include="App_Plugins\ModelsBuilder\modelsbuilder.resource.js" />
     <Content Include="Assets\css\fonts\icomoon\icomoon.svg" />
     <Content Include="Assets\css\style.min.css" />
     <Content Include="Assets\images\app-icons\acme-tile-large.png" />
@@ -643,6 +666,7 @@
     <Content Include="scripts\forum\select2\select2-new.js" />
     <Content Include="scripts\forum\tags.js" />
     <Content Include="config\IISRewriteMaps.config" />
+    <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
     <None Include="scripts\jquery-1.4.1-vsdoc.js" />
     <Content Include="scripts\jquery-1.4.1.js" />
     <Content Include="scripts\jquery-1.4.1.min.js" />
@@ -4565,7 +4589,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\migrations\" />
-    <Folder Include="App_Plugins\" />
     <Folder Include="css\img\Cached\" />
     <Folder Include="umbraco\dashboard\air\" />
     <Folder Include="umbraco\dashboard\swfs\" />
@@ -4574,6 +4597,10 @@
     <Folder Include="umbraco\Views\directives\" />
     <Folder Include="usercontrols\Deli\Admin\" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/OurUmbraco.Site/config/Dashboard.config b/OurUmbraco.Site/config/Dashboard.config
index 2441de12..40ecaf6d 100644
--- a/OurUmbraco.Site/config/Dashboard.config
+++ b/OurUmbraco.Site/config/Dashboard.config
@@ -106,4 +106,14 @@
       </control>
     </tab>
   </section>
+  <section alias="UmbracoModelsBuilder">
+    <areas>
+      <area>developer</area>
+    </areas>
+    <tab caption="Models Builder">
+      <control>
+        /App_Plugins/ModelsBuilder/modelsbuilder.htm
+      </control>
+    </tab>
+  </section>
 </dashBoard>
\ No newline at end of file
diff --git a/OurUmbraco.Site/packages.config b/OurUmbraco.Site/packages.config
index 389aca01..2de40636 100644
--- a/OurUmbraco.Site/packages.config
+++ b/OurUmbraco.Site/packages.config
@@ -32,6 +32,9 @@
   <package id="Microsoft.AspNet.WebPages.WebData" version="3.2.3" targetFramework="net451" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net451" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net451" />
   <package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.20710.0" targetFramework="net451" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net451" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net451" />
@@ -47,6 +50,9 @@
   <package id="RestSharp" version="104.1" targetFramework="net4" />
   <package id="semver" version="1.1.2" targetFramework="net451" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net451" />
+  <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net451" />
+  <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net451" />
+  <package id="Umbraco.ModelsBuilder" version="3.0.0-RC1" targetFramework="net451" />
   <package id="UmbracoCms.Core" version="7.4.0-RC1" targetFramework="net451" />
   <package id="UrlRewritingNet" version="2.0.7" targetFramework="net451" />
   <package id="UrlTracker" version="3.8" targetFramework="net451" />