diff --git a/build/Build.bat b/build/Build.bat
new file mode 100644
index 0000000000..76cf1b11fe
--- /dev/null
+++ b/build/Build.bat
@@ -0,0 +1,2 @@
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj"
+REM pause
\ No newline at end of file
diff --git a/build/Build.proj b/build/Build.proj
new file mode 100644
index 0000000000..227ae8f122
--- /dev/null
+++ b/build/Build.proj
@@ -0,0 +1,77 @@
+<Project InitialTargets="Build" DefaultTargets="AfterBuild" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<MSBuildCommunityTasksPath>..\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
+		<UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
+	</PropertyGroup>
+	<!--<Import Project="..\lib\References\Umbraco\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />-->
+	<Import Project="..\lib\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+	<PropertyGroup>
+		<BuildFolder>_BuildOutput\</BuildFolder>
+		<BuildZipFileName>UmbracoWebApp.zip</BuildZipFileName>
+		<BuildZipFileNameBin>UmbracoAllBinaries.zip</BuildZipFileNameBin>
+		<IncludeSymbols>False</IncludeSymbols>
+		<BuildFolderRelativeToProjects>..\..\$(BuildFolder)</BuildFolderRelativeToProjects>
+		<SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
+		<WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
+		<SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
+		<SolutionBinBuildFolderWildcard>$(SolutionBinFolder)**\*.*</SolutionBinBuildFolderWildcard>
+		<SolutionBinBuildFolderExclusionWildcard>$(SolutionBinFolder)**\Web.Template.*;$(SolutionBinFolder)**\*.pdb</SolutionBinBuildFolderExclusionWildcard>
+		<WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
+		<WebBuildFolderWildcard>$(WebAppFolder)**\*.*</WebBuildFolderWildcard>
+		<WebBuildFolderExclusionWildcard>$(WebAppFolder)**\Web.Template.*;$(WebAppFolder)**\*.pdb</WebBuildFolderExclusionWildcard>
+		<!--<WebProjectPluginFolder>Web Apps\Umbraco.Cms.Web.UI\App_Plugins\</WebProjectPluginFolder>
+		<WebProjectPluginFolderWildcard>$(WebProjectPluginFolder)**\*.*</WebProjectPluginFolderWildcard>
+		<WebProjectPluginFolderExclusionWildcard>$(WebProjectPluginFolder)Packages\DevDataset\**\*.*;$(WebProjectPluginFolder)Packages\uGoLive\**\*.*</WebProjectPluginFolderExclusionWildcard>-->
+	</PropertyGroup>
+	<Target Name="Build" DependsOnTargets="ZipWebApp">
+		<Message Text="Build finished" />
+	</Target>
+	<Target Name="CleanUp" DependsOnTargets="ZipWebApp">
+		<Message Text="Deleting $(BuildFolder)" Importance="high" />
+		<RemoveDir Directories="$(BuildFolder)" />
+		<Message Text="Finished deleting $(BuildFolder)" Importance="high" />
+	</Target>
+	<!--<Target Name="ZipWebApp" DependsOnTargets="OffsetTimestamps">-->
+  <Target Name="ZipWebApp" DependsOnTargets="CompileWeb">
+		<Time Format="yyyyMMdd-HHmm">
+		  <Output TaskParameter="FormattedTime" PropertyName="buildDate" />
+		</Time>
+		<CreateItem Include="$(WebBuildFolderWildcard)" Exclude="$(WebBuildFolderExclusionWildcard)">
+			<Output TaskParameter="Include" ItemName="WebFilesToZip" />
+        </CreateItem>
+		<CreateItem Include="$(SolutionBinBuildFolderWildcard)" Exclude="$(SolutionBinBuildFolderExclusionWildcard)">
+			<Output TaskParameter="Include" ItemName="BinFilesToZip" />
+        </CreateItem>
+		<Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
+		<MSBuild.Community.Tasks.Zip Files="@(BinFilesToZip)" ZipFileName="$(buildDate)-$(BuildZipFileNameBin)" WorkingDirectory="$(SolutionBinFolder)" />
+		<MSBuild.Community.Tasks.Zip Files="@(WebFilesToZip)" ZipFileName="$(buildDate)-$(BuildZipFileName)" WorkingDirectory="$(WebAppFolder)" />
+		<Message Text="Finished zipping to $(buildDate)-$(BuildZipFileName)" Importance="high" />
+	</Target>
+	<Target Name="CompileWeb">
+    
+		<Message Text="Compiling web project to $(BuildFolder)" Importance="high" />
+		<!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
+		<MSBuild Projects="..\src\umbraco.sln" Properties="Configuration=Debug;UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderRelativeToProjects);WebProjectOutputDir=$(WebAppFolderRelativeToProjects)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
+		</MSBuild>
+		<Message Text="Finished compiling web project to $(BuildFolder)" Importance="high" />
+	</Target>
+	<!--<Target Name="CopyDefaultPlugins" DependsOnTargets="CompileWeb">
+		<Message Text="Copying default plugins using $(WebProjectPluginFolderWildcard)" Importance="high" />
+		<CreateItem Include="$(WebProjectPluginFolderWildcard)" Exclude="$(WebProjectPluginFolderExclusionWildcard)">
+			<Output TaskParameter="Include" ItemName="TargetFiles" />
+		</CreateItem>
+		<Copy SourceFiles="@(TargetFiles)" DestinationFiles="@(TargetFiles->'$(WebAppFolder)App_Plugins\%(RecursiveDir)%(Filename)%(Extension)')" Retries="5" OverwriteReadOnlyFiles="True" SkipUnchangedFiles="True" />
+		<Message Text="Finished Copying default plugins" Importance="high" />
+	</Target>
+	<Target Name="OffsetTimestamps" DependsOnTargets="CopyDefaultPlugins">
+		<CreateItem Include="$(BuildFolder)**\Umbraco.*.dll">
+			<Output TaskParameter="Include" ItemName="FilesToOffsetTimestamp" />
+        </CreateItem>
+		<Message Text="Starting to offset timestamps" Importance="high" />
+		<Umbraco.MSBuild.Tasks.TimestampOffset Files="@(FilesToOffsetTimestamp)" Offset="-11" />
+		<Message Text="Finished offsetting timestamps" Importance="high" />
+	</Target>-->
+	<Target Name="AfterBuild">
+		<Message Text="Hi" />
+	</Target>
+</Project>
\ No newline at end of file
diff --git a/src/umbraco.sln b/src/umbraco.sln
index 696ba1b22c..d84975d83d 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -38,23 +38,29 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Iron",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}"
 	ProjectSection(SolutionItems) = preProject
