diff --git a/.gitignore b/.gitignore
index 416af4d..608f244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ _ReSharper*
 TestResults
 connectionStrings.config
 rh.exe
-dev_*
\ No newline at end of file
+dev_*
+.vs
\ No newline at end of file
diff --git a/SchoStack.Example/App_Start/StructuremapMvc.cs b/SchoStack.Example/App_Start/StructuremapMvc.cs
new file mode 100644
index 0000000..aa499c0
--- /dev/null
+++ b/SchoStack.Example/App_Start/StructuremapMvc.cs
@@ -0,0 +1,13 @@
+using System.Web.Mvc;
+using StructureMap;
+
+[assembly: WebActivator.PreApplicationStartMethod(typeof(SchoStack.Example.App_Start.StructuremapMvc), "Start")]
+
+namespace SchoStack.Example.App_Start {
+    public static class StructuremapMvc {
+        public static void Start() {
+            var container = (IContainer) IoC.Initialize();
+            DependencyResolver.SetResolver(new SmDependencyResolver(container));
+        }
+    }
+}
\ No newline at end of file
diff --git a/SchoStack.Example/SchoStack.Example.csproj b/SchoStack.Example/SchoStack.Example.csproj
index 6cbb09e..ea23a0c 100644
--- a/SchoStack.Example/SchoStack.Example.csproj
+++ b/SchoStack.Example/SchoStack.Example.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SchoStack.Example</RootNamespace>
     <AssemblyName>SchoStack.Example</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>false</UseIISExpress>
     <FileUpgradeFlags>
@@ -30,6 +30,8 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
+    <TargetFrameworkProfile />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,6 +41,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -47,28 +50,34 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="FluentValidation, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll</HintPath>
     </Reference>
     <Reference Include="FluentValidation.Mvc, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentValidation.MVC3.5.0.0.3\lib\Net40\FluentValidation.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
     <Reference Include="StructureMap, Version=2.6.4.0, Culture=neutral, PublicKeyToken=e60ad81abae3c223, processorArchitecture=MSIL">
       <HintPath>..\packages\structuremap.2.6.4.1\lib\net40\StructureMap.dll</HintPath>
     </Reference>
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data.Entity" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -76,22 +85,29 @@
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Routing" />
+    <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
-    <Reference Include="WebActivator">
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="WebActivator, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\WebActivator.1.4.4\lib\net40\WebActivator.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="App_Start\StructuremapMvc.cs" />
     <Compile Include="Controllers\Form\Simple.cs" />
     <Compile Include="Controllers\Home\Index.cs" />
     <Compile Include="Controllers\Home\About.cs" />
@@ -197,9 +213,6 @@
   <ItemGroup>
     <Folder Include="Models\" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SchoStack.Web.FluentValidation\SchoStack.Web.FluentValidation.csproj">
       <Project>{487DA134-7D1C-4CB1-9914-020935393479}</Project>
@@ -221,6 +234,9 @@
     <Content Include="Controllers\Form\_Partial.cshtml" />
     <Content Include="Controllers\Home\Menu.cshtml" />
     <Content Include="Controllers\_ViewStart.cshtml" />
+    <Content Include="packages.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/SchoStack.Example/Web.config b/SchoStack.Example/Web.config
index 427169d..f924739 100644
--- a/SchoStack.Example/Web.config
+++ b/SchoStack.Example/Web.config
@@ -1,24 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=152368
   -->
-
 <configuration>
   <connectionStrings>
-    <add name="ApplicationServices"
-         connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true"
-         providerName="System.Data.SqlClient" />
+    <add name="ApplicationServices" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient" />
   </connectionStrings>
-
   <appSettings>
-    <add key="webpages:Version" value="1.0.0.0"/>
-    <add key="ClientValidationEnabled" value="true"/>
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+    <add key="webpages:Version" value="1.0.0.0" />
+    <add key="ClientValidationEnabled" value="true" />
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
   </appSettings>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
 
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.5.2" />
+      </system.Web>
+  -->
   <system.web>
-    <compilation debug="true" targetFramework="4.0">
+    <compilation debug="true" targetFramework="4.5.2">
       <assemblies>
         <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
         <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