-		build\aspnet35.build = build\aspnet35.build
-		build\aspnet35.config = build\aspnet35.config
-		build\build.xml = build\build.xml
-		build\default.build = build\default.build
-		build\nuget.build = build\nuget.build
-		build\umbraco weekly.build = build\umbraco weekly.build
-		build\umbraco.build = build\umbraco.build
+		..\build\Build.bat = ..\build\Build.bat
+		..\build\Build.proj = ..\build\Build.proj
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}"
 	ProjectSection(SolutionItems) = preProject
-		docs\4.5-changelog.docx = docs\4.5-changelog.docx
-		docs\GettingStarted.txt = docs\GettingStarted.txt
-		docs\IronPython License.Rtf = docs\IronPython License.Rtf
-		docs\License.txt = docs\License.txt
-		docs\README.txt = docs\README.txt
-		docs\ReleaseNotes.txt = docs\ReleaseNotes.txt
+		..\docs\4.5-changelog.docx = ..\docs\4.5-changelog.docx
+		..\docs\GettingStarted.txt = ..\docs\GettingStarted.txt
+		..\docs\IronPython License.Rtf = ..\docs\IronPython License.Rtf
+		..\docs\License.txt = ..\docs\License.txt
+		..\docs\README.txt = ..\docs\README.txt
+		..\docs\ReleaseNotes.txt = ..\docs\ReleaseNotes.txt
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nant", "Nant", "{17E547B1-D89B-4C76-AB9C-F05888397FA4}"
+	ProjectSection(SolutionItems) = preProject
+		..\build\Nant\aspnet35.build = ..\build\Nant\aspnet35.build
+		..\build\Nant\aspnet35.config = ..\build\Nant\aspnet35.config
+		..\build\Nant\build.xml = ..\build\Nant\build.xml
+		..\build\Nant\default.build = ..\build\Nant\default.build
+		..\build\Nant\nuget.build = ..\build\Nant\nuget.build
+		..\build\Nant\umbraco weekly.build = ..\build\Nant\umbraco weekly.build
+		..\build\Nant\umbraco.build = ..\build\Nant\umbraco.build
 	EndProjectSection
 EndProject
 Global
@@ -121,4 +127,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{17E547B1-D89B-4C76-AB9C-F05888397FA4} = {2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}
+	EndGlobalSection
 EndGlobal
diff --git a/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx b/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx
deleted file mode 100644
index dcb6614dda..0000000000
--- a/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="DocumentService.asmx.cs" Class=umbraco.webservices.documents.documentService %>
\ No newline at end of file
diff --git a/umbraco/presentation/umbraco/webservices/api/FileService.asmx b/umbraco/presentation/umbraco/webservices/api/FileService.asmx
deleted file mode 100644
index e8a68ff354..0000000000
--- a/umbraco/presentation/umbraco/webservices/api/FileService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="FileService.asmx.cs" Class="umbraco.webservices.files.fileService" %>
diff --git a/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx b/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx
deleted file mode 100644
index fc9f8aba21..0000000000
--- a/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="MaintanceService.asmx.cs" Class="umbraco.webservices.maintenance.maintenanceService" %>
diff --git a/umbraco/presentation/umbraco/webservices/api/MediaService.asmx b/umbraco/presentation/umbraco/webservices/api/MediaService.asmx
deleted file mode 100644
index cfaded1cb1..0000000000
--- a/umbraco/presentation/umbraco/webservices/api/MediaService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="MediaService.asmx.cs" Class="umbraco.webservices.media.mediaService" %>
diff --git a/umbraco/presentation/umbraco/webservices/api/MemberService.asmx b/umbraco/presentation/umbraco/webservices/api/MemberService.asmx
deleted file mode 100644
index f65beb00c6..0000000000
--- a/umbraco/presentation/umbraco/webservices/api/MemberService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="MemberService.asmx.cs" Class="umbraco.webservices.members.memberService" %>
diff --git a/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx b/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx
deleted file mode 100644
index 4d98082f6c..0000000000
--- a/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="StylesheetService.asmx.cs" Class="umbraco.webservices.stylesheets.stylesheetService" %>
diff --git a/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx b/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx
deleted file mode 100644
index 8af78e62dd..0000000000
--- a/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx
+++ /dev/null
@@ -1 +0,0 @@
-<%@ WebService Language="C#" CodeBehind="TemplateService.asmx.cs" Class="umbraco.webservices.templates.templateService" %>