@@ -27,59 +30,49 @@
         <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       </assemblies>
     </compilation>
-
     <authentication mode="Forms">
       <forms loginUrl="~/Account/LogOn" timeout="2880" />
     </authentication>
-
     <membership>
       <providers>
-        <clear/>
-        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices"
-             enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false"
-             maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10"
-             applicationName="/" />
+        <clear />
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
       </providers>
     </membership>
-
     <profile>
       <providers>
-        <clear/>
+        <clear />
         <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
       </providers>
     </profile>
-
     <roleManager enabled="false">
       <providers>
-        <clear/>
+        <clear />
         <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" />
         <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
       </providers>
     </roleManager>
-
-    <pages>
+    <pages controlRenderingCompatibilityVersion="4.0">
       <namespaces>
         <add namespace="System.Web.Helpers" />
         <add namespace="System.Web.Mvc" />
         <add namespace="System.Web.Mvc.Ajax" />
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.WebPages"/>
+        <add namespace="System.Web.WebPages" />
       </namespaces>
     </pages>
   </system.web>
-
   <system.webServer>
-    <validation validateIntegratedModeConfiguration="false"/>
-    <modules runAllManagedModulesForAllRequests="true"/>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules runAllManagedModulesForAllRequests="true" />
   </system.webServer>
-
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/SchoStack.Example/packages.config b/SchoStack.Example/packages.config
index c8cf73e..723cbd2 100644
--- a/SchoStack.Example/packages.config
+++ b/SchoStack.Example/packages.config
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentValidation" version="5.0.0.1" targetFramework="net40" />
-  <package id="FluentValidation.MVC3" version="5.0.0.3" targetFramework="net40" />
-  <package id="jQuery" version="1.7.2" targetFramework="net40" />
-  <package id="jQuery.UI.Combined" version="1.8.22" targetFramework="net40" />
-  <package id="jQuery.Validation" version="1.9" targetFramework="net40" />
-  <package id="jQuery.vsdoc" version="1.6" targetFramework="net40" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-  <package id="Modernizr" version="2.5.3" targetFramework="net40" />
-  <package id="structuremap" version="2.6.4.1" targetFramework="net40" />
-  <package id="StructureMap.MVC3" version="1.0.8" targetFramework="net40" />
-  <package id="WebActivator" version="1.4.4" targetFramework="net40" />
+  <package id="FluentValidation" version="5.0.0.1" targetFramework="net452" />
+  <package id="FluentValidation.MVC3" version="5.0.0.3" targetFramework="net452" />
+  <package id="jQuery" version="1.7.2" targetFramework="net452" />
+  <package id="jQuery.UI.Combined" version="1.8.22" targetFramework="net452" />
+  <package id="jQuery.Validation" version="1.9.0.1" targetFramework="net452" />
+  <package id="jQuery.vsdoc" version="1.6" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
+  <package id="Modernizr" version="2.5.3" targetFramework="net452" />
+  <package id="structuremap" version="2.6.4.1" targetFramework="net452" />
+  <package id="StructureMap.MVC3" version="1.0.8" targetFramework="net452" />
+  <package id="WebActivator" version="1.4.4" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/SchoStack.Tests/HtmlConventions/DataAnnotationConventionTests.cs b/SchoStack.Tests/HtmlConventions/DataAnnotationConventionTests.cs
index f272525..0a3797e 100644
--- a/SchoStack.Tests/HtmlConventions/DataAnnotationConventionTests.cs
+++ b/SchoStack.Tests/HtmlConventions/DataAnnotationConventionTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Linq.Expressions;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 using NUnit.Framework;
 using Promaster.Tests;
 using SchoStack.Web.Conventions;
diff --git a/SchoStack.Tests/HtmlConventions/DefaultHtmlConventionTests.cs b/SchoStack.Tests/HtmlConventions/DefaultHtmlConventionTests.cs
index 45aaccb..5a10594 100644
--- a/SchoStack.Tests/HtmlConventions/DefaultHtmlConventionTests.cs
+++ b/SchoStack.Tests/HtmlConventions/DefaultHtmlConventionTests.cs
@@ -7,7 +7,8 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 using System.Web.UI.HtmlControls;
-using FubuCore.Reflection;
+using Baseline;
+using Baseline.Reflection;
 using HtmlTags;
 using NUnit.Framework;
 using Promaster.Tests;
diff --git a/SchoStack.Tests/HtmlConventions/TestViewModel.cs b/SchoStack.Tests/HtmlConventions/TestViewModel.cs
index 8aefc0f..708e067 100644
--- a/SchoStack.Tests/HtmlConventions/TestViewModel.cs
+++ b/SchoStack.Tests/HtmlConventions/TestViewModel.cs
@@ -100,7 +100,7 @@ public class TestInputModel
         [DataType(DataType.Password)]
         public string Password { get; set; }
 
-        [Compare("Password", ErrorMessage = "The Error")]
+        [System.ComponentModel.DataAnnotations.Compare("Password", ErrorMessage = "The Error")]
         public string PasswordConfirm { get; set; }
 
         [DataType(DataType.Text)]
diff --git a/SchoStack.Tests/HtmlConventions/ValidationConventionTests.cs b/SchoStack.Tests/HtmlConventions/ValidationConventionTests.cs
index 54e7215..822e91f 100644
--- a/SchoStack.Tests/HtmlConventions/ValidationConventionTests.cs
+++ b/SchoStack.Tests/HtmlConventions/ValidationConventionTests.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
+using Baseline.Reflection;
 using FluentValidation;
-using FubuCore.Reflection;
 using Moq;
 using NUnit.Framework;
 using Promaster.Tests;
diff --git a/SchoStack.Tests/NestedObjectUrlCreationTests.cs b/SchoStack.Tests/NestedObjectUrlCreationTests.cs
index c5b46fa..ad635e5 100644
--- a/SchoStack.Tests/NestedObjectUrlCreationTests.cs
+++ b/SchoStack.Tests/NestedObjectUrlCreationTests.cs
@@ -10,7 +10,6 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
-using FubuCore;
 using Moq;
 using NUnit.Framework;
 using Promaster.Tests;
diff --git a/SchoStack.Tests/SchoStack.Tests.csproj b/SchoStack.Tests/SchoStack.Tests.csproj
index 20655a8..e4680ef 100644
--- a/SchoStack.Tests/SchoStack.Tests.csproj
+++ b/SchoStack.Tests/SchoStack.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SchoStack.Tests</RootNamespace>
     <AssemblyName>SchoStack.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,34 +33,52 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Baseline, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Baseline.1.4.0\lib\net451\Baseline.dll</HintPath>
+    </Reference>
     <Reference Include="FluentValidation, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll</HintPath>
     </Reference>
-    <Reference Include="FubuCore, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FubuCore.1.3.0.278\lib\FubuCore.dll</HintPath>
-    </Reference>
     <Reference Include="HtmlTags, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\HtmlTags.2.1.0.183\lib\4.0\HtmlTags.dll</HintPath>
     </Reference>
-    <Reference Include="Moq">
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Shouldly">
+    <Reference Include="Shouldly, Version=1.1.1.1, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
       <HintPath>..\packages\Shouldly.1.1.1.1\lib\35\Shouldly.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -82,9 +102,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UrlExtensionTests.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SchoStack.Web.FluentValidation\SchoStack.Web.FluentValidation.csproj">
       <Project>{487da134-7d1c-4cb1-9914-020935393479}</Project>
@@ -95,6 +112,12 @@
       <Name>SchoStack.Web</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SchoStack.Tests/UrlExtensionTests.cs b/SchoStack.Tests/UrlExtensionTests.cs
index 3308bf9..2f59746 100644
--- a/SchoStack.Tests/UrlExtensionTests.cs
+++ b/SchoStack.Tests/UrlExtensionTests.cs
@@ -68,7 +68,7 @@ public void UrlForInterfaceShouldReturnCorrectUrl1()
             RouteTable.Routes.Add(typeof(TestUrl).FullName, new Route("fakeUrl/{Age}/edit", null));
 
             var url = MvcMockHelpers.GetUrlHelper("~/fakeUrl");
-            url.For(new TestUrl()).ShouldBe("/fakeUrl/0/edit");
+            url.For(new TestUrl() { Age = 0 } ).ShouldBe("/fakeUrl/0/edit");
         }
 
         public class TestUrl 
@@ -76,7 +76,7 @@ public class TestUrl
             public Guid Id { get; set; }
             
             [RouteParam]
-            public int Age { get; set; }
+            public int? Age { get; set; }
         }
     }
 }
diff --git a/SchoStack.Tests/app.config b/SchoStack.Tests/app.config
new file mode 100644
index 0000000..b78e351
--- /dev/null
+++ b/SchoStack.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/SchoStack.Tests/packages.config b/SchoStack.Tests/packages.config
index 5b989e9..75ba376 100644
--- a/SchoStack.Tests/packages.config
+++ b/SchoStack.Tests/packages.config
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentValidation" version="5.0.0.1" targetFramework="net40" />
-  <package id="FubuCore" version="1.3.0.278" targetFramework="net40" />
-  <package id="HtmlTags" version="2.1.0.183" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" targetFramework="net40" />
-  <package id="NUnit" version="2.6.0.12054" targetFramework="net40" />
-  <package id="Shouldly" version="1.1.1.1" targetFramework="net40" />
+  <package id="Baseline" version="1.4.0" targetFramework="net452" />
+  <package id="FluentValidation" version="5.0.0.1" targetFramework="net452" />
+  <package id="HtmlTags" version="2.1.0.183" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
+  <package id="Moq" version="4.0.10827" targetFramework="net452" />
+  <package id="NUnit" version="2.6.0.12054" targetFramework="net452" />
+  <package id="Shouldly" version="1.1.1.1" targetFramework="net452" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/SchoStack.Web.FluentValidation/FluentValidationHtmlConventions.cs b/SchoStack.Web.FluentValidation/FluentValidationHtmlConventions.cs
index f773eed..e244e35 100644
--- a/SchoStack.Web.FluentValidation/FluentValidationHtmlConventions.cs
+++ b/SchoStack.Web.FluentValidation/FluentValidationHtmlConventions.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Baseline;
 using FluentValidation;
 using FluentValidation.Internal;
 using FluentValidation.Validators;
-using FubuCore;
 using HtmlTags;
 using SchoStack.Web.Conventions.Core;
 using SchoStack.Web.FluentValidation;
diff --git a/SchoStack.Web.FluentValidation/SchoStack.Web.FluentValidation.csproj b/SchoStack.Web.FluentValidation/SchoStack.Web.FluentValidation.csproj
index fd3d37d..7e6660b 100644
--- a/SchoStack.Web.FluentValidation/SchoStack.Web.FluentValidation.csproj
+++ b/SchoStack.Web.FluentValidation/SchoStack.Web.FluentValidation.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SchoStack.Web.FluentValidation</RootNamespace>
     <AssemblyName>SchoStack.Web.FluentValidation</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,28 +33,45 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Baseline, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Baseline.1.4.0\lib\net451\Baseline.dll</HintPath>
+    </Reference>
     <Reference Include="FluentValidation, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll</HintPath>
     </Reference>
     <Reference Include="FluentValidation.Mvc, Version=5.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentValidation.MVC3.5.0.0.3\lib\Net40\FluentValidation.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="FubuCore, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FubuCore.1.3.0.278\lib\FubuCore.dll</HintPath>
-    </Reference>
     <Reference Include="HtmlTags, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\HtmlTags.2.1.0.183\lib\4.0\HtmlTags.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -73,7 +92,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="app.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
diff --git a/SchoStack.Web.FluentValidation/app.config b/SchoStack.Web.FluentValidation/app.config
new file mode 100644
index 0000000..b78e351
--- /dev/null
+++ b/SchoStack.Web.FluentValidation/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/SchoStack.Web.FluentValidation/packages.config b/SchoStack.Web.FluentValidation/packages.config
index ad57c4e..5a3820b 100644
--- a/SchoStack.Web.FluentValidation/packages.config
+++ b/SchoStack.Web.FluentValidation/packages.config
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentValidation" version="5.0.0.1" targetFramework="net40" />
-  <package id="FluentValidation.MVC3" version="5.0.0.3" targetFramework="net40" />
-  <package id="FubuCore" version="1.3.0.278" targetFramework="net40" />
-  <package id="HtmlTags" version="2.1.0.183" targetFramework="net40" />
+  <package id="Baseline" version="1.4.0" targetFramework="net452" />
+  <package id="FluentValidation" version="5.0.0.1" targetFramework="net452" />
+  <package id="FluentValidation.MVC3" version="5.0.0.3" targetFramework="net452" />
+  <package id="HtmlTags" version="2.1.0.183" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/SchoStack.Web/ActionFactory.cs b/SchoStack.Web/ActionFactory.cs
index 1b68b20..ebb5f4c 100644
--- a/SchoStack.Web/ActionFactory.cs
+++ b/SchoStack.Web/ActionFactory.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using System.Web.Mvc;
 using System.Web.Routing;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 
 namespace SchoStack.Web
 {
diff --git a/SchoStack.Web/AttribValidatorFinder.cs b/SchoStack.Web/AttribValidatorFinder.cs
index 5c29c34..4c29bcc 100644
--- a/SchoStack.Web/AttribValidatorFinder.cs
+++ b/SchoStack.Web/AttribValidatorFinder.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 using SchoStack.Web.Conventions.Core;
 
 namespace SchoStack.Web.Html
diff --git a/SchoStack.Web/Conventions/Core/ConventionActionAttribute.cs b/SchoStack.Web/Conventions/Core/ConventionActionAttribute.cs
index a1e2d4b..8a4bc14 100644
--- a/SchoStack.Web/Conventions/Core/ConventionActionAttribute.cs
+++ b/SchoStack.Web/Conventions/Core/ConventionActionAttribute.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using FubuCore.Reflection;
 using HtmlTags;
 
 namespace SchoStack.Web.Conventions.Core
diff --git a/SchoStack.Web/Conventions/Core/ConventionPipeline.cs b/SchoStack.Web/Conventions/Core/ConventionPipeline.cs
index 47aa015..2667959 100644
--- a/SchoStack.Web/Conventions/Core/ConventionPipeline.cs
+++ b/SchoStack.Web/Conventions/Core/ConventionPipeline.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using FubuCore.Reflection;
 using HtmlTags;
 
 namespace SchoStack.Web.Conventions.Core
diff --git a/SchoStack.Web/Conventions/Core/RequestData.cs b/SchoStack.Web/Conventions/Core/RequestData.cs
index aa81109..a0d7fa3 100644
--- a/SchoStack.Web/Conventions/Core/RequestData.cs
+++ b/SchoStack.Web/Conventions/Core/RequestData.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 
 namespace SchoStack.Web.Conventions.Core
 {
diff --git a/SchoStack.Web/Conventions/Core/TagConventions.cs b/SchoStack.Web/Conventions/Core/TagConventions.cs
index df59296..fc3d216 100644
--- a/SchoStack.Web/Conventions/Core/TagConventions.cs
+++ b/SchoStack.Web/Conventions/Core/TagConventions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 
 namespace SchoStack.Web.Conventions.Core
 {
diff --git a/SchoStack.Web/Conventions/Core/TagGenerator.cs b/SchoStack.Web/Conventions/Core/TagGenerator.cs
index a4f4334..98adf81 100644
--- a/SchoStack.Web/Conventions/Core/TagGenerator.cs
+++ b/SchoStack.Web/Conventions/Core/TagGenerator.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Web.Mvc;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 using HtmlTags;
 using SchoStack.Web.Reflection;
 
diff --git a/SchoStack.Web/Conventions/DataAnnotationValidationHtmlConventions.cs b/SchoStack.Web/Conventions/DataAnnotationValidationHtmlConventions.cs
index 22d900a..56f603f 100644
--- a/SchoStack.Web/Conventions/DataAnnotationValidationHtmlConventions.cs
+++ b/SchoStack.Web/Conventions/DataAnnotationValidationHtmlConventions.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Web.Mvc;
 using HtmlTags;
 using SchoStack.Web.Conventions.Core;
 using SchoStack.Web.Html;
diff --git a/SchoStack.Web/Conventions/DefaultSelectListBuilder.cs b/SchoStack.Web/Conventions/DefaultSelectListBuilder.cs
index 7577d94..44e6c3c 100644
--- a/SchoStack.Web/Conventions/DefaultSelectListBuilder.cs
+++ b/SchoStack.Web/Conventions/DefaultSelectListBuilder.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
-using FubuCore;
+using Baseline;
 using HtmlTags;
 using SchoStack.Web.Conventions.Core;
 
diff --git a/SchoStack.Web/InputPropertyMatcher.cs b/SchoStack.Web/InputPropertyMatcher.cs
index 9de2c19..a3a05d5 100644
--- a/SchoStack.Web/InputPropertyMatcher.cs
+++ b/SchoStack.Web/InputPropertyMatcher.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 using SchoStack.Web.Conventions.Core;
 
 namespace SchoStack.Web
diff --git a/SchoStack.Web/LoopItem.cs b/SchoStack.Web/LoopItem.cs
index b874375..6bed9f0 100644
--- a/SchoStack.Web/LoopItem.cs
+++ b/SchoStack.Web/LoopItem.cs
@@ -5,7 +5,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Web.Mvc;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 using HtmlTags;
 using SchoStack.Web.Extensions;
 
diff --git a/SchoStack.Web/Reflection/ReflectionUtil.cs b/SchoStack.Web/Reflection/ReflectionUtil.cs
index df9132d..f295c4c 100644
--- a/SchoStack.Web/Reflection/ReflectionUtil.cs
+++ b/SchoStack.Web/Reflection/ReflectionUtil.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq.Expressions;
 using System.Reflection;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 
 namespace SchoStack.Web.Reflection
 {
diff --git a/SchoStack.Web/RouteExtensions.cs b/SchoStack.Web/RouteExtensions.cs
index 9f515a6..0ae92bd 100644
--- a/SchoStack.Web/RouteExtensions.cs
+++ b/SchoStack.Web/RouteExtensions.cs
@@ -6,7 +6,7 @@
 using System.Text.RegularExpressions;
 using System.Web.Mvc;
 using System.Web.Routing;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 
 namespace SchoStack.Web
 {
diff --git a/SchoStack.Web/SchoStack.Web.csproj b/SchoStack.Web/SchoStack.Web.csproj
index aafce54..7c7ada7 100644
--- a/SchoStack.Web/SchoStack.Web.csproj
+++ b/SchoStack.Web/SchoStack.Web.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +10,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SchoStack.Web</RootNamespace>
     <AssemblyName>SchoStack.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,22 +33,40 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FubuCore, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FubuCore.1.3.0.278\lib\FubuCore.dll</HintPath>
+    <Reference Include="Baseline, Version=1.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Baseline.1.4.0\lib\net451\Baseline.dll</HintPath>
     </Reference>
     <Reference Include="HtmlTags, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\HtmlTags.2.1.0.183\lib\4.0\HtmlTags.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-    <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/SchoStack.Web/TagExtensions.cs b/SchoStack.Web/TagExtensions.cs
index d80fde1..cd4665c 100644
--- a/SchoStack.Web/TagExtensions.cs
+++ b/SchoStack.Web/TagExtensions.cs
@@ -5,7 +5,7 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
-using FubuCore.Reflection;
+using Baseline.Reflection;
 using HtmlTags;
 using SchoStack.Web.Conventions.Core;
 using SchoStack.Web.Url;
diff --git a/SchoStack.Web/UrlExtensions.cs b/SchoStack.Web/UrlExtensions.cs
index ae884f6..eaeeeb6 100644
--- a/SchoStack.Web/UrlExtensions.cs
+++ b/SchoStack.Web/UrlExtensions.cs
@@ -8,7 +8,6 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Routing;
-using FubuCore.Reflection;
 
 namespace SchoStack.Web.Url
 {
diff --git a/SchoStack.Web/packages.config b/SchoStack.Web/packages.config
index 31a3307..771ea6b 100644
--- a/SchoStack.Web/packages.config
+++ b/SchoStack.Web/packages.config
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FubuCore" version="1.3.0.278" targetFramework="net40" />
-  <package id="HtmlTags" version="2.1.0.183" targetFramework="net40" />
+  <package id="Baseline" version="1.4.0" targetFramework="net452" />
+  <package id="HtmlTags" version="2.1.0.183" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net452" />
+  <package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net452" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net452" />
 </packages>
\ No newline at end of file