diff --git a/build.bat b/build.bat
index 1de283b..079293d 100644
--- a/build.bat
+++ b/build.bat
@@ -1,32 +1,31 @@
-@echo off
-
-::Project UppercuT - http://uppercut.googlecode.com
-::No edits to this file are required - http://uppercut.pbwiki.com
-
-if '%2' NEQ '' goto usage
-if '%3' NEQ '' goto usage
-if '%1' == '/?' goto usage
-if '%1' == '-?' goto usage
-if '%1' == '?' goto usage
-if '%1' == '/help' goto usage
-
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
-
-%NANT% %1 /f:.\build\default.build -D:build.config.settings=%build.config.settings%
-
-if %ERRORLEVEL% NEQ 0 goto errors
-
-goto finish
-
-:usage
-echo.
-echo Usage: build.bat
-echo.
-goto finish
-
-:errors
-EXIT /B %ERRORLEVEL%
-
+@echo off
+
+::Project UppercuT - http://uppercut.googlecode.com
+::No edits to this file are required - http://uppercut.pbwiki.com
+
+if '%1' == '/?' goto usage
+if '%1' == '-?' goto usage
+if '%1' == '?' goto usage
+if '%1' == '/help' goto usage
+
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
+
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:"%BUILD_DIR%build\default.build" -D:build.config.settings=%build.config.settings% %*
+
+if %ERRORLEVEL% NEQ 0 goto errors
+
+goto finish
+
+:usage
+echo.
+echo Usage: build.bat
+echo.
+goto finish
+
+:errors
+EXIT /B %ERRORLEVEL%
+
 :finish
\ No newline at end of file
diff --git a/build/Castle.Core.dll b/build/Castle.Core.dll
index b268f70..5603118 100644
Binary files a/build/Castle.Core.dll and b/build/Castle.Core.dll differ
diff --git a/build/Castle.DynamicProxy2.dll b/build/Castle.DynamicProxy2.dll
index 596b587..bb06386 100644
Binary files a/build/Castle.DynamicProxy2.dll and b/build/Castle.DynamicProxy2.dll differ
diff --git a/build/Castle.MicroKernel.dll b/build/Castle.MicroKernel.dll
index f856d8b..b3a2b3b 100644
Binary files a/build/Castle.MicroKernel.dll and b/build/Castle.MicroKernel.dll differ
diff --git a/build/Castle.Windsor.dll b/build/Castle.Windsor.dll
index 513e575..1276db1 100644
Binary files a/build/Castle.Windsor.dll and b/build/Castle.Windsor.dll differ
diff --git a/build/UppercuT.xml b/build/UppercuT.xml
index 651abad..38e16b3 100644
--- a/build/UppercuT.xml
+++ b/build/UppercuT.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
 <uppercut>
-  <version>1.3.1.0</version>
+  <version>1.4.2.0</version>
 </uppercut>
-
diff --git a/build/analyze.step b/build/analyze.step
index 589d078..8a9606a 100644
--- a/build/analyze.step
+++ b/build/analyze.step
@@ -1,79 +1,44 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<project name="Analyzer" default="go">
+<project name="Analyzers" default="go">
   <!-- Project UppercuT - http://projectuppercut.org -->
   <!-- DO NOT EDIT THIS FILE - Add custom tasks in BuildTasks.Custom folder with file by the same name - find out more at http://uppercut.pbwiki.com -->
   <property name="build.config.settings" value="__NONE__" overwrite="false" />
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="analyze" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="run_analyzers"
           description="Analyzing project for quality indicators." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="run_analyzers">
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}test.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}ncover.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}ndepend.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}nitriq.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}analyzers${path.separator}moma.step" inheritall="true" failonerror="false" />
-  </target>
-
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}test.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}cover.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}ndepend.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}nitriq.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}metrics.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyzers${path.separator}moma.step" inheritall="true" failonerror="false" />
   </target>
 
 </project>
\ No newline at end of file
diff --git a/build/analyzers/cover.step b/build/analyzers/cover.step
new file mode 100644
index 0000000..90793ca
--- /dev/null
+++ b/build/analyzers/cover.step
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="CoverageRunner" default="go">
+  <!-- Project UppercuT - http://projectuppercut.org -->
+  <!-- DO NOT EDIT THIS FILE -->
+  <property name="build.config.settings" value="__NONE__" overwrite="false" />
+  <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
+  <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
+  <property name="file.current.no_extension" value="cover" />
+  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="folder.build_scripts" value="build" overwrite="false" />
+  <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="folder.code_build" value="build_output" overwrite="false" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="folder.app.drop" value="${project.name}" overwrite="false" />
+  <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
+  <property name="cover.framework" value="opencover" overwrite="false" />
+  <property name="is.replaced" value="false" />
+  <property name="fail.build.on.error" value="true" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
+
+    <target name="go" depends="load_uppercut_assemblies, run_tasks" />
+  
+  <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
+  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts}${path.separator}${file.uppercut.assembly}" />
+  <target name="load_uppercut_assemblies">
+    <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
+  </target>
+
+  <target name="run_tasks">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <call target="prepare" if="${target::exists('prepare')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
+    <call target="run_normal_tasks" if="${not is.replaced}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
+  </target>
+
+  <target name="run_normal_tasks"
+          depends="run_coverage"
+          description="Analysing project for test coverage." />
+
+  <target name="run_coverage">
+    <nant buildfile="${dirs.current}${path.separator}ncover.cover.step" inheritall="true" if="${cover.framework=='ncover'}" />
+    <nant buildfile="${dirs.current}${path.separator}opencover.cover.step" inheritall="true" if="${cover.framework=='opencover'}" />
+    <call target="set_normal_failure_mode" />
+  </target>
+
+  <target name="open_results">
+    <nant buildfile="${dirs.current}${path.separator}ncover.cover.step" target="open_results" inheritall="true" if="${cover.framework=='ncover'}" />
+    <nant buildfile="${dirs.current}${path.separator}opencover.cover.step" target="open_results" inheritall="true" if="${cover.framework=='opencover'}" />
+  </target>
+
+  <target name="set_normal_failure_mode">
+    <property name="nant.onfailure" value="fail" />
+  </target>
+
+</project>
\ No newline at end of file
diff --git a/build/analyzers/gallio.test.step b/build/analyzers/gallio.test.step
index 3eb578a..a8c8077 100644
--- a/build/analyzers/gallio.test.step
+++ b/build/analyzers/gallio.test.step
@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="gallio.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
@@ -22,66 +22,41 @@
   <property name="file.test_results" value="gallio-results" overwrite="false" />
   <property name="time.limit.in.seconds" value="240" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <target name="go" depends="run_tasks" />
 
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="run_tests"
           description="Testing with Gallio." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.test_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.test_results}."/>
     <delete dir="${dirs.test_results}" failonerror="false" />
     <mkdir dir="${dirs.test_results}" />
   </target>
 
   <target name="load_tasks">
-    <echo message="Loading Gallio Nant Tasks from Program Files." />
+    <echo level="Warning" message="Loading Gallio Nant Tasks from Program Files." />
     <loadtasks assembly="C:${path.separator}Program Files (x86)${path.separator}Gallio${path.separator}bin${path.separator}Gallio.NAntTasks.dll" if="${file::exists('C:' + path.separator + 'Program Files (x86)' + path.separator + 'Gallio' + path.separator + 'bin' + path.separator + 'Gallio.NAntTasks.dll')}" />
     <loadtasks assembly="C:${path.separator}Program Files${path.separator}Gallio${path.separator}bin${path.separator}Gallio.NAntTasks.dll" if="${file::exists('C:' + path.separator + 'Program Files' + path.separator + 'Gallio' + path.separator + 'bin' + path.separator + 'Gallio.NAntTasks.dll')}" />
   </target>
 
   <target name="run_tests" depends="prepare,load_tasks" description="Running Unit Tests">
-    <echo message="Running tests using Gallio and putting results in ${dirs.test_results}."/>
+    <echo level="Warning" message="Running tests using Gallio and putting results in ${dirs.test_results}."/>
     <gallio working-directory="${dirs.build}"
             report-types="Html;Xml;Text"
             report-directory="${dirs.test_results}"
@@ -105,7 +80,7 @@
   </target>
 
   <target name="run_all_tests" depends="prepare,load_tasks" description="Running All Unit Tests">
-    <echo message="Running all tests (including integration tests) using Gallio and putting results in ${dirs.test_results}."/>
+    <echo level="Warning" message="Running all tests (including integration tests) using Gallio and putting results in ${dirs.test_results}."/>
     <gallio working-directory="${dirs.build}"
             report-types="Html;Xml;Text"
             report-directory="${dirs.test_results}"
@@ -126,19 +101,8 @@
   </target>
 
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
     <results display="${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/mbunit2.test.step b/build/analyzers/mbunit2.test.step
index d48a71c..ffb49d0 100644
--- a/build/analyzers/mbunit2.test.step
+++ b/build/analyzers/mbunit2.test.step
@@ -7,22 +7,19 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="mbunit2.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
   <property name="dirs.test_results" value="${dirs.build_artifacts}${path.separator}mbunit2" overwrite="false" />
   <property name="file.test_results" value="mbunit-results" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
@@ -45,51 +42,29 @@
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="run_tests"
           description="Testing with MbUnit v2." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.test_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.test_results}."/>
     <delete dir="${dirs.test_results}" failonerror="false" />
     <mkdir dir="${dirs.test_results}" />
   </target>
 
   <target name="run_tests" depends="prepare" description="Running Unit Tests">
-    <echo message="Running tests using MbUnit and putting results in ${dirs.test_results}."/>
+    <echo level="Warning" message="Running tests using MbUnit and putting results in ${dirs.test_results}."/>
     <mbunit
         report-types="Html;Xml;Text"
         report-filename-format="${file.test_results}"
@@ -114,7 +89,7 @@
   </target>
 
   <target name="run_all_tests" depends="prepare" description="Running All Unit Tests">
-    <echo message="Running all tests (including integration tests) using MbUnit and putting results in ${dirs.test_results}."/>
+    <echo level="Warning" message="Running all tests (including integration tests) using MbUnit and putting results in ${dirs.test_results}."/>
     <mbunit
         report-types="Html;Xml;Text"
         report-filename-format="${file.test_results}"
@@ -127,19 +102,8 @@
   </target>
 
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
     <results display="${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" /> 
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/metrics.step b/build/analyzers/metrics.step
new file mode 100644
index 0000000..7ce07aa
--- /dev/null
+++ b/build/analyzers/metrics.step
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="Visual Studio Code Metrics" default="go">
+  <!-- Project UppercuT - http://projectuppercut.org -->
+  <property name="build.config.settings" value="__NONE__" overwrite="false" />
+  <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
+  <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
+  <include buildfile="..${path.separator}csharp.functions" />
+  <property name="file.current.no_extension" value="metrics" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
+  <property name="folder.build_scripts" value="build" overwrite="false" />
+  <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="folder.code_build" value="build_output" overwrite="false" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
+  <property name="folder.app.drop" value="${project.name}" overwrite="false" />
+  <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
+  <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
+  <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
+  <property name="folder.program_files" value="${environment::get-folder-path('ProgramFiles')}" />
+  <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
+  <property name="folder.references" value="lib" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.metrics_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}metrics" />
+  <property name="app.metrics" value="${path::get-full-path(folder.program_files)}${path.separator}Microsoft Visual Studio 10.0${path.separator}Team Tools${path.separator}Static Analysis Tools${path.separator}FxCop${path.separator}Metrics.exe" overwrite="false" />
+  <property name="file.metrics_results" value="${project.name}.Metrics.xml" />
+  <property name="file.metrics_log" value="${project.name}.Metrics.log" />
+  <property name="args.metrics" value="/searchgac /o:&quot;${dirs.metrics_results}${path.separator}${file.metrics_results}&quot;" />
+
+  <property name="is.replaced" value="false" />
+  <property name="fail.build.on.error" value="false" />
+
+  <target name="go" depends="load_uppercut_assemblies, run_tasks" if="${file::exists(app.metrics)}" />
+
+  <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}..${path.separator}${file.uppercut.assembly}" />
+  <target name="load_uppercut_assemblies">
+  <target name="load_uppercut_assemblies">
+    <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
+  </target>
+
+  <target name="run_tasks" if="${file::exists(app.metrics)}" >
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <call target="prepare" if="${target::exists('prepare')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
+    <call target="run_normal_tasks" if="${not is.replaced}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
+  </target>
+
+  <target name="prepare">
+    <echo message="Removing and adding ${dirs.metrics_results}."/>
+    <delete dir="${dirs.metrics_results}" failonerror="false" />
+    <mkdir dir="${dirs.metrics_results}" />
+  </target>
+
+  <target name="run_normal_tasks"
+          depends="get_regular_dlls, metrics"
+          description="Using Visual Studio Code Metrics to report on the complexity and maintainability of your project(s)."
+          if="${file::exists(app.metrics)}" />
+
+  <target name="get_regular_dlls">
+    <echo level="warning" message="Getting output dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
+    <property name="dll.names" value="" />
+    <property name="dll.args" value="" />
+    <foreach item="File" property="dll.filename">
+      <in>
+        <items>
+          <exclude name="${dirs.build.code}${path.separator}lib${path.separator}**" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}NUnit*.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}MbUnit*.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}TestFu.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}QuickGraph*.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}Refly*.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}Rhino.Mocks*.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}*bdd*.dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}*Test*dll" />
+          <exclude name="${dirs.build.code}${path.separator}**${path.separator}*Spec*dll" />
+          <include name="${dirs.build.code}${path.separator}**${path.separator}*.dll" />
+          <include name="${dirs.build.code}${path.separator}**${path.separator}*.exe" />
+        </items>
+      </in>
+      <do>
+        <property name="dll.names" value="${dll.names + ' ' + string::replace(string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\',''),'\',path.separator) + ''}" />
+        <property name="dll.args" value="${dll.args + ' /f:&quot;' + string::replace(string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\',''),'\',path.separator) + '&quot;'}" />
+      </do>
+    </foreach>
+
+    <echo level="Warning" message="Running Visual Studio Code Metrics against these files - ${dll.names}." unless="${dll.names == ''}" />
+    <echo level="Warning" message="No dlls to run against." if="${dll.names == ''}" />
+
+      <property name="args.metrics" value=" ${dll.args} ${args.metrics}" />
+  </target>
+
+  <target name="metrics" if="${file::exists(app.metrics) and dll.args != ''}" >
+    <echo level="Warning" message="Attempting to run Visual Studio Code Metrics. Creating file at ${file.metrics_results} and logging at ${file.metrics_log}." />
+
+    <exec program="${app.metrics}" workingdir="${dirs.build.code}">
+      <arg line="${args.metrics}" />
+    </exec>
+
+  </target>
+
+  <target name="open_results">
+    <echo message="Opening results - ${path::get-full-path(dirs.metrics_results) + path.separator + file.metrics_results}."/>
+    <results display="${path::get-full-path(dirs.metrics_results) + path.separator + file.metrics_results}" />
+  </target>
+
+</project>
diff --git a/build/analyzers/moma.step b/build/analyzers/moma.step
index 0746fbd..4841e9b 100644
--- a/build/analyzers/moma.step
+++ b/build/analyzers/moma.step
@@ -7,70 +7,45 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="moma" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.moma_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}monoMigrationAnalyzer" />
   <property name="app.moma" value="${path::get-full-path(dirs.lib)}${path.separator}MoMA${path.separator}MoMA.exe" overwrite="false" />
   <property name="file.moma_results" value="${project.name}.MoMAReport.html" />
   <property name="file.moma.submit_results" value="${project.name}.MoMAReport.xml" />
   <property name="file.moma_log" value="${project.name}.moma.log" />
   <property name="args.moma" value="--nogui --out &quot;${dirs.moma_results}${path.separator}${file.moma_results}&quot;" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" if="${file::exists(app.moma)}" />
 
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks" if="${file::exists(app.moma)}">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
-  </target>
-
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.moma_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.moma_results}."/>
     <delete dir="${dirs.moma_results}" failonerror="false" />
     <mkdir dir="${dirs.moma_results}" />
   </target>
@@ -81,7 +56,7 @@
           if="${file::exists(app.moma)}" />
 
   <target name="get_regular_dlls">
-    <echo message="Getting output dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
+    <echo level="Warning" message="Getting output dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -106,13 +81,13 @@
     </foreach>
 
     <property name="dlls.regular" value="${dll.names}" />
-    <echo message="Running Mono Migration Analyzer against these files - ${dlls.regular}." />
+    <echo level="Warning" message="Running Mono Migration Analyzer against these files - ${dlls.regular}." />
 
     <property name="args.moma" value="${args.moma} ${dlls.regular}" />
   </target>
 
   <target name="moma" if="${file::exists(app.moma)}" >
-    <echo message="Attempting to run Mono Migration Analyzer. Creating file at ${file.moma_results} and logging at ${file.moma_log}." />
+    <echo level="Warning" message="Attempting to run Mono Migration Analyzer. Creating file at ${file.moma_results} and logging at ${file.moma_log}." />
 
     <exec program="${app.moma}"
           workingdir="${dirs.build.code}"
@@ -123,19 +98,8 @@
   </target>
 
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.moma_results) + path.separator + file.moma_results}."/>
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.moma_results) + path.separator + file.moma_results}."/>
     <results display="${path::get-full-path(dirs.moma_results) + path.separator + file.moma_results}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/ncover.step b/build/analyzers/ncover.cover.step
similarity index 64%
rename from build/analyzers/ncover.step
rename to build/analyzers/ncover.cover.step
index 5dd1920..caef7b2 100644
--- a/build/analyzers/ncover.step
+++ b/build/analyzers/ncover.cover.step
@@ -7,13 +7,13 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="ncover" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
@@ -24,7 +24,7 @@
   <property name="number.satisfactory_coverage" value="85" overwrite="false" />
   <property name="fail.if_ncover_fails" value="false" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="dirs.ncover_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}ncover" />
   <property name="app.ncover.tester" value="${path::get-full-path(dirs.lib)}${path.separator}MbUnit2${path.separator}MbUnit.Cons.exe" overwrite="false" />
   <property name="app.ncover" value="${path::get-full-path(dirs.lib)}${path.separator}NCover${path.separator}NCover.Console.exe" overwrite="false" />
@@ -38,21 +38,21 @@
   <property name="test.args" value="/rt:Text /rnf:mbUnit /rf:&quot;${dirs.ncover_results}&quot; /ec:${tests.excluded_categories.comma_separated}" if="${test.framework=='mbunit2'}" />
   <property name="test.args" value="/xml:&quot;${dirs.ncover_results}${path.separator}nunit-results.xml&quot; /nologo /framework=${microsoft.framework} /exclude:${tests.excluded_categories.comma_separated}" if="${test.framework=='nunit'}" />
   <!--property name="test.args" value="/xml:&quot;${dirs.ncover_results}\nunit-results.xml&quot; /nologo /framework=${microsoft.framework} /exclude:${tests.excluded_categories.comma_separated}" if="${test.framework=='nunit'}" /-->
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" if="${file::exists(app.ncover) and test.framework !='none'}" />
 
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks" if="${file::exists(app.ncover) and test.framework !='none'}">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
@@ -60,39 +60,14 @@
           description="Using NCover to Analyze project for test quality indicators."
           if="${file::exists(app.ncover) and test.framework !='none'}" />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.ncover_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.ncover_results}."/>
     <delete dir="${dirs.ncover_results}" failonerror="false" />
     <mkdir dir="${dirs.ncover_results}" />
   </target>
 
   <target name="get_test_dlls">
-    <echo message="Getting test dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
+    <echo level="Warning" message="Getting test dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -111,13 +86,13 @@
     </foreach>
 
     <property name="dlls.test" value="${dll.names}" />
-    <echo message="Running NCover against these test dlls - ${dlls.test}." />
+    <echo level="Warning" message="Running NCover against these test dlls - ${dlls.test}." />
 
     <property name="args.test_runner" value="${dlls.test} ${test.args}" />
   </target>
 
   <target name="ncover" if="${file::exists(app.ncover) and file::exists(app.ncover.tester)}" >
-    <echo message="Attempting to run NCover. Creating file at ${file.ncover_results} and logging at ${file.ncover_log}." />
+    <echo level="Warning" message="Attempting to run NCover. Creating file at ${file.ncover_results} and logging at ${file.ncover_log}." />
     <ncover program="${app.ncover}"
         commandLineExe="${app.ncover.tester}"
         commandLineArgs="${args.test_runner}"
@@ -139,7 +114,7 @@
   </target>
 
   <target name="ncover_explorer" depends="ncover" if="${file::exists(app.ncover.explorer)}" >
-    <echo message="Attempting to run NCoverExplorer. Creating HTML results file at ${file.html.code_coverage_results} and XML results file at ${file.xml.code_coverage_results}." />
+    <echo level="Warning" message="Attempting to run NCoverExplorer. Creating HTML results file at ${file.html.code_coverage_results} and XML results file at ${file.xml.code_coverage_results}." />
     <ncoverexplorer
       program="${app.ncover.explorer}"
       projectName="${project.name}"
@@ -168,19 +143,8 @@
   </target>
 
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.ncover_results) + path.separator + file.html.code_coverage_results}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.ncover_results) + path.separator + file.html.code_coverage_results}" />
     <results display="${path::get-full-path(dirs.ncover_results) + path.separator + file.html.code_coverage_results}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/ndepend.step b/build/analyzers/ndepend.step
index 9b2b9a4..0b6f3ec 100644
--- a/build/analyzers/ndepend.step
+++ b/build/analyzers/ndepend.step
@@ -7,35 +7,36 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="ndepend" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
   <property name="app.ndepend" value="C:${path.separator}Program Files${path.separator}NDepend${path.separator}NDepend.Console.exe" overwrite="false" />
   <property name="dirs.ndepend_results" value="${dirs.build_artifacts}${path.separator}ndepend" />
-  <property name="files.ndepend_config" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}NDepend.xml" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
+  <property name="files.ndepend_config" value="${path::get-full-path(dirs.current)}${path.separator}NDepend.xml" />
+
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" if="${file::exists(app.ndepend)}" />
 
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks" if="${file::exists(app.ndepend)}">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
@@ -44,38 +45,13 @@
           if="${file::exists(app.ndepend)}" />
 
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.ndepend_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.ndepend_results}."/>
     <delete dir="${dirs.ndepend_results}" failonerror="false" />
     <mkdir dir="${dirs.ndepend_results}" />
   </target>
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="ndepend" depends="prepare" if="${file::exists(app.ndepend)}">
-    <echo message="Attempting to run NDepend at ${app.ndepend} for file ${files.ndepend_config}." />
+    <echo level="Warning" message="Attempting to run NDepend at ${app.ndepend} for file ${files.ndepend_config}." />
 
     <exec program="${app.ndepend}">
       <arg line="${files.ndepend_config} /OutDir ${dirs.ndepend_results} /InDirs ${path::get-full-path(dirs.build.code)} C:${path.separator}WINDOWS${path.separator}Microsoft.NET${path.separator}Framework${path.separator}v2.0.50727 C:${path.separator}WINDOWS${path.separator}Microsoft.NET${path.separator}Framework${path.separator}v3.0 C:${path.separator}WINDOWS${path.separator}Microsoft.NET${path.separator}Framework${path.separator}v3.5" />
@@ -84,19 +60,8 @@
   </target>
 
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.ndepend_results) + path.separator + 'NDependReport.html'}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.ndepend_results) + path.separator + 'NDependReport.html'}" />
     <results display="${path::get-full-path(dirs.ndepend_results) + path.separator + 'NDependReport.html'}" /> 
   </target>
   
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/nitriq.step b/build/analyzers/nitriq.step
index bb92e34..aa2a23b 100644
--- a/build/analyzers/nitriq.step
+++ b/build/analyzers/nitriq.step
@@ -7,14 +7,14 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="nitriq" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
@@ -22,32 +22,32 @@
   
   <property name="app.nitriq" value="C:${path.separator}Program Files (x86)${path.separator}NimblePros${path.separator}Nitriq Console + Pro${path.separator}Nitriq.Console.exe" overwrite="false" />
   <property name="dirs.nitriq_results" value="${dirs.build_artifacts}${path.separator}nitriq" />
-  <property name="files.nitriq_project" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}nitriq.nitriqProj" />
-  <property name="files.nitriq_queries" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}nitriq.nq" />
+  <property name="files.nitriq_project" value="${path::get-full-path(dirs.current)}${path.separator}nitriq.nitriqProj" />
+  <property name="files.nitriq_queries" value="${path::get-full-path(dirs.current)}${path.separator}nitriq.nq" />
   <property name="file.html.nitriq_results" value="${dirs.nitriq_results}${path.separator}${project.name}.nitriq-results.html" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="precheck" if="${file::exists(app.nitriq)}" />
 
-  <target name="precheck">
-    <echo message="Attempting to locate console edition of Nitriq." />
+  <target name="precheck" if="${file::exists(app.nitriq)}">
+    <echo level="Warning" message="Attempting to locate console edition of Nitriq." />
     <property name="app.nitriq" value="C:${path.separator}Program Files (x86)${path.separator}NimblePros${path.separator}Nitriq Console + Pro\Nitriq.Console.exe" if="${not file::exists(app.nitriq)}" />
     <property name="app.nitriq" value="C:${path.separator}Program Files${path.separator}NimblePros\Nitriq Console + Pro - Nitriq.Console.exe" if="${not file::exists(app.nitriq)}" />
     <call target="run_tasks" if="${file::exists(app.nitriq) and file::exists(files.nitriq_project)}" />
   </target>
   
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
@@ -56,38 +56,13 @@
           if="${file::exists(app.nitriq)}" />
 
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.nitriq_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.nitriq_results}."/>
     <delete dir="${dirs.nitriq_results}" failonerror="false" />
     <mkdir dir="${dirs.nitriq_results}" />
   </target>
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="nitriq" depends="prepare" if="${file::exists(app.nitriq)}">
-    <echo message="Attempting to run Nitriq at ${app.nitriq} for file ${files.nitriq_project}." />
+    <echo level="Warning" message="Attempting to run Nitriq at ${app.nitriq} for file ${files.nitriq_project}." />
 
     <exec program="${app.nitriq}" workingdir="${dirs.build.code}">
       <arg line="${files.nitriq_project} ${files.nitriq_queries} ${file.html.nitriq_results}" />
@@ -95,19 +70,8 @@
   </target>
 
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.nitriq_results) + path.separator + file.html.nitriq_results}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.nitriq_results) + path.separator + file.html.nitriq_results}" />
     <results display="${path::get-full-path(dirs.nitriq_results) + path.separator + file.html.nitriq_results}" />
   </target>
   
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/nunit.test.step b/build/analyzers/nunit.test.step
index 3566b40..3eecd21 100644
--- a/build/analyzers/nunit.test.step
+++ b/build/analyzers/nunit.test.step
@@ -7,17 +7,17 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="nunit.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current.file}${path.separator}${folder.references}" overwrite="false" />
   <property name="microsoft.framework" value="net-3.5" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
@@ -32,60 +32,36 @@
   <property name="test.args" value="${nunit.separator}xml=&quot;${dirs.test_results}${path.separator}nunit-results.xml&quot; ${nunit.separator}nologo ${test.args.framework}" />
   <property name="test.args.exclude" value="${nunit.separator}exclude=&quot;${tests.excluded_categories.comma_separated}&quot;" />
   <property name="app.nunit.console" value="${path::get-full-path(dirs.lib)}${path.separator}NUnit${path.separator}nunit-console.exe" overwrite="false" if="${platform::is-windows()}" />
+  <property name="app.nunit.console" value="${path::get-full-path(dirs.lib)}${path.separator}NUnit${path.separator}nunit-console-x86.exe" overwrite="false" if="${platform::is-windows() and uppercut::is-os64bit() and msbuild.platform=='x86'}" />
   <property name="app.nunit.console" value="nunit-console" overwrite="false" if="${platform::is-unix()}"/>
   <property name="dlls.test" value="" />
   <property name="tests.ran" value="false" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
  
-  <target name="go" depends="run_tasks" />
+  <target name="go" depends="run_tasks" if="${file::exists(app.nunit.console)}" />
 
   <target name="run_all_tests" depends="prepare, set_nunit_failure_mode, get_test_dlls_all, run_tests, generate_report" description="Like go but runs all tests" />
   
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks" if="${file::exists(app.nunit.console)}" >
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="set_nunit_failure_mode, get_test_dlls, run_tests, generate_report"
           description="Testing with NUnit." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.test_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.test_results}."/>
     <delete dir="${dirs.test_results}" failonerror="false" />
     <mkdir dir="${dirs.test_results}" />
   </target>
@@ -95,7 +71,7 @@
   </target>
 
   <target name="get_test_dlls">
-    <echo message="Getting test dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
+    <echo level="Warning" message="Getting test dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -114,13 +90,13 @@
     </foreach>
 
     <property name="dlls.test" value="${dll.names}" />
-    <echo message="Running NUnit against these test dlls - ${dlls.test}." />
+    <echo level="Warning" message="Running NUnit against these test dlls - ${dlls.test}." />
 
     <property name="args.test_runner" value="${dlls.test} ${test.args} ${test.args.exclude}" />
   </target>
   
   <target name="get_test_dlls_all">
-    <echo message="Getting all test dlls (including integration tests) based on name in directory ${path::get-full-path(dirs.build.code)}." />
+    <echo level="Warning" message="Getting all test dlls (including integration tests) based on name in directory ${path::get-full-path(dirs.build.code)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -137,7 +113,7 @@
     </foreach>
 
     <property name="dlls.test" value="${dll.names}" />
-    <echo message="Running NUnit against these test dlls - ${dlls.test}." />
+    <echo level="Warning" message="Running NUnit against these test dlls - ${dlls.test}." />
 
     <property name="args.test_runner" value="${dlls.test} ${test.args}" />
   </target>
@@ -145,17 +121,17 @@
   <target name="run_tests" depends="prepare" description="Running Unit Tests">
   
     <if test="${dlls.test !=''}">
-      <echo message="Running tests using NUnit and putting results in ${dirs.test_results}."/>
+      <property name="tests.ran" value="true" />
+      <echo level="Warning" message="Running tests using NUnit and putting results in ${dirs.test_results}."/>
       <exec 
           program="${app.nunit.console}" 
           workingdir="${dirs.build.code}"
           failonerror="true">
         <arg value="${args.test_runner}" />
       </exec>
-      <property name="tests.ran" value="true" />
     </if>
     <if test="${dlls.test ==''}">
-      <echo message="No test dlls to run against" />
+      <echo level="Warning" message="No test dlls to run against" />
     </if>
    
   </target>
@@ -171,19 +147,8 @@
   </target>
   
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
     <results display="${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/opencover.cover.step b/build/analyzers/opencover.cover.step
new file mode 100644
index 0000000..a6c851d
--- /dev/null
+++ b/build/analyzers/opencover.cover.step
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="OpenCover" default="go">
+    <!-- Project UppercuT - http://projectuppercut.org -->
+    <!-- DO NOT EDIT THIS FILE - OpenCover uses NUnit to run tests - find out more at http://uppercut.pbwiki.com -->
+    <property name="build.config.settings" value="__NONE__" overwrite="false" />
+    <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
+    <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
+    <include buildfile="..${path.separator}csharp.functions" />
+    <property name="file.current.no_extension" value="opencover" />
+    <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+    <property name="path.to.toplevel" value="..${path.separator}.." />
+    <property name="folder.build_scripts" value="build" overwrite="false" />
+    <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
+    <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+    <property name="folder.code_build" value="build_output" overwrite="false" />
+    <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+    <property name="folder.app.drop" value="${project.name}" overwrite="false" />
+    <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
+    <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
+    <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
+    <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
+    <property name="test.framework" value="nunit" overwrite="false" />
+    <property name="microsoft.framework" value="net-3.5" overwrite="false" />
+    <property name="number.satisfactory_coverage" value="85" overwrite="false" />
+    <property name="fail.if_opencover_fails" value="false" overwrite="false" />
+    <property name="folder.references" value="lib" overwrite="false" />
+    <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+    <property name="dirs.opencover_results" value="${path::get-full-path(dirs.build_artifacts)}${path.separator}opencover" />
+    <property name="app.opencover" value="${path::get-full-path(dirs.lib)}${path.separator}OpenCover${path.separator}OpenCover.Console.exe" overwrite="false" />
+    <property name="app.opencover.explorer" value="${path::get-full-path(dirs.lib)}${path.separator}ReportGenerator${path.separator}ReportGenerator.exe" overwrite="false" />
+    <property name="app.opencover.tester" value="${app.nunit.console}" overwrite="false" if="${test.framework=='nunit'}" />
+    <property name="app.opencover.tester" value="${app.xunit.console}" overwrite="false" if="${test.framework=='xunit'}" />
+    <property name="app.opencover.tester" value="${path::get-full-path(dirs.lib)}${path.separator}MbUnit2${path.separator}MbUnit.Cons.exe" overwrite="false" if="${test.framework=='mbunit2'}" />
+    <property name="app.opencover.tester" value="${path::get-full-path(folder.program_files)}${path.separator}Gallio${path.separator}bin${path.separator}Gallio.Host.exe" overwrite="false" if="${test.framework=='gallio'}" />
+    <property name="file.opencover_results" value="${dirs.opencover_results}${path.separator}${project.name}.opencover.xml" />
+    <property name="file.opencover_log" value="${dirs.opencover_results}${path.separator}${project.name}.opencover.log" />
+    <property name="dir.xml.code_coverage_results" value="${dirs.opencover_results}${path.separator}Xml" />
+    <property name="dir.html.code_coverage_results" value="${dirs.opencover_results}${path.separator}Html" />
+    <property name="file.xml.code_coverage_results" value="${project.name}.CodeCoverageSummary-results.xml" />
+    <property name="file.html.code_coverage_results" value="${project.name}.CodeCoverageSummary-results.html" />
+    <property name="tests.excluded_categories.comma_separated" value="Database,Integration,Slow,NotWorking" overwrite="false" />
+    <property name="test.args" value="" />
+    <property name="test.args" value="/rt:Text /rnf:mbUnit /rf:&quot;${dirs.opencover_results}&quot; /ec:${tests.excluded_categories.comma_separated}" if="${test.framework=='mbunit2'}" />
+    <property name="test.args" value="/xml:&quot;${dirs.opencover_results}${path.separator}nunit-results.xml&quot; /nologo /framework=${microsoft.framework} /exclude:${tests.excluded_categories.comma_separated}" if="${test.framework=='nunit'}" />
+    <!--property name="test.args" value="/xml:&quot;${dirs.opencover_results}\nunit-results.xml&quot; /nologo /framework=${microsoft.framework} /exclude:${tests.excluded_categories.comma_separated}" if="${test.framework=='nunit'}" /-->
+    <property name="is.replaced" value="false" />
+    <property name="fail.build.on.error" value="false" />
+    <property name="dlls.test" value="" />
+
+    <target name="go" depends="run_tasks" if="${file::exists(app.opencover) and test.framework !='none'}" />
+
+    <target name="run_tasks" if="${file::exists(app.opencover) and test.framework !='none'}">
+        <echo level="Warning" message="" />
+        <echo level="Warning" message="====================" />
+        <echo level="Warning" message="${project::get-name()}" />
+        <echo level="Warning" message="====================" />
+        <call target="prepare" if="${target::exists('prepare')}" />
+        <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+        <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
+        <call target="run_normal_tasks" if="${not is.replaced}" />
+        <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
+    </target>
+
+    <target name="run_normal_tasks"
+            depends="get_test_dlls, opencover, report_generator"
+            description="Using OpenCover to Analyze project for test quality indicators."
+            if="${file::exists(app.opencover) and test.framework !='none'}" />
+
+    <target name="prepare">
+        <echo level="Warning" message="Removing and adding ${dirs.opencover_results}."/>
+        <delete dir="${dirs.opencover_results}" failonerror="false" />
+        <mkdir dir="${dirs.opencover_results}" />
+    </target>
+
+    <target name="get_test_dlls">
+        <echo level="Warning" message="Getting test dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
+        <property name="dll.names" value="" />
+        <foreach item="File" property="dll.filename">
+            <in>
+                <items>
+                    <exclude name="${dirs.build.code}${path.separator}lib${path.separator}**" />
+                    <exclude name="${dirs.build.code}${path.separator}**${path.separator}*Database*dll" />
+                    <exclude name="${dirs.build.code}${path.separator}**${path.separator}*.Integration*dll" />
+                    <exclude name="${dirs.build.code}${path.separator}**${path.separator}TestFu.dll" />
+                    <include name="${dirs.build.code}${path.separator}**${path.separator}*Test*dll" />
+                    <include name="${dirs.build.code}${path.separator}**${path.separator}*Spec*dll" />
+                </items>
+            </in>
+            <do>
+                <property name="dll.names" value="${dll.names + ' ' + string::replace(string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\',''),'\',path.separator) + ''}" />
+            </do>
+        </foreach>
+
+        <property name="dlls.test" value="${dll.names}" />
+
+        <echo level="Warning" message="No test dlls to run against" if="${dlls.test == ''}" />
+        <echo level="Warning" message="Running OpenCover against these test dlls - ${dlls.test}" unless="${dlls.test == ''}" />
+
+        <property name="args.test_runner" value="${dlls.test} ${test.args}" />
+    </target>
+
+    <target name="opencover" if="${file::exists(app.opencover) and file::exists(app.opencover.tester) and dlls.test != ''}">
+        <echo level="Warning" message="Attempting to run OpenCover. Creating file at ${file.opencover_results} and logging at ${file.opencover_log}." />
+
+        <exec program="regsvr32.exe" verbose="true">
+            <arg value="/s" />
+            <arg value="/n" />
+            <arg value="/i:user" />
+            <arg>
+                <path>
+                    <pathelement file="${path::get-directory-name(app.opencover)}${path.separator}x86${path.separator}OpenCover.Profiler.dll" />
+                </path>
+            </arg>
+        </exec>
+
+        <exec program="${app.opencover}"
+            workingdir="${dirs.build.code}">
+            <arg value='-target:"${app.opencover.tester}"' />
+            <arg value='-targetdir:"${dirs.build.code}"' />
+            <arg value="-targetargs:${dll.names}" />
+            <arg value="-filter:+[${project.name}*]* -[${project.name}*Test*]*" />
+            <arg value='-output:"${path::get-full-path(file.opencover_results)}"' />
+        </exec>
+
+  </target>
+
+  <target name="report_generator" depends="opencover" if="${file::exists(app.opencover.explorer)}">
+
+    <echo level="Warning" message="Attempting to run ReportGenerator. Creating HTML results file at ${file.html.code_coverage_results} and XML results file at ${file.xml.code_coverage_results}." />
+
+        <exec program="${app.opencover.explorer}">
+            <arg value='"${path::get-full-path(file.opencover_results)}"' />
+            <arg value="${dir.html.code_coverage_results}" />
+            <arg value="HtmlSummary" />
+        </exec>
+
+    </target>
+
+  <target name="open_results">
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.opencover_results) + path.separator + file.html.code_coverage_results}" />
+    <results display="${path::get-full-path(dirs.opencover_results) + path.separator + file.html.code_coverage_results}" />
+  </target>
+
+</project>
diff --git a/build/analyzers/storevil.test.step b/build/analyzers/storevil.test.step
index 90692a3..db5a975 100644
--- a/build/analyzers/storevil.test.step
+++ b/build/analyzers/storevil.test.step
@@ -7,17 +7,17 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="storevil.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="microsoft.framework" value="net-3.5" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
@@ -29,56 +29,31 @@
   <property name="app.storevil.console" value="${path::get-full-path(dirs.lib)}${path.separator}StorEvil${path.separator}StorEvil.exe" overwrite="false" />
   <property name="dlls.test" value="" />
   <property name="tests.ran" value="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
  
-  <target name="go" depends="run_tasks" />
+  <target name="go" depends="run_tasks"  if="${file::exists(app.storevil.console)}" />
 
   <target name="run_all_tests" depends="prepare, set_storevil_failure_mode, get_spec_dlls_all, run_tests, generate_report" description="Like go but runs all tests" />
   
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks" if="${file::exists(app.storevil.console)}" >
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="set_storevil_failure_mode, get_spec_dlls, run_tests, generate_report"
           description="Testing with StorEvil." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.test_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.test_results}."/>
     <delete dir="${dirs.test_results}" failonerror="false" />
     <mkdir dir="${dirs.test_results}" />
   </target>
@@ -88,7 +63,7 @@
   </target>
 
   <target name="get_spec_dlls">
-    <echo message="Getting spec dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
+    <echo level="Warning" message="Getting spec dlls based on name in directory ${path::get-full-path(dirs.build.code)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -102,13 +77,13 @@
     </foreach>
 
     <property name="dlls.test" value="${dll.names}" />
-    <echo message="Running StorEvil against these spec dlls - ${dlls.test}." />
+    <echo level="Warning" message="Running StorEvil against these spec dlls - ${dlls.test}." />
 
     <property name="args.test_runner" value="${dlls.test} ${test.args} ${test.args.exclude}" />
   </target>
   
   <target name="get_spec_dlls_all">
-    <echo message="Getting all spec dlls (including integration tests) based on name in directory ${path::get-full-path(dirs.build.code)}." />
+    <echo level="Warning" message="Getting all spec dlls (including integration tests) based on name in directory ${path::get-full-path(dirs.build.code)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -122,7 +97,7 @@
     </foreach>
 
     <property name="dlls.test" value="${dll.names}" />
-    <echo message="Running StoreEvil against these spec dlls - ${dlls.test}." />
+    <echo level="Warning" message="Running StoreEvil against these spec dlls - ${dlls.test}." />
 
     <property name="args.test_runner" value="${dlls.test} ${test.args}" />
   </target>
@@ -130,7 +105,7 @@
   <target name="run_tests" depends="prepare" description="Running Unit Tests">
   
     <if test="${dlls.test !=''}">
-      <echo message="Running tests using StorEvil and putting results in ${dirs.test_results}."/>
+      <echo level="Warning" message="Running tests using StorEvil and putting results in ${dirs.test_results}."/>
       <exec 
           program="${app.storevil.console}" 
           workingdir="${dirs.build.code}"
@@ -140,7 +115,7 @@
       <property name="tests.ran" value="true" />
     </if>
     <if test="${dlls.test ==''}">
-      <echo message="No test dlls to run against" />
+      <echo level="Warning" message="No test dlls to run against" />
     </if>
    
   </target>
@@ -156,19 +131,8 @@
   </target>
   
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
     <results display="${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/test.step b/build/analyzers/test.step
index 268aba5..034a794 100644
--- a/build/analyzers/test.step
+++ b/build/analyzers/test.step
@@ -6,98 +6,70 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="test.framework" value="mbunit" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
-  <target name="go" depends="run_tasks" />
+    <target name="go" depends="load_uppercut_assemblies, run_tasks" />
+  
+  <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}..${path.separator}${file.uppercut.assembly}" />
+  <target name="load_uppercut_assemblies">
+    <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
+  </target>
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="run_tests"
           description="Testing project for quality." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="run_tests">
-    <nant buildfile="${dirs.current}${path.separator}mbunit2.test.step" inheritall="true" if="${test.framework=='mbunit2'}" />
-    <nant buildfile="${dirs.current}${path.separator}gallio.test.step" inheritall="true" if="${test.framework=='gallio'}" />
-    <nant buildfile="${dirs.current}${path.separator}nunit.test.step" inheritall="true" if="${test.framework=='nunit'}" />
-    <nant buildfile="${dirs.current}${path.separator}xunit.test.step" inheritall="true" if="${test.framework=='xunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}mbunit2.test.step" inheritall="true" if="${test.framework=='mbunit2'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}gallio.test.step" inheritall="true" if="${test.framework=='gallio'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}nunit.test.step" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}xunit.test.step" inheritall="true" if="${test.framework=='xunit'}" />
     <call target="set_normal_failure_mode" />
   </target>
 
   <target name="all">
-    <nant buildfile="${dirs.current}${path.separator}mbunit2.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='mbunit2'}" />
-    <nant buildfile="${dirs.current}${path.separator}gallio.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='gallio'}" />
-    <nant buildfile="${dirs.current}${path.separator}nunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='nunit'}" />
-    <nant buildfile="${dirs.current}${path.separator}xunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='xunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}mbunit2.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='mbunit2'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}gallio.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='gallio'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}nunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}xunit.test.step" target="run_all_tests" inheritall="true" if="${test.framework=='xunit'}" />
     <call target="set_normal_failure_mode" />
   </target>
 
   <target name="open_results">
-    <nant buildfile="${dirs.current}${path.separator}mbunit2.test.step" target="open_results" inheritall="true" if="${test.framework=='mbunit2'}" />
-    <nant buildfile="${dirs.current}${path.separator}gallio.test.step" target="open_results" inheritall="true" if="${test.framework=='gallio'}" />
-    <nant buildfile="${dirs.current}${path.separator}nunit.test.step" target="open_results" inheritall="true" if="${test.framework=='nunit'}" />
-    <nant buildfile="${dirs.current}${path.separator}xunit.test.step" target="open_results" inheritall="true" if="${test.framework=='xunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}mbunit2.test.step" target="open_results" inheritall="true" if="${test.framework=='mbunit2'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}gallio.test.step" target="open_results" inheritall="true" if="${test.framework=='gallio'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}nunit.test.step" target="open_results" inheritall="true" if="${test.framework=='nunit'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}xunit.test.step" target="open_results" inheritall="true" if="${test.framework=='xunit'}" />
   </target>
 
   <target name="set_normal_failure_mode">
     <property name="nant.onfailure" value="fail" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/analyzers/xunit.test.step b/build/analyzers/xunit.test.step
index fb0f5e4..7528a8f 100644
--- a/build/analyzers/xunit.test.step
+++ b/build/analyzers/xunit.test.step
@@ -7,17 +7,17 @@
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <include buildfile="..${path.separator}csharp.functions" />
   <property name="file.current.no_extension" value="xunit.test" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}analyzers" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="microsoft.framework" value="net-3.5" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
@@ -35,62 +35,37 @@
   <property name="tests.ran" value="false" />
   <property name="tests.run_all" value="false" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
  
-  <target name="go" depends="run_tasks" />
+  <target name="go" depends="run_tasks"  if="${file::exists(app.xunit.console)}" />
 
   <target name="run_all_tests" depends="prepare, set_run_all_flag, run_tests, generate_report" description="Like go but runs all tests" />
   
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks" if="${file::exists(app.xunit.console)}" >
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="run_tests, generate_report"
           description="Testing with NUnit." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.test_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.test_results}."/>
     <delete dir="${dirs.test_results}" failonerror="false" />
     <mkdir dir="${dirs.test_results}" />
   </target>
 
   <target name="set_run_all_flag">
-    <echo message="Running ALL test assemblies including integration and database tests with xUnit." />
+    <echo level="Warning" message="Running ALL test assemblies including integration and database tests with xUnit." />
     <property name="tests.run_all" value="true" />
   </target>
   
@@ -112,7 +87,7 @@
           <property name="dll.name" value="${string::replace(string::replace(dll.filename,path::get-full-path(dirs.build.code) + '\',''),'\',path.separator)}" />
           <property name="test.args" value="${xunit.separator}xml &quot;${dirs.test_results}${path.separator}${dll.name}-results.xml&quot; ${xunit.separator}html &quot;${dirs.test_results}${path.separator}${dll.name}-results.html&quot; ${xunit.separator}nunit &quot;${dirs.test_results}${path.separator}${dll.name}-nresults.xml&quot; " />
           <property name="args.test_runner" value="${dll.name} ${test.args} " />
-          <echo message="Running tests using xUnit with args '${args.test_runner}' and putting results in ${dirs.test_results}."/>
+          <echo level="Warning" message="Running tests using xUnit with args '${args.test_runner}' and putting results in ${dirs.test_results}."/>
           <exec 
             program="${app.xunit.console}" 
             workingdir="${dirs.build.code}"
@@ -136,19 +111,8 @@
   </target>
   
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
     <results display="${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/compile.step b/build/compile.step
index 3ac28cc..83195e9 100644
--- a/build/compile.step
+++ b/build/compile.step
@@ -6,20 +6,26 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="compile" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="dirs.build.windows.mono" value="${string::replace(dirs.build,'\','/')}" />
   <property name="folder.documentation" value="docs" overwrite="false" />
-  <property name="dirs.docs" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.documentation}" />
+  <property name="dirs.docs" value="${dirs.current}${path.separator}${folder.documentation}" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
-  <property name="dirs.db" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.database}" />
+  <property name="dirs.db" value="${dirs.current}${path.separator}${folder.database}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
+  <property name="folder.references" value="lib" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
+  <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
+  <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
+  <property name="dirs.build_results" value="${dirs.build_artifacts}${path.separator}compile" overwrite="false" />
+  <property name="msbuild.logger" value="ThoughtWorks.CruiseControl.MSBuild.XmlLogger,&quot;${dirs.lib}${path.separator}NAnt${path.separator}ThoughtWorks.CruiseControl.MSBuild.dll&quot;" />
   <property name="path_to_solution" value="." overwrite="false" />
   <property name="microsoft.framework" value="net-3.5" overwrite="false" />
   <property name="msbuild.configuration" value="Release" overwrite="false" />
@@ -27,9 +33,9 @@
   <property name="msbuild.override_output_path" value="true" overwrite="false" />
   <property name="msbuild.outputpath" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="msbuild.outputpath.windows.mono" value="${string::replace(msbuild.outputpath,'\','/')}" />
-  <property name="solution.path" value="${directory::get-parent-directory(dirs.current)}${path.separator}${path_to_solution}${path.separator}${project.name}.sln" />
-  <property name="solution.path.windows.mono" value="${string::replace(directory::get-parent-directory(dirs.current),'\','/')}/${string::replace(path_to_solution,'\','/')}/${project.name}.sln" />
-  <property name="solution.path" value="${directory::get-parent-directory(dirs.current)}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
+  <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.sln" />
+  <property name="solution.path.windows.mono" value="${string::replace(dirs.current,'\','/')}/${string::replace(path_to_solution,'\','/')}/${project.name}.sln" />
+  <property name="solution.path" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${project.name}.vbp" if="${microsoft.framework =='vb6'}" />
   <property name="nant.settings.currentframework" value="mono-2.0" if="${platform::is-unix()}" />
   <property name="nant.settings.currentframework" value="net-3.5" if="${microsoft.framework !='vb6' and platform::is-windows()}" />
   <property name="app.xbuild" value="C:\Program Files (x86)\Mono-2.8\bin\xbuild.bat" overwrite="false" if="${platform::is-windows() and file::exists('C:\Program Files (x86)\Mono-2.8\bin\xbuild.bat')}" />
@@ -37,53 +43,43 @@
   <property name="app.xbuild" value="xbuild" overwrite="false" if="${platform::is-unix()}" />
   <property name="framework.multitargeting" value="false" />
   <property name="framework.multitargeting.delimiter" value="," />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
-  <target name="go" depends="run_tasks" />
+  <target name="go" depends="load_uppercut_assemblies, run_tasks" />
+  
+  <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
+    <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
+  <target name="load_uppercut_assemblies">
+    <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
+  </target>
 
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
     <call target="check_for_multitargeting" if="${target::exists('check_for_multitargeting')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
+    <call target="set_file_attributes_to_normal" />
+  </target>
+  
+  <target name="prepare">
+    <echo message="Removing and adding ${dirs.build_results}."/>
+    <delete dir="${dirs.build_results}" failonerror="false" />
+    <mkdir dir="${dirs.build_results}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="error_check, build_code, copy_documentation, copy_db"
           description="Compiling project." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="error_check">
     <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__'}" />
@@ -91,19 +87,19 @@
 
   <target name="check_for_multitargeting">
     <if test="${string::contains(microsoft.framework,',')}">
-      <echo message="You want to multi target, eh? You passed a comma into the framework: ${microsoft.framework}" />
+      <echo level="Warning" message="You want to multi target, eh? You passed a comma into the framework: ${microsoft.framework}" />
       <property name="framework.multitargeting" value="true" />
       <property name="framework.multitargeting.delimiter" value="," />
     </if>
     <if test="${string::contains(microsoft.framework,';')}">
-      <echo message="You want to multi target, eh? You passed a semicolon into the framework: ${microsoft.framework}" />
+      <echo level="Warning" message="You want to multi target, eh? You passed a semicolon into the framework: ${microsoft.framework}" />
       <property name="framework.multitargeting" value="true" />
       <property name="framework.multitargeting.delimiter" value=";" />
     </if>
   </target>
   
   <target name="build_code" depends="" description="Building Library">
-    <echo message="Compiling ${solution.path}."/>
+    <echo level="Warning" message="Compiling ${solution.path}."/>
     <call target="build_dotNET_code" if="${microsoft.framework !='vb6'}" />
     <call target="build_vb6_code" if="${microsoft.framework =='vb6'}" />
   </target>
@@ -124,17 +120,17 @@
   </target>
   
   <target name="build_dotNet_code_framework">
-    <echo message="Building on ${framework::get-version(microsoft.framework.specific)}" />
+    <echo level="Warning" message="Building on ${framework::get-version(microsoft.framework.specific)}" />
     <property name="nant.settings.currentframework" value="${string::trim(microsoft.framework.specific)}" />
     <mkdir dir="${msbuild.outputpath}" />
     <if test="${platform::is-unix()}">
       <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-      <echo message="Cleaning build..." />
+      <echo level="Warning" message="Cleaning build..." />
       <exec program="${app.xbuild}"
           basedir="/usr/bin"
           workingdir="${dirs.build}"
           commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
-      <echo message="Building..." />
+      <echo level="Warning" message="Building..." />
       <exec program="${app.xbuild}"
           basedir="/usr/bin"
           workingdir="${dirs.build}"
@@ -146,47 +142,65 @@
         <if test="${framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
                 commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
-            <echo message='Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
+            <echo level="Warning" message='Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
                 commandline='${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
           </if>
           <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
-            <msbuild project="${solution.path}" verbosity="minimal">
+            <msbuild project="${solution.path}" verbosity="minimal" if="${microsoft.framework.specific != 'net-1.0' and microsoft.framework.specific != 'net-1.1'}">
               <property name="Configuration" value="${msbuild.configuration}" />
               <property name="OutputPath" value="${msbuild.outputpath}" />
               <property name="Platform" value="${msbuild.platform}" />
               <property name="TargetFrameworkVersion" value="v${framework::get-version(microsoft.framework.specific)}" />
               <property name="ToolsVersion" value="${framework::get-version(microsoft.framework.specific)}" />
+              <!--property name="Logger" value="${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" /-->
+              <arg line="/l:${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" />
             </msbuild>
+            <solution 
+              configuration="${msbuild.configuration}" 
+              solutionfile="${solution.path}" 
+              outputdir="${msbuild.outputpath}" 
+              platform="${msbuild.platform}" 
+              if="${microsoft.framework.specific == 'net-1.0' or microsoft.framework.specific == 'net-1.1'}" 
+            />
           </if>
         </if>
         <if test="${not framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
                 commandline="${solution.path.windows.mono} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
-            <echo message='Building without multitargeting by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
+            <echo level="Warning" message='Building without multitargeting by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
                 commandline='${solution.path.windows.mono} /nologo /property:OutputPath="${msbuild.outputpath.windows.mono}" /property:Configuration=${msbuild.configuration} /verbosity:minimal' />
           </if>
           <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
-            <msbuild project="${solution.path}" verbosity="minimal">
+            <msbuild project="${solution.path}" verbosity="minimal" if="${microsoft.framework.specific != 'net-1.0' and microsoft.framework.specific != 'net-1.1'}">
               <property name="Configuration" value="${msbuild.configuration}" />
               <property name="OutputPath" value="${msbuild.outputpath}" />
               <property name="Platform" value="${msbuild.platform}" />
+              <!--property name="Logger" value="${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" /-->
+              <arg line="/l:${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" />
             </msbuild>
+            <solution 
+              configuration="${msbuild.configuration}" 
+              solutionfile="${solution.path}" 
+              outputdir="${msbuild.outputpath}" 
+              platform="${msbuild.platform}" 
+              if="${microsoft.framework.specific == 'net-1.0' or microsoft.framework.specific == 'net-1.1'}" 
+            />
           </if>
         </if>
       </if>
@@ -194,45 +208,61 @@
         <if test="${framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build}"
                 workingdir="${dirs.build}"
                 commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
-            <echo message="Building..." />
+            <echo level="Warning" message="Building..." />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build}"
                 workingdir="${dirs.build}"
                 commandline="${solution.path} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal" />
           </if>
           <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
-            <msbuild project="${solution.path}" verbosity="minimal">
+            <msbuild project="${solution.path}" verbosity="minimal" if="${microsoft.framework.specific != 'net-1.0' and microsoft.framework.specific != 'net-1.1'}">
               <property name="Configuration" value="${msbuild.configuration}" />
               <property name="Platform" value="${msbuild.platform}" />
               <property name="TargetFrameworkVersion" value="v${framework::get-version(microsoft.framework.specific)}" />
               <property name="ToolsVersion" value="${framework::get-version(microsoft.framework.specific)}" />
+              <!--property name="Logger" value="${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" /-->
+              <arg line="/l:${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" />
             </msbuild>
+            <solution 
+              configuration="${msbuild.configuration}" 
+              solutionfile="${solution.path}" 
+              platform="${msbuild.platform}" 
+              if="${microsoft.framework.specific == 'net-1.0' or microsoft.framework.specific == 'net-1.1'}" 
+            />
           </if>
         </if>
         <if test="${not framework.multitargeting}">
           <if test="${framework::get-family(microsoft.framework.specific) == 'mono'}" >
             <!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
-            <echo message="Cleaning build..." />
+            <echo level="Warning" message="Cleaning build..." />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
                 commandline="${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" />
-            <echo message="Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal" />
+            <echo level="Warning" message="Building...by running this command ${app.xbuild} ${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal" />
             <exec program="${app.xbuild}"
                 basedir="${dirs.build.windows.mono}"
                 workingdir="${dirs.build.windows.mono}"
                 commandline="${solution.path.windows.mono} /nologo /property:Configuration=${msbuild.configuration} /verbosity:minimal" />
           </if>
           <if test="${framework::get-family(microsoft.framework.specific) != 'mono'}" >
-            <msbuild project="${solution.path}" verbosity="minimal">
+            <msbuild project="${solution.path}" verbosity="minimal" if="${microsoft.framework.specific != 'net-1.0' and microsoft.framework.specific != 'net-1.1'}">
               <property name="Configuration" value="${msbuild.configuration}" />
               <property name="Platform" value="${msbuild.platform}" />
+              <!--property name="Logger" value="${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" /-->
+              <arg line="/l:${msbuild.logger};&quot;${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml&quot;" />
             </msbuild>
+            <solution 
+              configuration="${msbuild.configuration}" 
+              solutionfile="${solution.path}" 
+              platform="${msbuild.platform}" 
+              if="${microsoft.framework.specific == 'net-1.0' or microsoft.framework.specific == 'net-1.1'}" 
+            />
           </if>
         </if>
       </if>
@@ -244,7 +274,7 @@
   </target>
 
   <target name="copy_documentation">
-    <echo message="Building documentation files to ${dirs.build}${path.separator}${folder.documentation}."/>
+    <echo level="Warning" message="Building documentation files to ${dirs.build}${path.separator}${folder.documentation}."/>
     <copy todir="${dirs.build}${path.separator}${folder.documentation}">
       <fileset basedir="${dirs.docs}">
         <include name="**/*.*" />
@@ -253,7 +283,7 @@
   </target>
 
   <target name="copy_db">
-    <echo message="Building database files to ${dirs.build}${path.separator}${folder.database}."/>
+    <echo level="Warning" message="Building database files to ${dirs.build}${path.separator}${folder.database}."/>
     <copy todir="${dirs.build}${path.separator}${folder.database}">
       <fileset basedir="${dirs.db}">
         <include name="**/*.*" />
@@ -261,15 +291,13 @@
     </copy>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
-</project>
+  <target name="set_file_attributes_to_normal">
+    <echo level="Warning" message="Removing read only attributes that some source control things put on files in '${dirs.build}'." />
+    <attrib normal="true">
+      <fileset basedir="${dirs.build}">
+        <include name="**/*" />
+      </fileset>
+    </attrib>
+  </target>  
+  
+</project>
\ No newline at end of file
diff --git a/build/customize.build b/build/customize.build
index da17317..c08ce94 100644
--- a/build/customize.build
+++ b/build/customize.build
@@ -6,10 +6,10 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="customize" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}..${path.separator}${folder.build_scripts_custom}" />
   <property name="customize.step.name" value="__REPLACE__" overwrite="false" />
   <property name="customize.step.type" value="__REPLACE__" overwrite="false" />
   <property name="customize.step.type.lowered" value="${string::to-lower(customize.step.type)}" />
@@ -17,11 +17,14 @@
   <property name="file.customized" value="" readonly="false" />
   <property name="path.to.custom_file" value="-1" />
   <property name="path.to.custom_file" value="" if="${file::exists(customize.step.name)}" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
   <target name="go" depends="run_tasks, report_finish_time" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} to create custom tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="Running ${project::get-name()} to create custom tasks." />
     <call target="prepare" if="${target::exists('prepare')}" />
     <call target="run_normal_tasks" />
   </target>
@@ -31,7 +34,7 @@
           description="Setting up a customize file for UppercuT." />
 
   <target name="error_check">
-    <echo message="Error checking - the input for customize.step.name is '${customize.step.name}' and the input for customize.step.type is '${customize.step.type}'." />
+    <echo level="Warning" message="Error checking - the input for customize.step.name is '${customize.step.name}' and the input for customize.step.type is '${customize.step.type}'." />
     <fail message="Please send in the arguments for what step to customize and what type of customization. Call customize.bat /? for usage instructions."
       if="${customize.step.name=='__REPLACE__' or customize.step.type =='__REPLACE__'}" />
     <fail message="The type of customization can only be pre, post, or replace."
@@ -40,7 +43,7 @@
 
   <target name="customize">
     <property name="file.customized" value="${path::get-file-name-without-extension(customize.step.name)}.${customize.step.type.lowered}${path::get-extension(customize.step.name)}" />
-    <echo message="Creating a customized step called ${file.customized}." />
+    <echo level="Warning" message="Creating a customized step called ${file.customized}." />
     <call target="resolve_path_to_custom_file" />
     <fail message="${file.customized} already exists in ${dirs.build_scripts_custom}. Will not run." if="${file::exists(dirs.build_scripts_custom + path.separator + file.customized)}" />
     <call target="create_file_if_not_already_existing" />
@@ -52,7 +55,7 @@
     <property name="path.to.custom_file" value="${path.separator}versioners" if="${file::exists('versioners' + path.separator + customize.step.name)}" />
     <fail message="${customize.step.name} does not exist in anywhere in the build directory." if="${path.to.custom_file=='-1'}" />
     <property name="dirs.build_scripts_custom" value="${dirs.build_scripts_custom}${path.to.custom_file}" />
-    <echo message="Found ${customize.step.name} in '${dirs.current}${path.separator}${path.to.custom_file}'. This means the custom path is going to be ${dirs.build_scripts_custom}." />
+    <echo level="Warning" message="Found ${customize.step.name} in '${dirs.current}${path.separator}${path.to.custom_file}'. This means the custom path is going to be ${dirs.build_scripts_custom}." />
   </target>
 
   <target name="create_file_if_not_already_existing">
@@ -64,14 +67,10 @@
       file="${dirs.build_scripts_custom}${path.separator}${file.customized}"
       xpath="/project/@name"
       value="CUSTOM ${string::to-upper(customize.step.type)} ${string::to-upper(path::get-file-name-without-extension(customize.step.name))}" />
-    <xmlpoke
-      file="${dirs.build_scripts_custom}${path.separator}${file.customized}"
-      xpath="/project/property[@name = 'path.to.toplevel']/@value"
-      value="..${path.separator}.." if="${path.to.custom_file !=''}" />
   </target>
 
   <target name="report_finish_time">
-    <echo message="Customize finished at ${datetime::now()}. Please make any customizations you need to now to ${dirs.build_scripts_custom}${path.separator}${file.customized} and don't forget to add it to source control." />
+    <echo level="Warning" message="Customize finished at ${datetime::now()}. Please make any customizations you need to now to ${dirs.build_scripts_custom}${path.separator}${file.customized} and don't forget to add it to source control." />
   </target>
 
 </project>
\ No newline at end of file
diff --git a/build/customizers/item.template b/build/customizers/item.template
index e47238b..d72cd0f 100644
--- a/build/customizers/item.template
+++ b/build/customizers/item.template
@@ -4,43 +4,43 @@
   <property name="build.config.settings" value="__NONE__" overwrite="false" />
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
-  <property name="dirs.build_scripts" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts}" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
-  <property name="dirs.database" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.database}" overwrite="false" />
+  <property name="dirs.database" value="${dirs.current}${path.separator}${folder.database}" overwrite="false" />
   <property name="folder.reports" value="${project.name}.Reports" overwrite="false" />
-  <property name="dirs.reports" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.reports}" overwrite="false" />
+  <property name="dirs.reports" value="${dirs.current}${path.separator}${folder.reports}" overwrite="false" />
   <property name="folder.file_server" value="file.server" overwrite="false" />
-  <property name="dirs.file_server" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.file_server}" overwrite="false" />
+  <property name="dirs.file_server" value="${dirs.current}${path.separator}${folder.file_server}" overwrite="false" />
   <property name="folder.environment_files" value="environment.files" overwrite="false" />
-  <property name="dirs.environment_files" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.environment_files}" overwrite="false" />
+  <property name="dirs.environment_files" value="${dirs.current}${path.separator}${folder.environment_files}" overwrite="false" />
   <property name="folder.deployment" value="deployment" overwrite="false" />
-  <property name="dirs.deployment" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.deployment}" overwrite="false" />
+  <property name="dirs.deployment" value="${dirs.current}${path.separator}${folder.deployment}" overwrite="false" />
   <property name="folder.settings" value="settings" overwrite="false" />
-  <property name="dirs.settings" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.settings}" overwrite="false" />
+  <property name="dirs.settings" value="${dirs.current}${path.separator}${folder.settings}" overwrite="false" />
   <property name="folder.documentation" value="docs" overwrite="false" />
-  <property name="dirs.docs" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.documentation}" overwrite="false" />
+  <property name="dirs.docs" value="${dirs.current}${path.separator}${folder.documentation}" overwrite="false" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
+    <echo level="Warning" message="" />
     <!-- INSERT YOUR TASKS HERE OR CALL OUT TO OTHER TASKS -->
     <!-- Sample provided below that you can customize -->
   </target>
   
   <!--<target name="documentation">
-    <echo message="Packaging documentation files to ${dirs.drop}${path.separator}${folder.documentation}."/>
+    <echo level="Warning" message="Packaging documentation files to ${dirs.drop}${path.separator}${folder.documentation}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.documentation}">
       <fileset basedir="${dirs.build}${path.separator}${folder.documentation}">
         <include name="**/*.*" />
diff --git a/build/default.build b/build/default.build
index 5c5a414..bd928e6 100644
--- a/build/default.build
+++ b/build/default.build
@@ -6,16 +6,17 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="default" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="log.build" value="${dirs.build}${path.separator}build.log" />
+  <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="company.name" value="__COMPANY_NAME__" overwrite="false" />
@@ -27,76 +28,62 @@
   <property name="version.build" value="0" />
   <property name="version.revision" value="0" />
   <property name="version.hash" value="${version.revision}" overwrite="false" />
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
   <property name="run.ilmerge" value="false" overwrite="false" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
-    <property name="obfuscate" value="false" overwrite="false" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
+  <property name="obfuscate" value="false" overwrite="false" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.build" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.build" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.build" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
-  <target name="go" depends="prepare, start_recorder, report_start_time, load_uppercut_assemblies, allow_powershell_unrestricted, report_uppercut_version, run_tasks, report_finish_time, stop_recorder" />
+  <target name="go" depends="prepare, start_recorder, report_start_time, load_uppercut_assemblies, report_uppercut_version, run_tasks, report_finish_time, stop_recorder" />
 
   <target name="start_recorder">
     <record name="${log.build}" autoflush="true" level="Info" action="Start" failonerror="false" />
   </target>
   
   <target name="report_start_time">
-    <echo message="Build for ${project.name} started at ${datetime::now()} with UppercuT." />
+    <echo level="Warning" message="Build for ${project.name} started at ${datetime::now()} with UppercuT." />
   </target>
   
   <target name="stop_recorder">
     <record name="${log.build}" action="Flush" failonerror="false" />
     <record name="${log.build}" action="Stop" failonerror="false" />
     <record name="${log.build}" action="Close" failonerror="false" />
+    <copy
+      file="${log.build}"
+      todir="${dirs.drop}${path.separator}${folder.build_artifacts}"
+      />
+    <echo level="Warning" message="See '${dirs.drop}${path.separator}${folder.build_artifacts}${path.separator}build.log' for detailed build log information." />
   </target>
   
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <!--call target="prepare" if="${target::exists('prepare')}" /-->
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="error_check, build"
           description="Building with UppercuT default.build." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.build}."/>
-    <delete dir="${dirs.build}" failonerror="false" />
+    <echo level="Warning" message="Removing and adding ${dirs.build}."/>
     <mkdir dir="${dirs.build}" failonerror="false" />
+    <delete dir="${dirs.build}\build_artifacts" failonerror="false" />
+    <delete dir="${dirs.build}\${folder.documentation}" failonerror="false" />
+    <delete dir="${dirs.build}\${folder.environment_files}" failonerror="false" />
+    <delete dir="${dirs.build}\${folder.database}" failonerror="false" />
+    <delete dir="${dirs.build}\${folder.reports}" failonerror="false" />
+    <delete dir="${dirs.build}\${folder.file_server}" failonerror="false" />
+    <delete dir="${dirs.build}\${folder.app.drop}" failonerror="false" />
   </target>
 
   <target name="error_check">
@@ -109,60 +96,53 @@
     <call target="get_build_number" />
     <call target="get_drop_directory" />
 
-    <nant buildfile="${dirs.current}${path.separator}policyChecks.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}versionBuilder.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}generateBuildInfo.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}compile.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}environmentBuilder.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}analyze.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}obfuscate.step" inheritall="true" if="${obfuscate}" />
-    <nant buildfile="${dirs.current}${path.separator}package.step" inheritall="true" />
-    <nant buildfile="${dirs.current}${path.separator}ilmerge.build" inheritall="true" if="${run.ilmerge}" />
-    <nant buildfile="${dirs.current}${path.separator}gemsPrepare.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}gemsBuild.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}nugetPrepare.step" inheritall="true" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}nugetBuild.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}policyChecks.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}versionBuilder.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}generateBuildInfo.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}compile.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}environmentBuilder.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}analyze.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}obfuscate.step" inheritall="true" if="${obfuscate}" />
+    <nant buildfile="${dirs.current.file}${path.separator}package.step" inheritall="true" />
+    <nant buildfile="${dirs.current.file}${path.separator}ilmerge.build" inheritall="true" if="${run.ilmerge}" />
+    <nant buildfile="${dirs.current.file}${path.separator}gemsPrepare.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}gemsBuild.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}nugetPrepare.step" inheritall="true" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}nugetBuild.step" inheritall="true" failonerror="false" />
   </target>
 
   <target name="get_revision">
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}svn.step" inheritall="true" if="${source_control_type=='svn'}" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" failonerror="false" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}hg.step" inheritall="true" if="${source_control_type=='hg'}" failonerror="false" />
-    <!--<nant buildfile="${dirs.current}${path.separator}versioners${path.separator}vault.step" inheritall="true" if="${source_control_type=='vault'}" />-->
-    <!--<nant buildfile="${dirs.current}${path.separator}versioners${path.separator}vss.step" inheritall="true" if="${source_control_type=='vss'}" />-->
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}svn.step" inheritall="true" if="${source_control_type=='svn'}" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" failonerror="false" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}hg.step" inheritall="true" if="${source_control_type=='hg'}" failonerror="false" />
+    <!--<nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}vault.step" inheritall="true" if="${source_control_type=='vault'}" />-->
+    <!--<nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}vss.step" inheritall="true" if="${source_control_type=='vss'}" />-->
 
     <property name="version.revision" value="${environment::get-variable('uc.app.revision')}" if="${environment::variable-exists('uc.app.revision')}" />
     <property name="version.hash" value="${environment::get-variable('uc.app.revision.hash')}" if="${environment::variable-exists('uc.app.revision.hash')}" />
     <property name="version.hash" value="${version.revision}" if="${version.hash == '0'}" />
-    <echo message="Using revision number: ${version.revision} and hash: ${version.hash}." />
+    <echo level="Warning" message="Using revision number: ${version.revision} and hash: ${version.hash}." />
   </target>
 
   <target name="get_build_number">
     <property name="version.build" value="${environment::get-variable('CCNetNumericLabel')}" if="${environment::variable-exists('CCNetNumericLabel')}" />
     <property name="version.build" value="${environment::get-variable('BUILD_NUMBER')}" if="${environment::variable-exists('BUILD_NUMBER')}" />
-    <echo message="Using build number ${version.build}." />
+    <echo level="Warning" message="Using build number ${version.build}." />
   </target>
 
   <target name="get_drop_directory">
     <property name="dirs.drop" value="${environment::get-variable('CCNetArtifactDirectory')}${path.separator}b${version.build}-r${version.revision}" if="${environment::variable-exists('CCNetArtifactDirectory')}" />
     <!--Point TeamCity at code_drop for an artifact directory. It will automatically save the files. -->
-    <echo message="Compiled code drop directory will be ${path::get-full-path(dirs.drop)}." />
-  </target>
-
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
+    <echo level="Warning" message="Compiled code drop directory will be ${path::get-full-path(dirs.drop)}." />
   </target>
 
   <target name="report_finish_time">
-    <echo message="Build for ${project.name} finished at ${datetime::now()} with UppercuT version ${version.uppercut}." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()} - FINISHED!" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="Build for ${project.name} finished at ${datetime::now()} with UppercuT version ${version.uppercut}." />
   </target>
 
   <target name="report_uppercut_version">
@@ -171,22 +151,11 @@
       xpath="/uppercut/version"
       property="version.uppercut"
       failonerror="false" />
-    <echo message="Using UppercuT version: ${version.uppercut}." />
+    <echo level="Warning" message="Using UppercuT version: ${version.uppercut}." />
   </target>
 
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
 
-  <target name="allow_powershell_unrestricted">
-    <!-- powershell 1.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted" />
-    </exec>
-    <!-- powershell 2.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted -force -scope CurrentUser" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/deploymentBuilder.step b/build/deploymentBuilder.step
index d3c3cbb..ee7baa4 100644
--- a/build/deploymentBuilder.step
+++ b/build/deploymentBuilder.step
@@ -6,99 +6,99 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="deploymentBuilder" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.deployment" value="deployment" overwrite="false" />
   <property name="dirs.deployment" value="${dirs.drop}${path.separator}${folder.deployment}" overwrite="false" />
   <property name="folder.settings" value="settings" overwrite="false" />
   <property name="dirs.deployment.settings" value="${dirs.drop}${path.separator}${folder.settings}" overwrite="false" />
-  <property name="dirs.deployment.templates" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.deployment}${path.separator}templates" overwrite="false" />
-  <property name="folder.deployment.settings.templates" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.deployment}${path.separator}Settings" overwrite="false" />
+  <property name="dirs.deployment.templates" value="${dirs.current}${path.separator}${folder.deployment}${path.separator}templates" overwrite="false" />
+  <property name="dirs.deployment.templates.holding" value="${dirs.deployment}${path.separator}templateHolding" overwrite="false" />
+  <property name="dirs.src.deployment.settings.templates" value="${dirs.current}${path.separator}${folder.deployment}${path.separator}Settings" overwrite="false" />
+  <property name="dirs.deployment.settings.templates.holding" value="${dirs.deployment}${path.separator}settingsHolding" overwrite="false" />
   <property name="dirs.deployment.settings.templates" value="${dirs.drop}${path.separator}${folder.deployment}${path.separator}Settings" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
+
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
-          depends="build_deployments, build_deployments_settings"
+          depends="copy_templates, copy_settings_templates, set_file_attributes_to_normal, build_deployments, build_deployments_settings"
           description="Deployment File Builder"
           if="${directory::exists(dirs.deployment.templates)}" />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
+  <target name="copy_templates" if="${directory::exists(dirs.deployment.templates)}">
+     <copy todir="${dirs.deployment.templates.holding}">
+      <fileset basedir="${dirs.deployment.templates}">
+        <include name="**/**" />
+      </fileset>
+    </copy>
   </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
+  
+  <target name="copy_settings_templates" if="${directory::exists(dirs.src.deployment.settings.templates)}">
+     <copy todir="${dirs.deployment.settings.templates.holding}">
+      <fileset basedir="${dirs.src.deployment.settings.templates}">
+        <include name="**/**" />
+      </fileset>
+    </copy>
   </target>
-
-  <target name="build_deployments" if="${directory::exists(dirs.deployment.templates)}" >
-    <buildTemplateFiles
-      settingsFilesDirectory="${dirs.deployment.settings}"
-      templatesDirectory="${dirs.deployment.templates}"
-      destinationDirectory="${dirs.deployment}"
-      templateExtension=".BAT"
-      keepExtension="true"
-      useEnvironmentSubdirectory="false"
-	  />
-  </target>
-
-  <target name="build_deployments_settings" if="${directory::exists(folder.deployment.settings.templates)}" >
-    <buildTemplateFiles
-      settingsFilesDirectory="${dirs.deployment.settings}"
-      templatesDirectory="${folder.deployment.settings.templates}"
-      destinationDirectory="${dirs.deployment.settings.templates}"
-      templateExtension=".BAT"
-      keepExtension="true"
-	  />
+  
+  <target name="set_file_attributes_to_normal">
+    <echo level="Warning" message="Removing read only attributes that some source control things put on files in '${dirs.deployment}'." />
+    <attrib normal="true">
+      <fileset basedir="${dirs.deployment}">
+        <include name="**/*" />
+      </fileset>
+    </attrib>
+  </target> 
+  
+  <target name="build_deployments" if="${directory::exists(dirs.deployment.templates.holding)}" >
+    <echo level="Warning" message="DeploymentBuilder: Building Templates in '${dirs.deployment}' with '*.bat' as the name." />
+    <!--loglevel level="Info" -->
+      <buildTemplateFiles
+        settingsFilesDirectory="${dirs.deployment.settings}"
+        templatesDirectory="${dirs.deployment.templates.holding}"
+        destinationDirectory="${dirs.deployment}"
+        templateExtension=".BAT"
+        keepExtension="true"
+        useEnvironmentSubdirectory="false"
+      />
+    <!--/loglevel -->
+    <delete dir="${dirs.deployment.templates.holding}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
+  <target name="build_deployments_settings" if="${directory::exists(dirs.deployment.settings.templates.holding)}" >
+    <echo level="Warning" message="DeploymentBuilder Part Deuce: Building Templates in '${dirs.deployment.settings.templates}' with '*.bat' as the name." />
+    <!--loglevel level="Info" -->
+        <buildTemplateFiles
+        settingsFilesDirectory="${dirs.deployment.settings}"
+        templatesDirectory="${dirs.deployment.settings.templates.holding}"
+        destinationDirectory="${dirs.deployment.settings.templates}"
+        templateExtension=".BAT"
+        keepExtension="true"
+      />
+    <!--/loglevel -->
+    <delete dir="${dirs.deployment.settings.templates.holding}" />
   </target>
 
 </project>
\ No newline at end of file
diff --git a/build/environmentBuilder.step b/build/environmentBuilder.step
index 9ea5cee..eac9d01 100644
--- a/build/environmentBuilder.step
+++ b/build/environmentBuilder.step
@@ -6,99 +6,92 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="environmentBuilder" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.environment_files" value="environment.files" overwrite="false" />
   <property name="dirs.build.environmentfiles" value="${dirs.build}${path.separator}${folder.environment_files}" overwrite="false" />
   <property name="folder.settings" value="settings" overwrite="false" />
-  <property name="dirs.environments.settings" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.settings}" overwrite="false" />
+  <property name="dirs.environments.settings" value="${dirs.current}${path.separator}${folder.settings}" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
   <property name="folder.documentation" value="docs" overwrite="false" />
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="dirs.build.database" value="${dirs.build}${path.separator}${folder.database}" overwrite="false" />
   <property name="dirs.build.docs" value="${dirs.build}${path.separator}${folder.documentation}" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="build_code_environment_files, build_database_environment_files, build_doc_environment_files, build_other_documentation_files"
           description="Building Environment Files." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="build_code_environment_files" if="${directory::exists(dirs.environments.settings)}" >
-    <buildTemplateFiles
-      settingsFilesDirectory="${dirs.environments.settings}"
-      templatesDirectory="${dirs.build.code}"
-      destinationDirectory="${dirs.build.environmentfiles}"
-      useEnvironmentSubdirectory="true"
-      />
+    <echo level="Warning" message="----------------" />
+    <echo level="Warning" message="ConfigBuilder: Building Templates from '${dirs.build.code}' with '*.template' as the name." />
+    <echo level="Warning" message="----------------" />
+    <!--loglevel level="Info" -->
+      <buildTemplateFiles
+        settingsFilesDirectory="${dirs.environments.settings}"
+        templatesDirectory="${dirs.build.code}"
+        destinationDirectory="${dirs.build.environmentfiles}"
+        useEnvironmentSubdirectory="true"
+        />
+    <!--/loglevel -->
   </target>
 
   <target name="build_database_environment_files" if="${directory::exists(dirs.environments.settings)}" >
-    <buildTemplateFiles
-      settingsFilesDirectory="${dirs.environments.settings}"
-      templatesDirectory="${dirs.build.database}"
-      destinationDirectory="${dirs.build.database}"
-      />
+    <echo level="Warning" message="----------------" />
+    <echo level="Warning" message="SQLBuilder: Building Templates from '${dirs.build.database}' with '*.template' as the name." />
+    <echo level="Warning" message="----------------" />
+    <!--loglevel level="Info"-->
+      <buildTemplateFiles
+        settingsFilesDirectory="${dirs.environments.settings}"
+        templatesDirectory="${dirs.build.database}"
+        destinationDirectory="${dirs.build.database}"
+        />
+    <!--/loglevel -->
   </target>
 
   <target name="build_doc_environment_files" if="${directory::exists(dirs.environments.settings)}" >
-    <buildTemplateFiles
-      settingsFilesDirectory="${dirs.environments.settings}"
-      templatesDirectory="${dirs.build.docs}"
-      destinationDirectory="${dirs.build.docs}"
-      templateExtension=".xml"
-      keepExtension="true"
-      />
+    <echo level="Warning" message="----------------" />
+    <echo level="Warning" message="DocumentBuilder: Building Templates from '${dirs.build.docs}' with '*.xml' as the name." />
+    <echo level="Warning" message="----------------" />
+    <!--loglevel level="Info" -->
+      <buildTemplateFiles
+        settingsFilesDirectory="${dirs.environments.settings}"
+        templatesDirectory="${dirs.build.docs}"
+        destinationDirectory="${dirs.build.docs}"
+        templateExtension=".xml"
+        keepExtension="true"
+        />
+    <!--/loglevel -->
   </target>
 
   <target name="build_other_documentation_files" if="${directory::exists(dirs.environments.settings)}" >
+    <echo level="Warning" message="----------------" />
+    <echo level="Warning" message="DocumentBuilder Part Deux: Building Templates from '${dirs.build.docs}' with '*.template' as the name." />
+    <echo level="Warning" message="----------------" />
     <buildTemplateFiles
       settingsFilesDirectory="${dirs.environments.settings}"
       templatesDirectory="${dirs.build.docs}"
@@ -106,15 +99,4 @@
       />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
diff --git a/build/gemsBuild.step b/build/gemsBuild.step
index 8b79cc9..4b18dc0 100644
--- a/build/gemsBuild.step
+++ b/build/gemsBuild.step
@@ -6,15 +6,15 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="gemsBuild" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
@@ -25,7 +25,7 @@
   <property name="folder.settings" value="settings" overwrite="false" />
   <property name="folder.documentation" value="docs" overwrite="false" />
   <property name="folder.gems" value="gems" overwrite="false" />
-  <property name="dirs.gems" value="${path.to.toplevel}${path.separator}${folder.gems}" overwrite="false" />
+  <property name="dirs.gems" value="${dirs.current}${path.separator}${folder.gems}" overwrite="false" />
   <property name="dirs.drop.gems" value="${dirs.drop}${path.separator}${folder.gems}" overwrite="false" />
   <property name="folder.gems.exists" value="${directory::exists(dirs.gems)}" />
   <property name="version.major" value="1" overwrite="false" />
@@ -34,53 +34,28 @@
   <property name="version.revision" value="0" overwrite="false" />
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" if="${folder.gems.exists}" />
 
   <target name="run_tasks" if="${folder.gems.exists}">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="build_gem, remove_gem_files"
           description="Building gems." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-  
   <target name="build_gem">
-    <echo message="Finding and building all gems in ${dirs.drop.gems}."/>
+    <echo level="Warning" message="Finding and building all gems in ${dirs.drop.gems}."/>
     <foreach item="File" property="spec.file">
       <in>
         <items>
@@ -107,15 +82,4 @@
     </delete>
   </target>
   
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/gemsPrepare.step b/build/gemsPrepare.step
index a6a40d6..3fceda5 100644
--- a/build/gemsPrepare.step
+++ b/build/gemsPrepare.step
@@ -6,15 +6,15 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="gemsPrepare" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
@@ -25,7 +25,7 @@
   <property name="folder.settings" value="settings" overwrite="false" />
   <property name="folder.documentation" value="docs" overwrite="false" />
   <property name="folder.gems" value="gems" overwrite="false" />
-  <property name="dirs.gems" value="${path.to.toplevel}${path.separator}${folder.gems}" overwrite="false" />
+  <property name="dirs.gems" value="${dirs.current}${path.separator}${folder.gems}" overwrite="false" />
   <property name="dirs.drop.gems" value="${dirs.drop}${path.separator}${folder.gems}" overwrite="false" />
   <property name="folder.gems.exists" value="${directory::exists(dirs.gems)}" />
   <property name="version.use_semanticversioning" value="false" overwrite="false" />
@@ -41,21 +41,20 @@
   <property name="gem.build.date" value="20100801" overwrite="false" />
   <property name="file.gems.version" value="${dirs.drop.gems}${path.separator}VERSION" />
   
-  
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" if="${folder.gems.exists}" />
 
   <target name="run_tasks" if="${folder.gems.exists}">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
@@ -63,38 +62,13 @@
           description="Packaging gems." />
 
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.drop.gems}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.drop.gems}."/>
     <delete dir="${dirs.drop.gems}" failonerror="false" />
     <mkdir dir="${dirs.drop.gems}" />
   </target>
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="copy_gems_folder">
-    <echo message="Packaging gem specifications and special files from ${dirs.gems} to ${dirs.drop.gems}."/>
+    <echo level="Warning" message="Packaging gem specifications and special files from ${dirs.gems} to ${dirs.drop.gems}."/>
     <copy todir="${dirs.drop.gems}">
       <fileset basedir="${dirs.gems}">
         <include name="**/**" />
@@ -103,7 +77,7 @@
   </target>
   
   <target name="copy_app_drop_to_lib_folder">
-    <echo message="Packaging application gem pieces into ${dirs.drop.gems}${path.separator}lib from ${dirs.drop}${path.separator}${folder.app.drop}."/>
+    <echo level="Warning" message="Packaging application gem pieces into ${dirs.drop.gems}${path.separator}lib from ${dirs.drop}${path.separator}${folder.app.drop}."/>
     <copy todir="${dirs.drop.gems}${path.separator}lib">
       <fileset basedir="${dirs.drop}${path.separator}${folder.app.drop}">
         <include name="**/**" />
@@ -112,7 +86,7 @@
   </target>
   
   <target name="copy_docs_to_doc_folder">
-    <echo message="Packaging docs to ${dirs.drop.gems}${path.separator}docs."/>
+    <echo level="Warning" message="Packaging docs to ${dirs.drop.gems}${path.separator}docs."/>
     <copy todir="${dirs.drop.gems}${path.separator}docs" failonerror="false">
       <fileset basedir="${dirs.drop}${path.separator}${folder.documentation}">
         <include name="**/**" />
@@ -121,10 +95,10 @@
   </target>
   
   <target name="copy_notices_to_doc_folder">
-    <echo message="Packaging readme file to ${dirs.drop.gems}${path.separator}docs."/>
-    <copy file="${dirs.current}${path.separator}..${path.separator}README.markdown" tofile="${dirs.drop.gems}${path.separator}docs${path.separator}README" failonerror="false" />
+    <echo level="Warning" message="Packaging readme file to ${dirs.drop.gems}${path.separator}docs."/>
+    <copy file="${dirs.current}README.markdown" tofile="${dirs.drop.gems}${path.separator}docs${path.separator}README" failonerror="false" />
     
-    <echo message="Packaging other legal stuff to ${dirs.drop.gems}${path.separator}docs."/>
+    <echo level="Warning" message="Packaging other legal stuff to ${dirs.drop.gems}${path.separator}docs."/>
     <copy todir="${dirs.drop.gems}${path.separator}docs" failonerror="false">
       <fileset basedir="${dirs.drop}${path.separator}LEGAL">
         <include name="**/*" />
@@ -144,21 +118,10 @@
   </target>
   
   <target name="generate_version_file">
-    <echo message="Generating ${file.gems.version} with ${assembly.version.full}${version.gem.suffix} for the version" if="${not use.gem.build_date}" />
-    <echo file="${file.gems.version}" if="${not use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}${version.gem.suffix}</echo>
-    <echo message="Generating ${file.gems.version} with ${assembly.version.full}.${gem.build.date}${version.gem.suffix} for the version" if="${use.gem.build_date}" />
-    <echo file="${file.gems.version}" if="${use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}.${gem.build.date}${version.gem.suffix}</echo>
+    <echo level="Warning" message="Generating ${file.gems.version} with ${assembly.version.full}${version.gem.suffix} for the version" if="${not use.gem.build_date}" />
+    <echo level="Warning" file="${file.gems.version}" if="${not use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}${version.gem.suffix}</echo>
+    <echo level="Warning" message="Generating ${file.gems.version} with ${assembly.version.full}.${gem.build.date}${version.gem.suffix} for the version" if="${use.gem.build_date}" />
+    <echo level="Warning" file="${file.gems.version}" if="${use.gem.build_date}" append="false" failonerror="false">${assembly.version.full}.${gem.build.date}${version.gem.suffix}</echo>
   </target>
   
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/generateBuildInfo.step b/build/generateBuildInfo.step
index af43754..556a1f4 100644
--- a/build/generateBuildInfo.step
+++ b/build/generateBuildInfo.step
@@ -6,13 +6,13 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="generateBuildInfo" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="file.build_info" value="${dirs.build}${path.separator}_BuildInfo.xml" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="company.name" value="__COMPANY_NAME__" overwrite="false" />
@@ -29,55 +29,30 @@
   <property name="msbuild.configuration" value="Release" overwrite="false" />
   <property name="msbuild.platform" value="Any CPU" overwrite="false" />
   <property name="version.uppercut" value="0" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="generate_build_info_file"
           description="Generating Build Information File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="generate_build_info_file">
-    <echo message="Generating XML file with some information to possibly get merged in at ${file.build_info}."/>
-    <echo file="${file.build_info}" append="false" failonerror="false">
+    <echo level="Warning" message="Generating XML file with some information to possibly get merged in at ${file.build_info}."/>
+    <echo level="Warning" file="${file.build_info}" append="false" failonerror="false">
       <![CDATA[<?xml version="1.0" ?>
 <buildInfo>
   <projectName>${project.name}</projectName>
@@ -97,15 +72,4 @@
     </echo>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/ilmerge.build b/build/ilmerge.build
index 5e54cca..8d4599f 100644
--- a/build/ilmerge.build
+++ b/build/ilmerge.build
@@ -5,21 +5,23 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="ilmerge" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />  
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}lib" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}lib" overwrite="false" />
   <property name="dirs.ilmerge.folder" value="${dirs.lib}${path.separator}ILMerge" />
   <property name="app.ilmerge" value="${dirs.ilmerge.folder}${path.separator}ILMerge.exe" overwrite="false"  />
   <property name="dirs.merge.log" value="${dirs.drop}${path.separator}build_artifacts${path.separator}ilmerge" />
   <property name="log.merge" value="ilmerge.log" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
   <property name="dirs.merge.from" value="${dirs.drop}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="dirs.merge.to" value="${dirs.drop}${path.separator}merge" overwrite="false" />
@@ -32,53 +34,27 @@
   <property name="args.ilmerge" value="/internalize /target:${merge.target.type} /out:${dirs.merge.to}${path.separator}${file.merge.name} /log:${dirs.merge.log}${path.separator}${log.merge} /xmldocs /ndebug /allowDup ${file.merge.name} " />
   <property name="args.ilmerge" value="/internalize:${path.file.internalize.ignore} /target:${merge.target.type} /out:${dirs.merge.to}${path.separator}${file.merge.name} /log:${dirs.merge.log}${path.separator}${log.merge} /xmldocs /ndebug /allowDup ${file.merge.name} " if="${file::exists(path.file.internalize.ignore)}"/>
 
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.build" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.build" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.build" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
-  <target name="go" depends="load_uppercut_assemblies, allow_powershell_unrestricted, run_tasks" />
+  <target name="go" depends="load_uppercut_assemblies, run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="set_environment_variables, error_check, get_regular_dlls, run_ilmerge, copy_configs, remove_unneeded_assemblies, copy_from_merge, delete_merge_folder"
           description="Running ILMerge with UppercuT default.build." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="set_environment_variables">
     <property name="dirs.merge.from" value="${environment::get-variable('uc.dirs.merge.from')}" if="${environment::variable-exists('uc.dirs.merge.from')}" />
     <property name="dirs.merge.to" value="${environment::get-variable('uc.dirs.merge.to')}" if="${environment::variable-exists('uc.dirs.merge.to')}" />
@@ -99,7 +75,7 @@
   </target>
 
   <target name="get_regular_dlls">
-    <echo message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
+    <echo level="Warning" message="Getting output dlls based on name in directory ${path::get-full-path(dirs.merge.from)}." />
     <property name="dll.names" value="" />
     <foreach item="File" property="dll.filename">
       <in>
@@ -119,8 +95,8 @@
   </target>
 
   <target name="run_ilmerge">
-    <echo message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}${path.separator}${file.merge.name}. This will fail if all dependencies are not resolved."/>
-    <echo message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
+    <echo level="Warning" message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}${path.separator}${file.merge.name}. This will fail if all dependencies are not resolved."/>
+    <echo level="Warning" message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
     <exec program="${app.ilmerge}"
           workingdir="${dirs.merge.from}"
           commandline="${args.ilmerge}" />
@@ -135,7 +111,7 @@
   </target>
 
   <target name="remove_unneeded_assemblies">
-    <echo message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
+    <echo level="Warning" message="Removing unneeded assemblies before moving the merged assembly back into ${dirs.merge.from}."/>
     <delete>
       <fileset basedir="${dirs.merge.from}" >
         <include name="*.*" />
@@ -155,30 +131,8 @@
     <delete dir="${dirs.merge.to}" failonerror="false"  />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
-
-  <target name="allow_powershell_unrestricted">
-    <!-- powershell 1.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted" />
-    </exec>
-    <!-- powershell 2.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted -force -scope CurrentUser" />
-    </exec>
-  </target>
   
 </project>
\ No newline at end of file
diff --git a/build/nugetBuild.step b/build/nugetBuild.step
index 6320ab8..509f90d 100644
--- a/build/nugetBuild.step
+++ b/build/nugetBuild.step
@@ -6,15 +6,16 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="nugetBuild" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
@@ -25,7 +26,7 @@
   <property name="folder.settings" value="settings" overwrite="false" />
   <property name="folder.documentation" value="docs" overwrite="false" />
   <property name="folder.nuget" value="nuget" overwrite="false" />
-  <property name="dirs.nuget" value="${path.to.toplevel}${path.separator}${folder.nuget}" overwrite="false" />
+  <property name="dirs.nuget" value="${dirs.current}${path.separator}${folder.nuget}" overwrite="false" />
   <property name="dirs.drop.nuget" value="${dirs.drop}${path.separator}${folder.nuget}" overwrite="false" />
   <property name="folder.nuget.exists" value="${directory::exists(dirs.nuget)}" />
   <property name="version.major" value="1" overwrite="false" />
@@ -37,63 +38,39 @@
   <property name="app.nuget" value="${path::get-full-path(app.nuget)}" />
   <property name="app.nuget.exists" value="${file::exists(app.nuget)}" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" if="${folder.nuget.exists and app.nuget.exists}" />
 
   <target name="run_tasks" if="${folder.nuget.exists}">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
+
   <target name="run_normal_tasks"
-          depends="build_nugget, remove_nuget_files"
+          depends="build_nugget,remove_nuget_files"
           description="Building nuget." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-  
   <target name="build_nugget">
-    <echo message="Finding and building all nuggets in ${dirs.drop.nuget}."/>
+    <echo level="Warning" message="Finding and building all nuggets in ${dirs.drop.nuget}."/>
     <foreach item="File" property="spec.file">
       <in>
         <items>
-          <include name="${dirs.drop.nuget}${path.separator}*.nuspec" />
+          <include name="${dirs.drop.nuget}${path.separator}**${path.separator}*.nuspec" />
         </items>
       </in>
       <do>
-        <echo message="executing '${app.nuget} pack ${spec.file}'" />
+        <echo level="Warning" message="executing '${app.nuget} pack ${spec.file}'" />
         <exec 
           program="cmd" 
-          workingdir="${dirs.drop.nuget}"
+          workingdir="${directory::get-parent-directory(spec.file)}"
           failonerror="false">
             <arg value="/c ${app.nuget} pack ${spec.file}" />
         </exec>
@@ -104,21 +81,10 @@
   <target name="remove_nuget_files">
     <delete>
       <fileset basedir="${dirs.drop.nuget}" >
-        <exclude name="*.nupkg" />
+        <exclude name="**/*.nupkg" />
         <include name="**/*" />
       </fileset>
     </delete>
   </target>
-  
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
 
 </project>
\ No newline at end of file
diff --git a/build/nugetPrepare.step b/build/nugetPrepare.step
index ef6b3f8..7974df2 100644
--- a/build/nugetPrepare.step
+++ b/build/nugetPrepare.step
@@ -6,16 +6,16 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="nugetPrepare" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
   <property name="project.name" value="app" overwrite="false" />
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
@@ -26,7 +26,7 @@
   <property name="folder.settings" value="settings" overwrite="false" />
   <property name="folder.documentation" value="docs" overwrite="false" />
   <property name="folder.nuget" value="nuget" overwrite="false" />
-  <property name="dirs.nuget" value="${path.to.toplevel}${path.separator}${folder.nuget}" overwrite="false" />
+  <property name="dirs.nuget" value="${dirs.current}${path.separator}${folder.nuget}" overwrite="false" />
   <property name="dirs.drop.nuget" value="${dirs.drop}${path.separator}${folder.nuget}" overwrite="false" />
   <property name="folder.nuget.exists" value="${directory::exists(dirs.nuget)}" />
   <property name="version.use_semanticversioning" value="false" overwrite="false" />
@@ -39,59 +39,34 @@
   <property name="assembly.version.full" value="${version.major}.${version.minor}.${version.patch}.0"  if="${version.use_semanticversioning}" />
   <property name="file.nuget.version" value="${dirs.drop.nuget}${path.separator}version.xml" />
   
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" if="${folder.nuget.exists}" />
 
   <target name="run_tasks" if="${folder.nuget.exists}">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
-          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, update_nuspecs_with_version"
+          depends="prepare, copy_nuget_folder, copy_app_drop_to_lib_folder, copy_docs_to_doc_folder, copy_notices_to_doc_folder, set_file_attributes_to_normal, update_nuspecs_with_version"
           description="Packaging nuget." />
 
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.drop.nuget}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.drop.nuget}."/>
     <delete dir="${dirs.drop.nuget}" failonerror="false" />
     <mkdir dir="${dirs.drop.nuget}" />
   </target>
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="copy_nuget_folder">
-    <echo message="Packaging nuspec specifications and special files from ${dirs.nuget} to ${dirs.drop.nuget}."/>
+    <echo level="Warning" message="Packaging nuspec specifications and special files from ${dirs.nuget} to ${dirs.drop.nuget}."/>
     <copy todir="${dirs.drop.nuget}">
       <fileset basedir="${dirs.nuget}">
         <include name="**/**" />
@@ -100,7 +75,7 @@
   </target>
   
   <target name="copy_app_drop_to_lib_folder">
-    <echo message="Packaging ${project.name} nuget pieces into ${dirs.drop.nuget}${path.separator}lib from ${dirs.drop}${path.separator}${folder.app.drop}."/>
+    <echo level="Warning" message="Packaging ${project.name} nuget pieces into ${dirs.drop.nuget}${path.separator}lib from ${dirs.drop}${path.separator}${folder.app.drop}."/>
     <copy todir="${dirs.drop.nuget}${path.separator}lib">
       <fileset basedir="${dirs.drop}${path.separator}${folder.app.drop}">
         <include name="**/**" />
@@ -109,7 +84,7 @@
   </target>
   
   <target name="copy_docs_to_doc_folder">
-    <echo message="Packaging docs to ${dirs.drop.nuget}${path.separator}docs."/>
+    <echo level="Warning" message="Packaging docs to ${dirs.drop.nuget}${path.separator}docs."/>
     <copy todir="${dirs.drop.nuget}${path.separator}docs" failonerror="false">
       <fileset basedir="${dirs.drop}${path.separator}${folder.documentation}">
         <include name="**/**" />
@@ -118,10 +93,10 @@
   </target>
   
   <target name="copy_notices_to_doc_folder">
-    <echo message="Packaging readme file to ${dirs.drop.nuget}${path.separator}docs."/>
-    <copy file="${dirs.current}${path.separator}..${path.separator}README.markdown" tofile="${dirs.drop.nuget}${path.separator}docs${path.separator}README" failonerror="false" />
+    <echo level="Warning" message="Packaging readme file to ${dirs.drop.nuget}${path.separator}docs."/>
+    <copy file="${dirs.current}README.markdown" tofile="${dirs.drop.nuget}${path.separator}docs${path.separator}README" failonerror="false" />
     
-    <echo message="Packaging other legal stuff to ${dirs.drop.nuget}${path.separator}docs."/>
+    <echo level="Warning" message="Packaging other legal stuff to ${dirs.drop.nuget}${path.separator}docs."/>
     <copy todir="${dirs.drop.nuget}${path.separator}docs" failonerror="false">
       <fileset basedir="${dirs.drop}${path.separator}LEGAL">
         <include name="**/*" />
@@ -130,8 +105,8 @@
   </target>
 
   <target name="generate_version_file">
-    <echo message="Generating ${file.nuget.version} with ${assembly.version.full} for the version" />
-    <echo file="${file.nuget.version}" append="false" failonerror="false">
+    <echo level="Warning" message="Generating ${file.nuget.version} with ${assembly.version.full} for the version" />
+    <echo level="Warning" file="${file.nuget.version}" append="false" failonerror="false">
       <![CDATA[<?xml version="1.0" ?>
 <nuget>
   <version>${assembly.version.full}</version>
@@ -139,16 +114,25 @@
     </echo>
   </target>
   
+  <target name="set_file_attributes_to_normal">
+    <echo level="Warning" message="Removing read only attributes that some source control things put on files in '${dirs.drop.nuget}'." />
+    <attrib normal="true">
+      <fileset basedir="${dirs.drop.nuget}">
+        <include name="**/*" />
+      </fileset>
+    </attrib>
+  </target>  
+  
   <target name="update_nuspecs_with_version">
-    <echo message="Finding and updating version in all nuspec files in ${dirs.drop.nuget}."/>
+    <echo level="Warning" message="Finding and updating version in all nuspec files in ${dirs.drop.nuget}."/>
     <foreach item="File" property="spec.file">
       <in>
         <items>
-          <include name="${dirs.drop.nuget}${path.separator}*.nuspec" />
+          <include name="${dirs.drop.nuget}${path.separator}**${path.separator}*.nuspec" />
         </items>
       </in>
       <do>
-        <echo message="Replacing version in '${spec.file}'" />
+        <echo level="Warning" message="Replacing version in '${spec.file}'" />
         <xmlpoke
           file="${spec.file}"
           xpath="/package/metadata/version"
@@ -157,15 +141,4 @@
     </foreach>
   </target>
   
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/obfuscate.step b/build/obfuscate.step
index c071c11..31d16e5 100644
--- a/build/obfuscate.step
+++ b/build/obfuscate.step
@@ -6,15 +6,15 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="obfuscate" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.references" value="lib" overwrite="false" />
-  <property name="dirs.lib" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.references}" overwrite="false" />
+  <property name="dirs.lib" value="${dirs.current}${path.separator}${folder.references}" overwrite="false" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="company.name" value="__COMPANY_NAME__" overwrite="false" />
   <property name="path_to_solution" value="." overwrite="false" />
@@ -28,64 +28,41 @@
   <property name="version.build" value="0" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="version.hash" value="${version.revision}" overwrite="false" />
-  <property name="version.file" value="${version.major}.${version.minor}.${version.build}.${version.revision}" overwrite="false" />
+  <property name="version" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
+  <property name="version" value="${version.major}.${version.minor}.${version.patch}.0" if="${version.use_semanticversioning}" />
+  <property name="version.file" value="${version}" overwrite="false" />
 
   <property name="sign.project_with_key" value="false" overwrite="false" />
   <property name="sign.key.use_relative_pathing" value="false" overwrite="false" />
-  <property name="file.key.name.private" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${project.name}.snk" overwrite="false" />
-  <property name="file.key.name.private" value="${path.to.toplevel}${path.separator}${project.name}.snk" overwrite="false" if="${sign.key.use_relative_pathing}" />
+  <property name="file.key.name.private" value="${dirs.current}${path.separator}${project.name}.snk" overwrite="false" />
+  <property name="file.key.name.private" value="${project.name}.snk" overwrite="false" if="${sign.key.use_relative_pathing}" />
   <property name="obsfucate" value="false" overwrite="false" />
   <property name="app.eazfuscator" value="..${path.separator}${folder.references}${path.separator}Eazfuscator.NET${path.separator}Eazfuscator.NET.exe" overwrite="false" />
   <property name="args.obfuscator" value="" overwrite="false" />
   
   <property name="dll.names" value="" />
 
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="error_check, get_version, get_project_output_files, set_up_args, obfuscate"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="error_check">
     <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__' or company.name=='__COMPANY_NAME__'}" />
@@ -97,6 +74,7 @@
   </target>
   
   <target name="get_project_output_files">
+    <echo level="Warning" message="Getting all files with '${version.file}' as the file version." />
     <foreach item="File" property="dll.filename">
       <in>
         <items>
@@ -116,7 +94,7 @@
   </target>
 
   <target name="obfuscate">
-    <echo message="Attempting to obsfucate using Eazfuscator.NET with these arguments: ${path::get-full-path(app.eazfuscator)} ${args.obfuscator}" />
+    <echo level="Warning" message="Attempting to obsfucate using Eazfuscator.NET with these arguments: ${path::get-full-path(app.eazfuscator)} ${args.obfuscator}" />
     <exec
       program="${path::get-full-path(app.eazfuscator)}"
       workingdir="${dirs.build.code}"
@@ -124,15 +102,4 @@
       if="${file::exists(path::get-full-path(app.eazfuscator))}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/open.build b/build/open.build
index bb06123..deebf4a 100644
--- a/build/open.build
+++ b/build/open.build
@@ -6,68 +6,52 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="open" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
-  <property name="dirs.solution" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${path_to_solution}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.solution" value="${dirs.current}${path.separator}${path_to_solution}" />
   <property name="solution.path" value="${path::get-full-path(dirs.solution)}${path.separator}${project.name}.sln" />
   <property name="solution.path.full" value="${path::get-full-path(solution.path)}" />
+  <property name="language.short" value="cs" overwrite="false" />
+  <property name="file.version" value="SolutionVersion.${language.short}" overwrite="false" />
+  <property name="path.file.version" value="${dirs.solution}${path.separator}${file.version}" overwrite="false" />
   <property name="app.visual_studio" value="${environment::get-folder-path('ProgramFiles')}\Common Files\Microsoft Shared\MSEnv\VSLauncher.exe" />
   <property name="app.monodevelop" value="monodevelop" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.build" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.build" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.build" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
-  <target name="go" depends="load_uppercut_assemblies, allow_powershell_unrestricted, run_tasks" />
+  <target name="go" depends="load_uppercut_assemblies, run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
-          depends="open_visual_studio"
+          depends="build_version, open_visual_studio"
           description="Opening Visual Studio." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
+  <target name="build_version">
+    <echo message="Checking for dependent version file." />
+    <nant buildfile="${dirs.current.file}${path.separator}versionBuilder.step" inheritall="true" if="${file::exists(path.file.version) == false}" />
   </target>
 
   <target name="open_visual_studio">
   	<if test="${platform::is-unix()}">
-  		<echo message="Opening MonoDevelop with solution file ${solution.path.full}"/>
+  		<echo level="Warning" message="Opening MonoDevelop with solution file ${solution.path.full}"/>
   		<exec
 	      spawn="true"
 	      program="${app.monodevelop}"
@@ -76,41 +60,27 @@
 	    </exec>
   	</if>
   	<if test="${platform::is-windows()}">
-	    <echo message="Opening visual studio with solution file ${solution.path.full}."/>
+	    <echo level="Warning" message="Opening visual studio with solution file ${solution.path.full}."/>
 	    <exec
 	      spawn="true"
 	      basedir="${dirs.solution}"
 	      program="${app.visual_studio}"
-	      commandline="${solution.path.full}"
+        commandline="${solution.path.full}"
+        if="${file::exists(app.visual_studio) == true}"
 	      >
 	    </exec>
+      <exec
+        spawn="true"
+        program="CMD.exe"
+        commandline="/C START ${solution.path.full}"
+        if="${file::exists(app.visual_studio) == false}"
+        >
+      </exec>
 	 </if>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
 
-  <target name="allow_powershell_unrestricted">
-    <!-- powershell 1.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted" />
-    </exec>
-    <!-- powershell 2.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted -force -scope CurrentUser" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/package.step b/build/package.step
index a421306..af6dd1e 100644
--- a/build/package.step
+++ b/build/package.step
@@ -6,15 +6,15 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="package" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.database" value="__DATABASE_FOLDER_NAME__" overwrite="false" />
@@ -26,59 +26,34 @@
   <property name="folder.documentation" value="docs" overwrite="false" />
   <property name="file.build_info" value="${dirs.build}${path.separator}_BuildInfo.xml" />
   <property name="file.build_log" value="${dirs.build}${path.separator}build.log" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
-          depends="prepare, build_artifacts, app, app_published, web, db, reports, file_server, environment_files, deployment_scripts, settings_files, build_deployment_files, build_info_file, documentation"
+          depends="prepare, build_artifacts, app, app_published, web, db, reports, file_server, environment_files, deployment_scripts, settings_files, set_file_attributes_to_normal, build_deployment_files, build_info_file, documentation"
           description="Packaging project." />
 
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.drop}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.drop}."/>
     <delete dir="${dirs.drop}" failonerror="false" />
     <mkdir dir="${dirs.drop}" />
   </target>
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="build_artifacts">
-    <echo message="Packaging build artifacts (such as test results) to ${dirs.drop}${path.separator}${folder.build_artifacts}."/>
+    <echo level="Warning" message="Packaging build artifacts (such as test results) to ${dirs.drop}${path.separator}${folder.build_artifacts}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.build_artifacts}">
       <fileset basedir="${dirs.build}${path.separator}${folder.build_artifacts}">
         <include name="**/*.*" />
@@ -87,7 +62,7 @@
   </target>
 
   <target name="app">
-    <echo message="Packaging application items to ${dirs.drop}${path.separator}${folder.app.drop}."/>
+    <echo level="Warning" message="Packaging application items to ${dirs.drop}${path.separator}${folder.app.drop}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.app.drop}">
       <fileset basedir="${dirs.build}${path.separator}${folder.app.drop}">
         <exclude name="${folder.database}${path.separator}**" />
@@ -116,7 +91,7 @@
   </target>
 
   <target name="app_published">
-    <echo message="Packaging published applications to ${dirs.drop}${path.separator}_PublishedApplications."/>
+    <echo level="Warning" message="Packaging published applications to ${dirs.drop}${path.separator}_PublishedApplications."/>
     <copy todir="${dirs.drop}${path.separator}_PublishedApplications">
       <fileset basedir="${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedApplications">
         <exclude name="**${path.separator}*.template" />
@@ -126,7 +101,7 @@
   </target>
   
   <target name="web">
-    <echo message="Packaging website to ${dirs.drop}${path.separator}_PublishedWebSites."/>
+    <echo level="Warning" message="Packaging website to ${dirs.drop}${path.separator}_PublishedWebSites."/>
     <copy todir="${dirs.drop}${path.separator}_PublishedWebSites">
       <fileset basedir="${dirs.build}${path.separator}${folder.app.drop}${path.separator}_PublishedWebSites">
         <exclude name="**${path.separator}*.template" />
@@ -136,7 +111,7 @@
   </target>
 
   <target name="db">
-    <echo message="Packaging database files to ${dirs.drop}${path.separator}${folder.database}."/>
+    <echo level="Warning" message="Packaging database files to ${dirs.drop}${path.separator}${folder.database}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.database}">
       <fileset basedir="${dirs.build}${path.separator}${folder.database}">
         <exclude name="**${path.separator}*.template" />
@@ -146,9 +121,9 @@
   </target>
 
   <target name="reports">
-    <echo message="Packaging reports to ${dirs.drop}${path.separator}${folder.reports}."/>
+    <echo level="Warning" message="Packaging reports to ${dirs.drop}${path.separator}${folder.reports}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.reports}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.reports}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.reports}">
         <exclude name="**${path.separator}*.template" />
         <include name="**/*.*" />
       </fileset>
@@ -156,15 +131,15 @@
   </target>
 
   <target name="file_server">
-    <echo message="Packaging file server items to ${dirs.drop}${path.separator}${folder.file_server}."/>
+    <echo level="Warning" message="Packaging file server items to ${dirs.drop}${path.separator}${folder.file_server}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.file_server}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.file_server}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.file_server}">
         <exclude name="**${path.separator}*.template" />
         <include name="**/*.*" />
       </fileset>
     </copy>
     
-    <echo message="Packaging output fileserver items to ${dirs.drop}${path.separator}FileServer."/>
+    <echo level="Warning" message="Packaging output fileserver items to ${dirs.drop}${path.separator}FileServer."/>
      <copy todir="${dirs.drop}${path.separator}FileServer">
       <fileset basedir="${dirs.build}${path.separator}${folder.app.drop}${path.separator}FileServer">
         <include name="**/**" />
@@ -173,7 +148,7 @@
   </target>
 
   <target name="environment_files">
-    <echo message="Packaging environment files to ${dirs.drop}${path.separator}${folder.environment_files}."/>
+    <echo level="Warning" message="Packaging environment files to ${dirs.drop}${path.separator}${folder.environment_files}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.environment_files}">
       <fileset basedir="${dirs.build}${path.separator}${folder.environment_files}">
         <include name="**/*.*" />
@@ -182,9 +157,9 @@
   </target>
 
   <target name="deployment_scripts">
-    <echo message="Packaging deployment scripts to ${dirs.drop}${path.separator}${folder.deployment}."/>
+    <echo level="Warning" message="Packaging deployment scripts to ${dirs.drop}${path.separator}${folder.deployment}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.deployment}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.deployment}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.deployment}">
         <exclude name="**${path.separator}*.template" />
         <exclude name="templates${path.separator}**" />
         <include name="**/*.*" />
@@ -193,32 +168,36 @@
   </target>
 
   <target name="settings_files">
-    <echo message="Packaging settings files to ${dirs.drop}${path.separator}${folder.settings}."/>
+    <echo level="Warning" message="Packaging settings files to ${dirs.drop}${path.separator}${folder.settings}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.settings}">
-      <fileset basedir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.settings}">
+      <fileset basedir="${dirs.current}${path.separator}${folder.settings}">
         <include name="**/*.settings" />
       </fileset>
     </copy>
   </target>
+  
+  <target name="set_file_attributes_to_normal">
+    <echo level="Warning" message="Removing read only attributes that some source control things put on files in '${dirs.drop}'." />
+    <attrib normal="true">
+      <fileset basedir="${dirs.drop}">
+        <include name="**/*" />
+      </fileset>
+    </attrib>
+  </target>  
 
   <target name="build_deployment_files">
-    <echo message="Building Deployment Files."/>
+    <echo level="Warning" message="Building Deployment Files."/>
     <nant buildfile="deploymentBuilder.step" inheritall="true" failonerror="false" />
   </target>
 
   <target name="build_info_file">
-    <echo message="Copying ${file.build_info} to ${folder.build_artifacts}, ${folder.app.drop}, and ${folder.deployment} in the ${dirs.drop} folder."/>
+    <echo level="Warning" message="Copying ${file.build_info} to ${folder.build_artifacts}, ${folder.app.drop}, and ${folder.deployment} in the ${dirs.drop} folder."/>
 
     <copy
      file="${file.build_info}"
      todir="${dirs.drop}${path.separator}${folder.build_artifacts}"
       />
       
-    <copy
-     file="${file.build_log}"
-     todir="${dirs.drop}${path.separator}${folder.build_artifacts}"
-      />
-
     <copy
      file="${file.build_info}"
      todir="${dirs.drop}${path.separator}${folder.app.drop}"
@@ -231,7 +210,7 @@
   </target>
 
   <target name="documentation">
-    <echo message="Packaging documentation files to ${dirs.drop}${path.separator}${folder.documentation}."/>
+    <echo level="Warning" message="Packaging documentation files to ${dirs.drop}${path.separator}${folder.documentation}."/>
     <copy todir="${dirs.drop}${path.separator}${folder.documentation}">
       <fileset basedir="${dirs.build}${path.separator}${folder.documentation}">
         <include name="**/*.*" />
@@ -239,15 +218,4 @@
     </copy>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/policyChecks.step b/build/policyChecks.step
index 8481515..cfaa7ab 100644
--- a/build/policyChecks.step
+++ b/build/policyChecks.step
@@ -6,77 +6,41 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="policyChecks" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.documentation" value="docs" overwrite="false" />
-  <property name="dirs.docs" value="${path::get-full-path(dirs.current)}${path.separator}${path.to.toplevel}${path.separator}${folder.documentation}" />
+  <property name="dirs.docs" value="${path::get-full-path(dirs.current)}${path.separator}${folder.documentation}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="file.installation_document" value="${dirs.docs}${path.separator}Installation${path.separator}Install.docx" overwrite="false" />
   <property name="fail.if_no_installation_document" value="false" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="install_document_policy"
           description="Enforcing active rules/policies." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="install_document_policy">
-    <echo message="Checking for the existence of ${path::get-full-path(file.installation_document)}. Do we fail the build if it is missing? ${fail.if_no_installation_document}" />
+    <echo level="Warning" message="Checking for the existence of ${path::get-full-path(file.installation_document)}. Do we fail the build if it is missing? ${fail.if_no_installation_document}" />
     <fail message="You must provide an installation document as a matter of policy."
       if="${fail.if_no_installation_document == 'true' and not file::exists(file.installation_document)}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/uc.exe b/build/uc.exe
new file mode 100644
index 0000000..d466149
Binary files /dev/null and b/build/uc.exe differ
diff --git a/build/uc.exe.config b/build/uc.exe.config
new file mode 100644
index 0000000..cb2586b
--- /dev/null
+++ b/build/uc.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/build/updateAssemblies.build b/build/updateAssemblies.build
index 72c6d85..a92cfae 100644
--- a/build/updateAssemblies.build
+++ b/build/updateAssemblies.build
@@ -6,72 +6,48 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="updateAssemblies" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}..${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${folder.build_scripts_custom}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
-  <property name="dirs.assemblies" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}assemblies" overwrite="false" />
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.build" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.build" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.build" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
+  <property name="dirs.assemblies" value="${dirs.current}${path.separator}assemblies" overwrite="false" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
-  <target name="go" depends="load_uppercut_assemblies, allow_powershell_unrestricted, run_tasks" />
+  <target name="go" depends="load_uppercut_assemblies, run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="error_check, update_assemblies"
           description="Moving assemblies to make available for Externals." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="error_check">
     <fail message="You must provide arguments to the command line like this updateAssemblies.build -D:project.name='SOLUTION_NAME_WITHOUT_EXTENSION' or pass the build configuration settings file updateAssemblies.build -D:build.config.settings='Settings${path.separator}Uppercut.config"
       if="${project.name=='__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__'}" />
   </target>
 
   <target name="update_assemblies">
-    <echo message="Moving files to ${dirs.assemblies}." />
+    <echo level="Warning" message="Moving files to ${dirs.assemblies}." />
     <copy todir="${dirs.assemblies}">
       <fileset basedir="${dirs.drop}${path.separator}${folder.app.drop}">
         <include name="**/*.*" />
@@ -79,30 +55,8 @@
     </copy>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
-  
-  <target name="allow_powershell_unrestricted">
-    <!-- powershell 1.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted" />
-    </exec>
-    <!-- powershell 2.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted -force -scope CurrentUser" />
-    </exec>
-  </target>
     
 </project>
\ No newline at end of file
diff --git a/build/uppercut.dll b/build/uppercut.dll
index 549d8c3..f6b482c 100644
Binary files a/build/uppercut.dll and b/build/uppercut.dll differ
diff --git a/build/uppercut.tasks.dll b/build/uppercut.tasks.dll
index deac821..42cba6f 100644
Binary files a/build/uppercut.tasks.dll and b/build/uppercut.tasks.dll differ
diff --git a/build/versionBuilder.step b/build/versionBuilder.step
index 835396b..d38c26d 100644
--- a/build/versionBuilder.step
+++ b/build/versionBuilder.step
@@ -6,20 +6,20 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="versionBuilder" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_build" value="build_output" overwrite="false" />
-  <property name="dirs.build" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_build}" />
+  <property name="dirs.build" value="${dirs.current}${path.separator}${folder.code_build}" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="company.name" value="__COMPANY_NAME__" overwrite="false" />
   <property name="path_to_solution" value="." overwrite="false" />
   <property name="language.short" value="cs" overwrite="false" />
   <property name="language.long" value="CSharp" />
   <property name="file.version" value="SolutionVersion.${language.short}" overwrite="false" />
-  <property name="path.file.version" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${path_to_solution}${path.separator}${file.version}" overwrite="false" />
+  <property name="path.file.version" value="${dirs.current}${path.separator}${path_to_solution}${path.separator}${file.version}" overwrite="false" />
   <property name="version.use_semanticversioning" value="false" overwrite="false" />
   <property name="version.major" value="1" overwrite="false" />
   <property name="version.minor" value="0" overwrite="false" />
@@ -34,56 +34,32 @@
   <property name="sign.key.use_relative_pathing" value="false" overwrite="false" />
   <property name="sign.key.relative_path_from_projects" value="..${path.separator}..${path.separator}" overwrite="false" />
   <property name="app.strongname" value="C:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin\sn.exe" overwrite="false" />
-  <property name="file.key.name.private" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${project.name}.snk" overwrite="false" />
-  <property name="file.key.name.private" value="${path.to.toplevel}${path.separator}${project.name}.snk" overwrite="false" if="${sign.key.use_relative_pathing}" />
+  <property name="file.key.name.private" value="${dirs.current}${path.separator}${project.name}.snk" overwrite="false" />
+  <property name="file.key.name.private" value="${project.name}.snk" overwrite="false" if="${sign.key.use_relative_pathing}" />
   <property name="file.key.name.public" value="${dirs.build}${path.separator}public.${project.name}.snk" overwrite="false" />
   <property name="obfuscate" value="false" overwrite="false" />
 
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="error_check, determine_language, generate_key_file, generate_assembly_info"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
 
   <target name="error_check">
     <fail message="You must fill out the project.name, repository.path, and company.name settings in the settings${path.separator}UppercuT.config file. Please do that and retry the build."
@@ -91,7 +67,7 @@
   </target>
 
   <target name="generate_key_file" description="Generates a .snk using the sn.exe tool if none exists and strong naming is specified" if="${sign.project_with_key}">
-    <echo message="Generating a strong name key (${file.key.name.private}) using ${app.strongname} if the key file doesn't already exist." />
+    <echo level="Warning" message="Generating a strong name key (${file.key.name.private}) using ${app.strongname} if the key file doesn't already exist." />
     <exec
 		program="${app.strongname}"
 		commandline="-k ${file.key.name.private}"
@@ -114,12 +90,15 @@
   <target name="generate_assembly_info" description="Generate assembly info">
     <property name="version.assembly" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
     <property name="version.assembly" value="${version.major}.${version.minor}.${version.patch}.0"  if="${version.use_semanticversioning}" />
-    <echo message="Generating SolutionVersion.${language.short} with assembly version ${version.assembly}." />
+    <echo level="Warning" message="Generating SolutionVersion.${language.short} with assembly version ${version.assembly}." />
     <property name="version.file" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
     <property name="version.file" value="${version.major}.${version.minor}.${version.patch}.${version.build}" if="${version.use_semanticversioning}" />
     <property name="version.product" value="${version.major}.${version.minor}.${version.build}.${version.hash}" />
     <property name="version.product" value="${version.major}.${version.minor}.${version.patch}.${version.hash}" if="${version.use_semanticversioning}" />
     
+    <!-- remove TFS read only if there -->
+    <attrib file="${path.file.version}" normal="true" if="${file::exists(path.file.version)}" />
+    
     <asminfo output="${path.file.version}" language="${language.long}">
       <imports>
         <import namespace="System" />
@@ -149,15 +128,4 @@
     </asminfo>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/versioners/git.step b/build/versioners/git.step
index 74b53e3..9dc5f43 100644
--- a/build/versioners/git.step
+++ b/build/versioners/git.step
@@ -6,66 +6,41 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="git" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="version.hash" value="0" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="get_revision, get_externally_provided_revision, set_version_environment_variable"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-  
   <target name="get_revision">
-    <echo message="Getting revision number from working directory ${directory::get-parent-directory(dirs.current)} or remotely at ${repository.path}."/>
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <getVersionFromGit
       gitExecutableWithPath="git"
-      repoDirectory="."
+      repoDirectory="${dirs.current}"
       repoPath="${repository.path}"
       output="_revision.xml"
       failonerror="false"
@@ -92,16 +67,4 @@
     <setenv name="uc.app.revision.hash" value="${version.hash}"/>
   </target>
 
-
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/versioners/hg.step b/build/versioners/hg.step
index 2759068..8ed6e8b 100644
--- a/build/versioners/hg.step
+++ b/build/versioners/hg.step
@@ -6,66 +6,41 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="hg" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="version.hash" value="0" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="get_revision, get_externally_provided_revision, set_version_environment_variable"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-  
   <target name="get_revision">
-    <echo message="Getting revision number from working directory ${directory::get-parent-directory(dirs.current)} or remotely at ${repository.path}."/>
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <getVersionFromMercurial
       hgExecutableWithPath="hg"
-      repoDirectory="."
+      repoDirectory="${dirs.current}"
       repoPath="${repository.path}"
       output="_revision.xml"
       failonerror="false"
@@ -92,16 +67,4 @@
     <setenv name="uc.app.revision.hash" value="${version.hash}"/>
   </target>
 
-
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/versioners/svn.step b/build/versioners/svn.step
index 6c865f5..22788d8 100644
--- a/build/versioners/svn.step
+++ b/build/versioners/svn.step
@@ -6,65 +6,40 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="svn" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="get_revision, get_externally_provided_revision, set_version_environment_variable"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="get_revision">
-    <echo message="Getting revision number from working directory '${dirs.current}${path.separator}${path.to.toplevel}${path.separator}' or remotely at ${repository.path}."/>
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <!-- try to update the revision -->
     <exec
       program="svn"
-      workingdir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}"
+      workingdir="${dirs.current}"
       commandline="info .\ --xml"
       output="_revision.xml"
       failonerror="false" />
@@ -99,16 +74,4 @@
     <setenv name="uc.app.revision.hash" value="${version.revision}"/>
   </target>
 
-
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/versioners/tfs.step b/build/versioners/tfs.step
index 01abac4..aef20c9 100644
--- a/build/versioners/tfs.step
+++ b/build/versioners/tfs.step
@@ -6,64 +6,40 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="tfs" />
-  <property name="path.to.toplevel" value="..${path.separator}.." />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom${path.separator}" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}${path.separator}versioners" />
   <property name="repository.path" value="__REPOSITORY_PATH__" overwrite="false" />
   <property name="version.revision" value="0" overwrite="false" />
   <property name="tfs.history.output" value="" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="false" />
 
   <target name="go" depends="run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="get_revision, get_externally_provided_revision, set_version_environment_variable"
           description="Generating Assembly File." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="get_revision">
+    <echo level="Warning" message="Getting revision number from working directory '${dirs.current}' or remotely at ${repository.path}."/>
     <exec
        program="tf"
-       workingdir="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}"
+       workingdir="${dirs.current}"
        commandline="history .\ /r /noprompt /stopafter:1 /version:W"
        output="_revision.xml"
        failonerror="false"/>
@@ -92,15 +68,4 @@
     <setenv name="uc.app.revision.hash" value="${version.revision}"/>
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/build/zip.build b/build/zip.build
index 518313d..2f76f2c 100644
--- a/build/zip.build
+++ b/build/zip.build
@@ -6,13 +6,13 @@
   <include buildfile="${build.config.settings}" if="${file::exists(build.config.settings)}" />
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
   <property name="file.current.no_extension" value="zip" />
-  <property name="dirs.current" value="${directory::get-parent-directory(project::get-buildfile-path())}" />
-  <property name="path.to.toplevel" value=".." />
+  <property name="dirs.current" value="${directory::get-current-directory()}" />
+  <property name="dirs.current.file" value="${directory::get-parent-directory(project::get-buildfile-path())}" />  
   <property name="folder.build_scripts" value="build" overwrite="false" />
   <property name="folder.build_scripts_custom" value="build.custom" overwrite="false" />
-  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.build_scripts_custom}" />
+  <property name="dirs.build_scripts_custom" value="${dirs.current}${path.separator}${folder.build_scripts_custom}" />
   <property name="folder.code_drop" value="code_drop" overwrite="false" />
-  <property name="dirs.drop" value="${dirs.current}${path.separator}${path.to.toplevel}${path.separator}${folder.code_drop}" overwrite="false" />
+  <property name="dirs.drop" value="${dirs.current}${path.separator}${folder.code_drop}" overwrite="false" />
   <property name="project.name" value="__SOLUTION_NAME_WITHOUT_SLN_EXTENSION__" overwrite="false" />
   <property name="version.use_semanticversioning" value="false" overwrite="false" />
   <property name="version.major" value="1" overwrite="false" />
@@ -23,58 +23,34 @@
   <property name="version.hash" value="${version.revision}" overwrite="false" />
   <property name="version" value="0" />
   <property name="file.uppercut.assembly" value="uppercut.tasks.dll" />
-  <property name="path.uppercut.assembly" value="${dirs.current}${path.separator}${file.uppercut.assembly}" />
+  <property name="path.uppercut.assembly" value="${dirs.current.file}${path.separator}${file.uppercut.assembly}" />
   <property name="zip.file" value="${dirs.drop}${path.separator}${project.name}.zip" />
   <property name="zip.file.rename" value="${dirs.drop}${path.separator}${project.name}.v${version}.zip" />
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.build" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.build" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.build" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
+  <property name="app.ruby" value="C:\Ruby\bin\ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe" overwrite="false" />
 
-  <target name="go" depends="load_uppercut_assemblies, allow_powershell_unrestricted, run_tasks" />
+  <target name="go" depends="load_uppercut_assemblies, run_tasks" />
 
   <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="error_check, zip, get_version, rename_zip_folder"
           description="Zipping assemblies." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Deleting ${zip.file}."/>
+    <echo level="Warning" message="Deleting ${zip.file}."/>
     <delete>
       <fileset basedir="${dirs.drop}" >
         <include name="${project.name}*.zip" />
@@ -88,7 +64,7 @@
   </target>
 
   <target name="zip">
-    <echo message="Attempting to zip up binaries to ${zip.file}." />
+    <echo level="Warning" message="Attempting to zip up binaries to ${zip.file}." />
     <zip zipfile="${zip.file}">
       <fileset basedir="${dirs.drop}">
         <exclude name="gems/**" />
@@ -108,61 +84,39 @@
   </target>
 
   <target name="get_revision">
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}svn.step" inheritall="true" if="${source_control_type=='svn'}" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" />
-    <nant buildfile="${dirs.current}${path.separator}versioners${path.separator}hg.step" inheritall="true" if="${source_control_type=='hg'}" failonerror="false" />
-    <!--<nant buildfile="${dirs.current}${path.separator}versioners${path.separator}vault.step" inheritall="true" if="${source_control_type=='vault'}" />-->
-    <!--<nant buildfile="${dirs.current}${path.separator}versioners${path.separator}vss.step" inheritall="true" if="${source_control_type=='vss'}" />-->
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}svn.step" inheritall="true" if="${source_control_type=='svn'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}tfs.step" inheritall="true" if="${source_control_type=='tfs'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}git.step" inheritall="true" if="${source_control_type=='git'}" />
+    <nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}hg.step" inheritall="true" if="${source_control_type=='hg'}" failonerror="false" />
+    <!--<nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}vault.step" inheritall="true" if="${source_control_type=='vault'}" />-->
+    <!--<nant buildfile="${dirs.current.file}${path.separator}versioners${path.separator}vss.step" inheritall="true" if="${source_control_type=='vss'}" />-->
 
     <property name="version.revision" value="${environment::get-variable('uc.app.revision')}" if="${environment::variable-exists('uc.app.revision')}" />
     <property name="version.revision" value="${environment::get-variable('BUILD_VCS_NUMBER')}" if="${version.revision == '0' and environment::variable-exists('BUILD_VCS_NUMBER')}" />
     <property name="version.hash" value="${environment::get-variable('uc.app.revision.hash')}" if="${environment::variable-exists('uc.app.revision.hash')}" />
     <property name="version.hash" value="${version.revision}" if="${version.hash == '0'}" />
-    <echo message="Using revision number: ${version.revision} and hash: ${version.hash}." />
+    <echo level="Warning" message="Using revision number: ${version.revision} and hash: ${version.hash}." />
   </target>
   
   <target name="shorten_hash">
-    <echo message="Shortening the length of the version hash '${version.hash}' to 8 digits." />
+    <echo level="Warning" message="Shortening the length of the version hash '${version.hash}' to 8 digits." />
     <property name="version.hash" value="${string::substring(version.hash,0,8)}" if="${string::get-length(version.hash) > 8}" />
-    <echo message="The hash is now: ${version.hash}." />
+    <echo level="Warning" message="The hash is now: ${version.hash}." />
   </target>
   
   <target name="get_build_number">
     <property name="version.build" value="${environment::get-variable('CCNetNumericLabel')}" if="${environment::variable-exists('CCNetNumericLabel')}" />
     <property name="version.build" value="${environment::get-variable('BUILD_NUMBER')}" if="${environment::variable-exists('BUILD_NUMBER')}" />
-    <echo message="Using build number ${version.build}." />
+    <echo level="Warning" message="Using build number ${version.build}." />
   </target>
 
   <target name="rename_zip_folder">
-    <echo message="Renaming zip file ${zip.file} to ${zip.file.rename}." />
+    <echo level="Warning" message="Renaming zip file ${zip.file} to ${zip.file.rename}." />
     <move file="${zip.file}" tofile="${zip.file.rename}" />
   </target>
 
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="load_uppercut_assemblies">
     <loadtasks assembly="${path.uppercut.assembly}" if="${file::exists(path.uppercut.assembly)}" />
   </target>
 
-  <target name="allow_powershell_unrestricted">
-    <!-- powershell 1.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted" />
-    </exec>
-    <!-- powershell 2.0 -->
-    <exec program="powershell.exe" if="${allow.powershell.unrestricted}" failonerror="false">
-      <arg value="set-executionpolicy unrestricted -force -scope CurrentUser" />
-    </exec>
-  </target>
-
 </project>
\ No newline at end of file
diff --git a/lib/NAnt/MSITaskErrors.mst b/lib/NAnt/MSITaskErrors.mst
deleted file mode 100644
index bea4056..0000000
Binary files a/lib/NAnt/MSITaskErrors.mst and /dev/null differ
diff --git a/lib/NAnt/MSITaskTemplate.msi b/lib/NAnt/MSITaskTemplate.msi
deleted file mode 100644
index 99780dd..0000000
Binary files a/lib/NAnt/MSITaskTemplate.msi and /dev/null differ
diff --git a/lib/NAnt/MSMTaskErrors.mst b/lib/NAnt/MSMTaskErrors.mst
deleted file mode 100644
index bea4056..0000000
Binary files a/lib/NAnt/MSMTaskErrors.mst and /dev/null differ
diff --git a/lib/NAnt/MSMTaskTemplate.msm b/lib/NAnt/MSMTaskTemplate.msm
deleted file mode 100644
index d537ded..0000000
Binary files a/lib/NAnt/MSMTaskTemplate.msm and /dev/null differ
diff --git a/lib/NAnt/NAnt.CompressionTasks.dll b/lib/NAnt/NAnt.CompressionTasks.dll
index 09bc5d7..0b5eddc 100644
Binary files a/lib/NAnt/NAnt.CompressionTasks.dll and b/lib/NAnt/NAnt.CompressionTasks.dll differ
diff --git a/lib/NAnt/NAnt.Contrib.Tasks.dll b/lib/NAnt/NAnt.Contrib.Tasks.dll
index 9a170e9..016b80b 100644
Binary files a/lib/NAnt/NAnt.Contrib.Tasks.dll and b/lib/NAnt/NAnt.Contrib.Tasks.dll differ
diff --git a/lib/NAnt/NAnt.Core.dll b/lib/NAnt/NAnt.Core.dll
index 1e068af..8b3741a 100644
Binary files a/lib/NAnt/NAnt.Core.dll and b/lib/NAnt/NAnt.Core.dll differ
diff --git a/lib/NAnt/NAnt.DotNetTasks.dll b/lib/NAnt/NAnt.DotNetTasks.dll
index c0d2040..3c74d58 100644
Binary files a/lib/NAnt/NAnt.DotNetTasks.dll and b/lib/NAnt/NAnt.DotNetTasks.dll differ
diff --git a/lib/NAnt/NAnt.MSNetTasks.dll b/lib/NAnt/NAnt.MSNetTasks.dll
index 59a2d1e..be8f81e 100644
Binary files a/lib/NAnt/NAnt.MSNetTasks.dll and b/lib/NAnt/NAnt.MSNetTasks.dll differ
diff --git a/lib/NAnt/NAnt.NUnit.dll b/lib/NAnt/NAnt.NUnit.dll
index 8982395..70aa55b 100644
Binary files a/lib/NAnt/NAnt.NUnit.dll and b/lib/NAnt/NAnt.NUnit.dll differ
diff --git a/lib/NAnt/NAnt.NUnit1Tasks.dll b/lib/NAnt/NAnt.NUnit1Tasks.dll
index 1f4f779..62b7379 100644
Binary files a/lib/NAnt/NAnt.NUnit1Tasks.dll and b/lib/NAnt/NAnt.NUnit1Tasks.dll differ
diff --git a/lib/NAnt/NAnt.NUnit2Tasks.dll b/lib/NAnt/NAnt.NUnit2Tasks.dll
index 983cc37..da3d6b6 100644
Binary files a/lib/NAnt/NAnt.NUnit2Tasks.dll and b/lib/NAnt/NAnt.NUnit2Tasks.dll differ
diff --git a/lib/NAnt/NAnt.SourceControlTasks.dll b/lib/NAnt/NAnt.SourceControlTasks.dll
index fdcd6e0..756484b 100644
Binary files a/lib/NAnt/NAnt.SourceControlTasks.dll and b/lib/NAnt/NAnt.SourceControlTasks.dll differ
diff --git a/lib/NAnt/NAnt.VSNetTasks.dll b/lib/NAnt/NAnt.VSNetTasks.dll
index f025781..a09a89d 100644
Binary files a/lib/NAnt/NAnt.VSNetTasks.dll and b/lib/NAnt/NAnt.VSNetTasks.dll differ
diff --git a/lib/NAnt/NAnt.VisualCppTasks.dll b/lib/NAnt/NAnt.VisualCppTasks.dll
index 7436b1a..00a7100 100644
Binary files a/lib/NAnt/NAnt.VisualCppTasks.dll and b/lib/NAnt/NAnt.VisualCppTasks.dll differ
diff --git a/lib/NAnt/NAnt.Win32Tasks.dll b/lib/NAnt/NAnt.Win32Tasks.dll
index 60199d2..5d2e0fb 100644
Binary files a/lib/NAnt/NAnt.Win32Tasks.dll and b/lib/NAnt/NAnt.Win32Tasks.dll differ
diff --git a/lib/NAnt/NAnt.exe b/lib/NAnt/NAnt.exe
index 1572536..c41374a 100644
Binary files a/lib/NAnt/NAnt.exe and b/lib/NAnt/NAnt.exe differ
diff --git a/lib/NAnt/NAnt.exe.config b/lib/NAnt/NAnt.exe.config
index b3582b8..53291fd 100644
--- a/lib/NAnt/NAnt.exe.config
+++ b/lib/NAnt/NAnt.exe.config
@@ -6,7 +6,7 @@
         <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
     </configSections>
     <appSettings>
-       
 <!-- Used to indicate the location of the cache folder for shadow files -->
+        <!-- Used to indicate the location of the cache folder for shadow files -->
         <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" />
         <!-- Used to indicate that NAnt should shadow copy files in a cache folder near the executable -->
         <add key="nant.shadowfiles" value="False" />
@@ -372,7 +372,7 @@
                     family="net"
                     version="3.5"
                     description="Microsoft .NET Framework 3.5"
-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}"
+                    sdkdirectory="${sdkInstallRoot}"
                     frameworkdirectory="${path::combine(installRoot, 'v3.5')}"
                     frameworkassemblydirectory="${path::combine(installRoot, 'v2.0.50727')}"
                     clrversion="2.0.50727"
@@ -473,7 +473,7 @@
                         <include name="extensions/common/2.0/**/*.dll" />
                     </task-assemblies>
                     <tool-paths>
-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}"
+                        <directory name="${sdkInstallRoot}"
                             if="${property::exists('sdkInstallRoot')}" />
                         <directory name="${path::combine(installRoot, 'v3.5')}" />
                         <directory name="${path::combine(installRoot, 'v2.0.50727')}" />
@@ -483,6 +483,8 @@
                             property="installRoot"
                             key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
                             hive="LocalMachine" />
+                        <locatesdk property="sdkInstallRoot" minwinsdkver="v6.0A" maxnetfxver="3.5" failonerror="false" />
+                        <!--
                         <readregistry
                             property="sdkInstallRoot"
                             key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.0A\WinSDKNetFxTools\InstallationFolder"
@@ -490,9 +492,20 @@
                             failonerror="false" />
                         <readregistry
                             property="sdkInstallRoot"
-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.1\WinSDKNetFxTools\InstallationFolder"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v6.1\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0\InstallationFolder"
                             hive="LocalMachine"
                             failonerror="false" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        -->
                     </project>
                     <tasks>
                         <task name="csc">
@@ -537,139 +550,320 @@
                     </tasks>
                 </framework>
                 <framework 
-                    name="net-4.0" 
-                    family="net" 
-                    version="4.0" 
-                    description="Microsoft .NET Framework 4.0" 
-                    sdkdirectory="${path::combine(sdkInstallRoot, 'bin')}" 
-                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}" 
-                    frameworkassemblydirectory="${path::combine(installRoot, 'v4.0.30319')}" 
-                    clrversion="4.0.30319" 
+                    name="net-4.0"
+                    family="net"
+                    version="4.0"
+                    description="Microsoft .NET Framework 4.0"
+                    sdkdirectory="${sdkInstallRoot}"
+                    frameworkdirectory="${path::combine(installRoot, 'v4.0.30319')}"
+                    frameworkassemblydirectory="${path::combine(installRoot, 'v4.0.30319')}"
+                    clrversion="4.0.30319"
+                    clrtype="Desktop"
                     vendor="Microsoft"
-                    > 
-                    <runtime> 
-                        <probing-paths> 
-                            <directory name="lib/net/2.0" /> 
-                            <directory name="lib/net/neutral" /> 
-                            <directory name="lib/common/2.0" /> 
-                            <directory name="lib/common/neutral" /> 
-                        </probing-paths> 
-                        <modes> 
-                            <strict> 
-                                <environment> 
-                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" /> 
-                                </environment> 
-                            </strict> 
-                        </modes> 
-                    </runtime> 
-                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}"> 
-                        <include name="Accessibility.dll" /> 
-                        <include name="mscorlib.dll" /> 
-                        <include name="Microsoft.Build.Engine.dll" /> 
-                        <include name="Microsoft.Build.Framework.dll" /> 
-                        <include name="Microsoft.Build.Utilities.dll" /> 
-                        <include name="Microsoft.Vsa.dll" /> 
-                        <include name="Microsoft.VisualBasic.dll" /> 
-                        <include name="Microsoft.VisualBasic.Compatibility.dll" /> 
-                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" /> 
-                        <include name="System.Configuration.dll" /> 
-                        <include name="System.Configuration.Install.dll" /> 
-                        <include name="System.Data.dll" /> 
-                        <include name="System.Data.OracleClient.dll" /> 
-                        <include name="System.Data.SqlXml.dll" /> 
-                        <include name="System.Deployment.dll" /> 
-                        <include name="System.Design.dll" /> 
-                        <include name="System.DirectoryServices.dll" /> 
-                        <include name="System.dll" /> 
-                        <include name="System.Drawing.Design.dll" /> 
-                        <include name="System.Drawing.dll" /> 
-                        <include name="System.EnterpriseServices.dll" /> 
-                        <include name="System.Management.dll" /> 
-                        <include name="System.Messaging.dll" /> 
-                        <include name="System.Runtime.Remoting.dll" /> 
-                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" /> 
-                        <include name="System.Security.dll" /> 
-                        <include name="System.ServiceProcess.dll" /> 
-                        <include name="System.Transactions.dll" /> 
-                        <include name="System.Web.dll" /> 
-                        <include name="System.Web.Mobile.dll" /> 
-                        <include name="System.Web.RegularExpressions.dll" /> 
-                        <include name="System.Web.Services.dll" /> 
-                        <include name="System.Windows.Forms.dll" /> 
-                        <include name="System.Xml.dll" /> 
-                    </reference-assemblies> 
-                    <task-assemblies> 
-                        <!-- include MS.NET version-neutral assemblies --> 
-                        <include name="extensions/net/neutral/**/*.dll" /> 
-                        <!-- include MS.NET 2.0 specific assemblies --> 
-                        <include name="extensions/net/2.0/**/*.dll" /> 
-                        <!-- include MS.NET specific task assembly --> 
-                        <include name="NAnt.MSNetTasks.dll" /> 
-                        <!-- include MS.NET specific test assembly --> 
-                        <include name="NAnt.MSNet.Tests.dll" /> 
-                        <!-- include .NET 2.0 specific assemblies --> 
-                        <include name="extensions/common/2.0/**/*.dll" /> 
-                    </task-assemblies> 
-                    <tool-paths> 
-                        <directory name="${path::combine(sdkInstallRoot, 'bin')}" 
-                            if="${property::exists('sdkInstallRoot')}" /> 
-                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" /> 
-                        <directory name="${path::combine(installRoot, 'v3.0')}" /> 
-                        <directory name="${path::combine(installRoot, 'v3.5')}" /> 
-                        <!--directory name="${path::combine(installRoot, 'v2.0.50727')}" -->
-                    </tool-paths> 
-                    <project> 
-                        <readregistry 
-                            property="installRoot" 
-                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot" 
-                            hive="LocalMachine" /> 
-                        <readregistry 
-                            property="sdkInstallRoot" 
-                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools\InstallationFolder" 
-                            hive="LocalMachine" 
-                            failonerror="false" /> 
-                    </project> 
-                    <tasks> 
-                        <task name="csc"> 
-                            <attribute name="supportsnowarnlist">true</attribute> 
-                            <attribute name="supportswarnaserrorlist">true</attribute> 
-                            <attribute name="supportskeycontainer">true</attribute> 
-                            <attribute name="supportskeyfile">true</attribute> 
-                            <attribute name="supportsdelaysign">true</attribute> 
-                            <attribute name="supportsplatform">true</attribute> 
-                            <attribute name="supportslangversion">true</attribute> 
-                        </task> 
-                        <task name="vbc"> 
-                            <attribute name="supportsdocgeneration">true</attribute> 
-                            <attribute name="supportsnostdlib">true</attribute> 
-                            <attribute name="supportsnowarnlist">true</attribute> 
-                            <attribute name="supportskeycontainer">true</attribute> 
-                            <attribute name="supportskeyfile">true</attribute> 
-                            <attribute name="supportsdelaysign">true</attribute> 
-                            <attribute name="supportsplatform">true</attribute> 
-                            <attribute name="supportswarnaserrorlist">true</attribute> 
-                        </task> 
-                        <task name="jsc"> 
-                            <attribute name="supportsplatform">true</attribute> 
-                        </task> 
-                        <task name="vjc"> 
-                            <attribute name="supportsnowarnlist">true</attribute> 
-                            <attribute name="supportskeycontainer">true</attribute> 
-                            <attribute name="supportskeyfile">true</attribute> 
-                            <attribute name="supportsdelaysign">true</attribute> 
-                        </task> 
-                        <task name="resgen"> 
-                            <attribute name="supportsassemblyreferences">true</attribute> 
-                            <attribute name="supportsexternalfilereferences">true</attribute> 
-                        </task> 
-                        <task name="delay-sign"> 
-                            <attribute name="exename">sn</attribute> 
-                        </task> 
-                        <task name="license"> 
-                            <attribute name="exename">lc</attribute> 
-                            <attribute name="supportsassemblyreferences">true</attribute> 
-                        </task> 
-                    </tasks> 
+                    >
+                    <runtime>
+                        <probing-paths>
+                            <directory name="lib/common/2.0" />
+                            <directory name="lib/common/neutral" />
+                        </probing-paths>
+                        <modes>
+                            <strict>
+                                <environment>
+                                    <variable name="COMPLUS_VERSION" value="v4.0.30319" />
+                                </environment>
+                            </strict>
+                        </modes>
+                    </runtime>
+                    <reference-assemblies basedir="${path::combine(installRoot, 'v4.0.30319')}">
+                        <include name="Accessibility.dll" />
+                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
+                        <include name="Microsoft.Build.dll" />
+                        <include name="Microsoft.Build.Engine.dll" />
+                        <include name="Microsoft.Build.Framework.dll" />
+                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
+                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
+                        <include name="Microsoft.CSharp.dll" />
+                        <include name="Microsoft.Data.Entity.Build.Tasks.dll" />
+                        <include name="Microsoft.JScript.dll" />
+                        <include name="Microsoft.Transactions.Bridge.dll" />
+                        <include name="Microsoft.Transactions.Bridge.Dtc.dll" />
+                        <include name="Microsoft.VisualBasic.Activities.Compiler.dll" />
+                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+                        <include name="Microsoft.VisualBasic.Compatibility.dll" />
+                        <include name="Microsoft.VisualBasic.dll" />
+                        <include name="Microsoft.VisualC.dll" />
+                        <include name="Microsoft.VisualC.STLCLR.dll" />
+                        <include name="mscorlib.dll" />
+                        <include name="System.Activities.Core.Presentation.dll" />
+                        <include name="System.Activities.dll" />
+                        <include name="System.Activities.DurableInstancing.dll" />
+                        <include name="System.Activities.Presentation.dll" />
+                        <include name="System.AddIn.Contract" />
+                        <include name="System.AddIn.dll" />
+                        <include name="System.ComponentModel.Composition.dll" />
+                        <include name="System.ComponentModel.DataAnnotations.dll" />
+                        <include name="System.Configuration.dll" />
+                        <include name="System.Configuration.Install.dll" />
+                        <include name="System.Core.dll" />
+                        <include name="System.Data.DataSetExtensions.dll" />
+                        <include name="System.Data.dll" />
+                        <include name="System.Data.Entity.Design.dll" />
+                        <include name="System.Data.Entity.dll" />
+                        <include name="System.Data.Linq.dll" />
+                        <include name="System.Data.OracleClient.dll" />
+                        <include name="System.Data.Services.Client.dll" />
+                        <include name="System.Data.Services.Design.dll" />
+                        <include name="System.Data.Services.dll" />
+                        <include name="System.Data.SqlXml.dll" />
+                        <include name="System.Deployment.dll" />
+                        <include name="System.Design.dll" />
+                        <include name="System.Device.dll" />
+                        <include name="System.DirectoryServices.dll" />
+                        <include name="System.DirectoryServices.Protocols.dll" />
+                        <include name="System.dll" />
+                        <include name="System.Drawing.Design.dll" />
+                        <include name="System.Drawing.dll" />
+                        <include name="System.Dynamic.dll" />
+                        <include name="System.EnterpriseServices.dll" />
+                        <include name="System.EnterpriseServices.Thunk.dll" />
+                        <include name="System.EnterpriseServices.Wrapper.dll" />
+                        <include name="System.IdentityModel.dll" />
+                        <include name="System.IdentityModel.Selectors.dll" />
+                        <include name="System.IO.Log.dll" />
+                        <include name="System.Management.dll" />
+                        <include name="System.Management.Instrumentation.dll" />
+                        <include name="System.Messaging.dll" />
+                        <include name="System.Net.dll" />
+                        <include name="System.Numerics.dll" />
+                        <include name="System.Runtime.Caching.dll" />
+                        <include name="System.Runtime.DurableInstancing.dll" />
+                        <include name="System.Runtime.Remoting.dll" />
+                        <include name="System.Runtime.Serialization.dll" />
+                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+                        <include name="System.Security.dll" />
+                        <include name="System.ServiceModel.Activation.dll" />
+                        <include name="System.ServiceModel.Activities.dll" />
+                        <include name="System.ServiceModel.Channels.dll" />
+                        <include name="System.ServiceModel.Discovery.dll" />
+                        <include name="System.ServiceModel.dll" />
+                        <include name="System.ServiceModel.Routing.dll" />
+                        <include name="System.ServiceModel.ServiceMoniker40.dll" />
+                        <include name="System.ServiceModel.WasHosting.dll" />
+                        <include name="System.ServiceModel.Web.dll" />
+                        <include name="System.ServiceProcess.dll" />
+                        <include name="System.Transactions.dll" />
+                        <include name="System.Web.Abstractions.dll" />
+                        <include name="System.Web.ApplicationServices.dll" />
+                        <include name="System.Web.DataVisualization.Design.dll" />
+                        <include name="System.Web.DataVisualization.dll" />
+                        <include name="System.Web.dll" />
+                        <include name="System.Web.DynamicData.Design.dll" />
+                        <include name="System.Web.DynamicData.dll" />
+                        <include name="System.Web.Entity.Design.dll" />
+                        <include name="System.Web.Entity.dll" />
+                        <include name="System.Web.Extensions.Design.dll" />
+                        <include name="System.Web.Extensions.dll" />
+                        <include name="System.Web.Mobile.dll" />
+                        <include name="System.Web.RegularExpressions.dll" />
+                        <include name="System.Web.Routing.dll" />
+                        <include name="System.Web.Services.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.dll" />
+                        <include name="System.Windows.Forms.dll" />
+                        <include name="System.Workflow.Activities.dll" />
+                        <include name="System.Workflow.ComponentModel.dll" />
+                        <include name="System.Workflow.Runtime.dll" />
+                        <include name="System.WorkflowServices.dll" />
+                        <include name="System.Xaml.dll" />
+                        <include name="System.Xaml.Hosting.dll" />
+                        <include name="System.Xml.dll" />
+                        <include name="System.Xml.Linq.dll" />
+                    </reference-assemblies>
+                    <reference-assemblies basedir="${environment::get-folder-path('ProgramFiles')}/Reference Assemblies/Microsoft/Framework/.NETFramework/v4.0">
+                        <include name="Microsoft.Build.Conversion.v4.0.dll" />
+                        <include name="Microsoft.Build.dll" />
+                        <include name="Microsoft.Build.Engine.dll" />
+                        <include name="Microsoft.Build.Framework.dll" />
+                        <include name="Microsoft.Build.Tasks.v4.0.dll" />
+                        <include name="Microsoft.Build.Utilities.v4.0.dll" />
+                        <include name="Microsoft.CSharp.dll" />
+                        <include name="Microsoft.JScript.dll" />
+                        <include name="Microsoft.VisualBasic.Compatibility.Data.dll" />
+                        <include name="Microsoft.VisualBasic.Comptatibility.dll" />
+                        <include name="Microsoft.VisualBasic.dll" />
+                        <include name="Microsoft.VisualC.dll" />
+                        <include name="Microsoft.VisualC.STLCLR.dll" />
+                        <include name="mscorlib.dll" />
+                        <include name="PresentationBuildTasks.dll" />
+                        <include name="PresentationCore.dll" />
+                        <include name="PresentationFramework.Aero.dll" />
+                        <include name="PresentationFramework.Classic.dll" />
+                        <include name="PresentationFramework.Luna.dll" />
+                        <include name="PresentationFramework.Royale.dll" />
+                        <include name="ReachFramework.dll" />
+                        <include name="System.Activities.Core.Presentation.dll" />
+                        <include name="System.Activities.dll" />
+                        <include name="System.Activities.DurableInstancing.dll" />
+                        <include name="System.Activities.Presentation.dll" />
+                        <include name="System.AddIn.Contract.dll" />
+                        <include name="System.AddIn.dll" />
+                        <include name="System.ComponentModel.Composition.dll" />
+                        <include name="System.ComponentModel.DataAnnotations.dll" />
+                        <include name="System.Configuration.dll" />
+                        <include name="System.Core.dll" />
+                        <include name="System.Data.DataSetExtension.dll" />
+                        <include name="System.Data.dll" />
+                        <include name="System.Data.Entity.Design.dll" />
+                        <include name="System.Data.Entity.dll" />
+                        <include name="System.Data.Linq.dll" />
+                        <include name="System.Data.OracleClient.dll" />
+                        <include name="System.Data.Services.Client.dll" />
+                        <include name="System.Data.Services.Design.dll" />
+                        <include name="System.Data.Services.dll" />
+                        <include name="System.Data.SqlXml.dll" />
+                        <include name="System.Deployment.dll" />
+                        <include name="System.Design.dll" />
+                        <include name="System.Device.dll" />
+                        <include name="System.DirectoryServices.AccountManagement.dll" />
+                        <include name="System.DirectoryServices.dll" />
+                        <include name="System.DirectoryServices.Protocols.dll" />
+                        <include name="System.dll" />
+                        <include name="System.Drawing.Design.dll" />
+                        <include name="System.Drawing.dll" />
+                        <include name="System.EnterpriseServices.dll" />
+                        <include name="System.EnterpriseServices.Thunk.dll" />
+                        <include name="System.EnterpriseServices.Wrapper.dll" />
+                        <include name="System.IdentityModel.dll" />
+                        <include name="System.IdentityModel.Selectors.dll" />
+                        <include name="System.IO.Log.dll" />
+                        <include name="System.Management.dll" />
+                        <include name="System.Management.Instrumentation.dll" />
+                        <include name="System.Messaging.dll" />
+                        <include name="System.Net.dll" />
+                        <include name="System.Numerics.dll" />
+                        <include name="System.Printing.dll" />
+                        <include name="System.Runtime.Caching.dll" />
+                        <include name="System.Runtime.DurableInstancing.dll" />
+                        <include name="System.Runtime.Remoting.dll" />
+                        <include name="System.Runtime.Serialization.dll" />
+                        <include name="System.Runtime.Serialization.Formatters.Soap.dll" />
+                        <include name="System.Security.dll" />
+                        <include name="System.ServiceModel.Activation.dll" />
+                        <include name="System.ServiceModel.Activities.dll" />
+                        <include name="System.ServiceModel.Channels.dll" />
+                        <include name="System.ServiceModel.Discovery.dll" />
+                        <include name="System.ServiceModel.dll" />
+                        <include name="System.ServiceModel.Routing.dll" />
+                        <include name="System.ServiceModel.Web.dll" />
+                        <include name="System.ServiceProcess.dll" />
+                        <include name="System.Speech.dll" />
+                        <include name="System.Transactions.dll" />
+                        <include name="System.Web.Abstractions.dll" />
+                        <include name="System.Web.ApplicationServices.dll" />
+                        <include name="System.Web.DataVisualization.Design.dll" />
+                        <include name="System.Web.DataVisualization.dll" />
+                        <include name="System.Web.dll" />
+                        <include name="System.Web.DynamicData.Design.dll" />
+                        <include name="System.Web.DynamicData.dll" />
+                        <include name="System.Web.Entity.Design.dll" />
+                        <include name="System.Web.Entity.dll" />
+                        <include name="System.Web.Extensions.Design.dll" />
+                        <include name="System.Web.Extensions.dll" />
+                        <include name="System.Web.Mobile.dll" />
+                        <include name="System.Web.RegularExpressions.dll" />
+                        <include name="System.Web.Routing.dll" />
+                        <include name="System.Web.Services.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.Design.dll" />
+                        <include name="System.Windows.Forms.DataVisualization.dll" />
+                        <include name="System.Windows.Forms.dll" />
+                        <include name="System.Windows.Input.Manipulations.dll" />
+                        <include name="System.Windows.Presentation.dll" />
+                        <include name="System.Workflow.Activities.dll" />
+                        <include name="System.Workflow.ComponentModel.dll" />
+                        <include name="System.Workflow.Runtime.dll" />
+                        <include name="System.WorkflowServices.dll" />
+                        <include name="System.Xaml.dll" />
+                        <include name="System.Xml.dll" />
+                        <include name="System.Xml.Linq.dll" />
+                    </reference-assemblies>
+                    <task-assemblies>
+                        <!-- include MS.NET version-neutral assemblies -->
+                        <include name="extensions/net/neutral/**/*.dll" />
+                        <!-- include MS.NET 4.0 specific assemblies -->
+                        <include name="extensions/net/4.0/**/*.dll" />
+                        <!-- include MS.NET specific task assembly -->
+                        <include name="NAnt.MSNetTasks.dll" />
+                        <!-- include MS.NET specific test assembly -->
+                        <include name="NAnt.MSNet.Tests.dll" />
+                        <!-- include .NET 4.0 specific assemblies -->
+                        <include name="extensions/common/4.0/**/*.dll" />
+                    </task-assemblies>
+                    <tool-paths>
+                        <directory name="${sdkInstallRoot}"
+                            if="${property::exists('sdkInstallRoot')}" />
+                        <directory name="${path::combine(installRoot, 'v4.0.30319')}" />
+                    </tool-paths>
+                    <project>
+                        <readregistry
+                            property="installRoot"
+                            key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+                            hive="LocalMachine" />
+                        <locatesdk property="sdkInstallRoot" minwinsdkver="v7.0A" minnetfxver="4.0" maxnetfxver="4.0.99999" failonerror="false" />
+                        <!--
+                        <echo message="sdkInstallRoot=${sdkInstallRoot}" if="${property::exists('sdkInstallRoot')}" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        <readregistry
+                            property="sdkInstallRoot"
+                            key="SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools-x86\InstallationFolder"
+                            hive="LocalMachine"
+                            failonerror="false" />
+                        -->
+                    </project>
+                    <tasks>
+                        <task name="csc">
+                            <attribute name="supportsnowarnlist">true</attribute>
+                            <attribute name="supportswarnaserrorlist">true</attribute>
+                            <attribute name="supportskeycontainer">true</attribute>
+                            <attribute name="supportskeyfile">true</attribute>
+                            <attribute name="supportsdelaysign">true</attribute>
+                            <attribute name="supportsplatform">true</attribute>
+                            <attribute name="supportslangversion">true</attribute>
+                        </task>
+                        <task name="vbc">
+                            <attribute name="supportsdocgeneration">true</attribute>
+                            <attribute name="supportsnostdlib">true</attribute>
+                            <attribute name="supportsnowarnlist">true</attribute>
+                            <attribute name="supportskeycontainer">true</attribute>
+                            <attribute name="supportskeyfile">true</attribute>
+                            <attribute name="supportsdelaysign">true</attribute>
+                            <attribute name="supportsplatform">true</attribute>
+                            <attribute name="supportswarnaserrorlist">true</attribute>
+                        </task>
+                        <task name="jsc">
+                            <attribute name="supportsplatform">true</attribute>
+                        </task>
+                        <task name="vjc">
+                            <attribute name="supportsnowarnlist">true</attribute>
+                            <attribute name="supportskeycontainer">true</attribute>
+                            <attribute name="supportskeyfile">true</attribute>
+                            <attribute name="supportsdelaysign">true</attribute>
+                        </task>
+                        <task name="resgen">
+                            <attribute name="supportsassemblyreferences">true</attribute>
+                            <attribute name="supportsexternalfilereferences">true</attribute>
+                        </task>
+                        <task name="delay-sign">
+                            <attribute name="exename">sn</attribute>
+                        </task>
+                        <task name="license">
+                            <attribute name="exename">lc</attribute>
+                            <attribute name="supportsassemblyreferences">true</attribute>
+                        </task>
+                    </tasks>
                 </framework>
                 <framework 
                     name="netcf-1.0"
@@ -2114,8 +2308,11 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <probing privatePath="lib" />
         </assemblyBinding>
+        <NetFx40_LegacySecurityPolicy enabled="true"/>
     </runtime>
     <startup>
+        <!-- .NET Framework 4.0 -->
+        <supportedRuntime version="v4.0.30319" />
         <!-- .NET Framework 2.0 -->
         <supportedRuntime version="v2.0.50727" />
         <!-- .NET Framework 1.1 -->
diff --git a/lib/NAnt/NDepend.Build.NAntTasks.dll b/lib/NAnt/NDepend.Build.NAntTasks.dll
deleted file mode 100644
index 2e5fb18..0000000
Binary files a/lib/NAnt/NDepend.Build.NAntTasks.dll and /dev/null differ
diff --git a/lib/NAnt/NDoc.Documenter.NAnt.dll b/lib/NAnt/NDoc.Documenter.NAnt.dll
index 0939f2e..cdcc3f1 100644
Binary files a/lib/NAnt/NDoc.Documenter.NAnt.dll and b/lib/NAnt/NDoc.Documenter.NAnt.dll differ
diff --git a/lib/NAnt/SLiNgshoT.Core.dll b/lib/NAnt/SLiNgshoT.Core.dll
index 8a96be8..3fbc24c 100644
Binary files a/lib/NAnt/SLiNgshoT.Core.dll and b/lib/NAnt/SLiNgshoT.Core.dll differ
diff --git a/lib/NAnt/SLiNgshoT.exe b/lib/NAnt/SLiNgshoT.exe
index 16bdf79..5ac7f1a 100644
Binary files a/lib/NAnt/SLiNgshoT.exe and b/lib/NAnt/SLiNgshoT.exe differ
diff --git a/lib/NAnt/extensions/common/2.0/NAnt.MSBuild.dll b/lib/NAnt/extensions/common/2.0/NAnt.MSBuild.dll
index 115ab1e..f8b028f 100644
Binary files a/lib/NAnt/extensions/common/2.0/NAnt.MSBuild.dll and b/lib/NAnt/extensions/common/2.0/NAnt.MSBuild.dll differ
diff --git a/lib/NAnt/extensions/common/2.0/NAnt.MSBuild.xml b/lib/NAnt/extensions/common/2.0/NAnt.MSBuild.xml
deleted file mode 100644
index 0f179af..0000000
--- a/lib/NAnt/extensions/common/2.0/NAnt.MSBuild.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>NAnt.MSBuild</name>
-    </assembly>
-    <members>
-        <member name="T:NAnt.MSBuild.Functions.MSBuildFunctions">
-            <summary>
-            Functions to return information for MSBuild system.
-            </summary>
-        </member>
-        <member name="M:NAnt.MSBuild.Functions.MSBuildFunctions.#ctor(NAnt.Core.Project,NAnt.Core.PropertyDictionary)">
-            <exclude/>
-        </member>
-        <member name="M:NAnt.MSBuild.Functions.MSBuildFunctions.IsMsbuildProject(System.String)">
-            <summary>
-            Test whether project is VS2005 project and could be built using &lt;msbuild&gt;
-            </summary>
-            <param name="project">The name or path of the project file (csproj, vbproj, ...).</param>
-            <returns>
-            True, if it is msbuild project, False otherwise.
-            </returns>
-        </member>
-        <member name="M:NAnt.MSBuild.NAntLogger.Initialize(Microsoft.Build.Framework.IEventSource)">
-            <summary>
-            Initialize is guaranteed to be called by MSBuild at the start of the build
-            before any events are raised.
-            </summary>
-        </member>
-        <member name="T:NAnt.VSNet.WhidbeySolution">
-            <summary>
-            Analyses Microsoft Visual Studio .NET 2005 (Whidbey) solution files.
-            </summary>
-        </member>
-    </members>
-</doc>
diff --git a/lib/NAnt/lib/mono/1.0/NDoc.Core.dll b/lib/NAnt/lib/mono/1.0/NDoc.Core.dll
deleted file mode 100644
index d360866..0000000
Binary files a/lib/NAnt/lib/mono/1.0/NDoc.Core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/1.0/NDoc.Documenter.Msdn.dll b/lib/NAnt/lib/mono/1.0/NDoc.Documenter.Msdn.dll
deleted file mode 100644
index c0fc50d..0000000
Binary files a/lib/NAnt/lib/mono/1.0/NDoc.Documenter.Msdn.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/1.0/NDoc.ExtendedUI.dll b/lib/NAnt/lib/mono/1.0/NDoc.ExtendedUI.dll
deleted file mode 100644
index d075d5d..0000000
Binary files a/lib/NAnt/lib/mono/1.0/NDoc.ExtendedUI.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/1.0/nunit.core.dll b/lib/NAnt/lib/mono/1.0/nunit.core.dll
deleted file mode 100644
index df7f905..0000000
Binary files a/lib/NAnt/lib/mono/1.0/nunit.core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/1.0/nunit.framework.dll b/lib/NAnt/lib/mono/1.0/nunit.framework.dll
deleted file mode 100644
index 5316687..0000000
Binary files a/lib/NAnt/lib/mono/1.0/nunit.framework.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/1.0/nunit.util.dll b/lib/NAnt/lib/mono/1.0/nunit.util.dll
deleted file mode 100644
index e9e479e..0000000
Binary files a/lib/NAnt/lib/mono/1.0/nunit.util.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/2.0/NDoc.Core.dll b/lib/NAnt/lib/mono/2.0/NDoc.Core.dll
deleted file mode 100644
index d360866..0000000
Binary files a/lib/NAnt/lib/mono/2.0/NDoc.Core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/2.0/NDoc.Documenter.Msdn.dll b/lib/NAnt/lib/mono/2.0/NDoc.Documenter.Msdn.dll
deleted file mode 100644
index c0fc50d..0000000
Binary files a/lib/NAnt/lib/mono/2.0/NDoc.Documenter.Msdn.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/2.0/NDoc.ExtendedUI.dll b/lib/NAnt/lib/mono/2.0/NDoc.ExtendedUI.dll
deleted file mode 100644
index d075d5d..0000000
Binary files a/lib/NAnt/lib/mono/2.0/NDoc.ExtendedUI.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/2.0/nunit.core.dll b/lib/NAnt/lib/mono/2.0/nunit.core.dll
deleted file mode 100644
index a11e623..0000000
Binary files a/lib/NAnt/lib/mono/2.0/nunit.core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/2.0/nunit.framework.dll b/lib/NAnt/lib/mono/2.0/nunit.framework.dll
deleted file mode 100644
index 44704bd..0000000
Binary files a/lib/NAnt/lib/mono/2.0/nunit.framework.dll and /dev/null differ
diff --git a/lib/NAnt/lib/mono/2.0/nunit.util.dll b/lib/NAnt/lib/mono/2.0/nunit.util.dll
deleted file mode 100644
index 8fff811..0000000
Binary files a/lib/NAnt/lib/mono/2.0/nunit.util.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/1.1/NDoc.Core.dll b/lib/NAnt/lib/net/1.1/NDoc.Core.dll
deleted file mode 100644
index 84931f6..0000000
Binary files a/lib/NAnt/lib/net/1.1/NDoc.Core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/1.1/NDoc.Documenter.Msdn.dll b/lib/NAnt/lib/net/1.1/NDoc.Documenter.Msdn.dll
deleted file mode 100644
index bcda527..0000000
Binary files a/lib/NAnt/lib/net/1.1/NDoc.Documenter.Msdn.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/1.1/NDoc.ExtendedUI.dll b/lib/NAnt/lib/net/1.1/NDoc.ExtendedUI.dll
deleted file mode 100644
index 2132a5c..0000000
Binary files a/lib/NAnt/lib/net/1.1/NDoc.ExtendedUI.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/1.1/nunit.core.dll b/lib/NAnt/lib/net/1.1/nunit.core.dll
deleted file mode 100644
index df7f905..0000000
Binary files a/lib/NAnt/lib/net/1.1/nunit.core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/1.1/nunit.framework.dll b/lib/NAnt/lib/net/1.1/nunit.framework.dll
deleted file mode 100644
index 5316687..0000000
Binary files a/lib/NAnt/lib/net/1.1/nunit.framework.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/1.1/nunit.util.dll b/lib/NAnt/lib/net/1.1/nunit.util.dll
deleted file mode 100644
index e9e479e..0000000
Binary files a/lib/NAnt/lib/net/1.1/nunit.util.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/2.0/NDoc.Core.dll b/lib/NAnt/lib/net/2.0/NDoc.Core.dll
deleted file mode 100644
index 84931f6..0000000
Binary files a/lib/NAnt/lib/net/2.0/NDoc.Core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/2.0/NDoc.Documenter.Msdn.dll b/lib/NAnt/lib/net/2.0/NDoc.Documenter.Msdn.dll
deleted file mode 100644
index bcda527..0000000
Binary files a/lib/NAnt/lib/net/2.0/NDoc.Documenter.Msdn.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/2.0/NDoc.ExtendedUI.dll b/lib/NAnt/lib/net/2.0/NDoc.ExtendedUI.dll
deleted file mode 100644
index 2132a5c..0000000
Binary files a/lib/NAnt/lib/net/2.0/NDoc.ExtendedUI.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/2.0/nunit.core.dll b/lib/NAnt/lib/net/2.0/nunit.core.dll
deleted file mode 100644
index a11e623..0000000
Binary files a/lib/NAnt/lib/net/2.0/nunit.core.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/2.0/nunit.framework.dll b/lib/NAnt/lib/net/2.0/nunit.framework.dll
deleted file mode 100644
index 44704bd..0000000
Binary files a/lib/NAnt/lib/net/2.0/nunit.framework.dll and /dev/null differ
diff --git a/lib/NAnt/lib/net/2.0/nunit.util.dll b/lib/NAnt/lib/net/2.0/nunit.util.dll
deleted file mode 100644
index 8fff811..0000000
Binary files a/lib/NAnt/lib/net/2.0/nunit.util.dll and /dev/null differ
diff --git a/lib/NuGet/NuGet.exe b/lib/NuGet/NuGet.exe
index 0372672..34ad49b 100644
Binary files a/lib/NuGet/NuGet.exe and b/lib/NuGet/NuGet.exe differ
diff --git a/open.bat b/open.bat
index 2675ee4..9defda2 100644
--- a/open.bat
+++ b/open.bat
@@ -1,10 +1,11 @@
-@echo off
-
-::Project UppercuT - http://uppercut.googlecode.com
-::No edits to this file are required - http://uppercut.pbwiki.com
-
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
-
-%NANT% %1 /f:.\build\open.build -D:build.config.settings=%build.config.settings%
\ No newline at end of file
+@echo off
+
+::Project UppercuT - http://uppercut.googlecode.com
+::No edits to this file are required - http://uppercut.pbwiki.com
+
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
+
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:"%BUILD_DIR%build\open.build" -D:build.config.settings=%build.config.settings%
\ No newline at end of file
diff --git a/settings/UppercuT.config b/settings/UppercuT.config
index 8b9a8e7..c92d657 100644
--- a/settings/UppercuT.config
+++ b/settings/UppercuT.config
@@ -22,6 +22,7 @@
   <property name="folder.app.drop" value="${project.name}" overwrite="false" />
   <property name="folder.environment_files" value="environment.files" overwrite="false" />
   <property name="folder.file_server" value="file.server" overwrite="false" />
+  <property name="folder.program_files" value="${environment::get-folder-path('ProgramFiles')}" />
 
   <!-- FRAMEWORKS -->
   <!-- microsoft.framework: vb6, net-1.0, net-1.1, net-2.0, net-3.5, net-4.0, netcf-1.0, netcf-2.0, silverlight-2.0, mono-1.0, mono-2.0, mono-3.5, moonlight-2.0 (Enter multiple ones with a "," to take advantage of multitargeting) -->
@@ -32,6 +33,8 @@
   <property name="test.framework" value="none" overwrite="false" />
   <!-- source_control_type: svn, vss, tfs, vault, git, hg -->
   <property name="source_control_type" value="git" overwrite="false" />
+  <!-- cover.framework: none, ncover, opencover -->
+  <property name="cover.framework" value="none" overwrite="false" />
   
   <!-- Environment specific variables -->
   <property name="path.separator" value="${string::trim(path::combine(' ', ' '))}" />
@@ -69,7 +72,8 @@
   <!-- These are run two folders down from the top level folder, so figure out the relative path from there and add "..\..\" -->
   <!-- In example, if from the top level directory, you have an item that is in lib\NCover\NCover.Console.exe you should add it here as ..\..\lib\NCover\NCover.Console.exe  -->
   <!-- To not use the tool, change to a location that doesn't exist -->
-  <property name="app.nunit.console" value="..${path.separator}..${path.separator}${folder.references}${path.separator}NUnit${path.separator}nunit-console.exe" overwrite="false" />
+  <property name="app.nunit.console" value="..${path.separator}..${path.separator}${folder.references}${path.separator}NUnit${path.separator}nunit-console.exe" overwrite="false" if="${platform::is-windows()}" />
+  <property name="app.nunit.console" value="nunit-console" overwrite="false" if="${platform::is-unix()}"/>
   <property name="app.xunit.console" value="..${path.separator}..${path.separator}${folder.references}${path.separator}xUnit${path.separator}xunit.console.clr4.exe" overwrite="false" />
   <property name="app.storevil.console" value="..${path.separator}..${path.separator}${folder.references}${path.separator}StorEvil${path.separator}StorEvil.exe" overwrite="false" />
   <property name="app.ncover" value="..${path.separator}..${path.separator}${folder.references}${path.separator}NCover${path.separator}NCover.Console.exe" overwrite="false" />
@@ -77,14 +81,21 @@
   <property name="app.ncover.tester" value="..${path.separator}..${path.separator}${folder.references}${path.separator}MbUnit2${path.separator}MbUnit.Cons.exe" overwrite="false" if="${test.framework=='mbunit2'}" />
   <property name="app.ncover.tester" value="${app.nunit.console}" overwrite="false" if="${test.framework=='nunit'}" />
   <property name="app.ncover.tester" value="${app.xunit.console}" overwrite="false" if="${test.framework=='xunit'}" />
-  <property name="app.ncover.tester" value="C:\Program Files (x86)\Gallio\bin\Gallio.Host.exe" overwrite="false" if="${test.framework=='gallio'}" />
-  <property name="app.ndepend" value="C:\Program Files\NDepend\NDepend.Console.exe" overwrite="false" />
-  <property name="app.moma" value="..\..\${folder.references}\MoMA\MoMA.exe" overwrite="false" />
-  <property name="app.nitriq" value="C:\Program Files (x86)\NimblePros\Nitriq Console + Pro\Nitriq.Console.exe" overwrite="false" />
-  <property name="app.xbuild" value="C:\Program Files (x86)\Mono-2.8\bin\xbuild.bat" overwrite="false" />
+  <property name="app.ncover.tester" value="${path::get-full-path(folder.program_files)}${path.separator}Gallio${path.separator}bin${path.separator}Gallio.Host.exe" overwrite="false" if="${test.framework=='gallio'}" />
+  <property name="app.opencover" value="..${path.separator}..${path.separator}${folder.references}${path.separator}OpenCover${path.separator}OpenCover.Console.exe" overwrite="false" />
+  <property name="app.opencover.tester" value="${app.nunit.console}" overwrite="false" if="${test.framework=='nunit'}" />
+  <property name="app.opencover.tester" value="${app.xunit.console}" overwrite="false" if="${test.framework=='xunit'}" />
+  <property name="app.opencover.tester" value="${path::get-full-path(folder.program_files)}${path.separator}Gallio${path.separator}bin${path.separator}Gallio.Host.exe" overwrite="false" if="${test.framework=='gallio'}" />
+  <property name="app.ndepend" value="${path::get-full-path(folder.program_files)}${path.separator}NDepend${path.separator}NDepend.Console.exe" overwrite="false" />
+  <property name="app.metric" value="${path::get-full-path(folder.program_files)}${path.separator}Microsoft Visual Studio 10.0${path.separator}Team Tools${path.separator}Static Analysis Tools${path.separator}FxCop${path.separator}Metrics.exe" overwrite="false" />
+  <property name="app.moma" value="..${path.separator}..${path.separator}${folder.references}${path.separator}MoMA${path.separator}MoMA.exe" overwrite="false" />
+  <property name="app.nitriq" value="Nitriq.Console.exe" overwrite="false" />
+  <property name="app.xbuild" value="${path::get-full-path(folder.program_files)}${path.separator}Mono-2.8${path.separator}bin${path.separator}xbuild.bat" overwrite="false" />
   <property name="app.eazfuscator" value="..${path.separator}${folder.references}${path.separator}Eazfuscator.NET${path.separator}Eazfuscator.NET.exe" overwrite="false" />
   <property name="app.nuget" value="..${path.separator}${folder.references}${path.separator}NuGet${path.separator}NuGet.exe" overwrite="false" />
+  <property name="app.ruby" value="C:${path.separator}Ruby${path.separator}bin${path.separator}ruby.exe" overwrite="false" />
+  <property name="app.powershell" value="%WINDIR%${path.separator}System32${path.separator}WindowsPowerShell${path.separator}v1.0${path.separator}powershell.exe" overwrite="false" />  
 
-  <property name="allow.powershell.unrestricted" value="false" overwrite="false" />
   <property name="run.ilmerge" value="false" overwrite="false" />
+
 </project>
\ No newline at end of file
diff --git a/test.bat b/test.bat
index 6704ea2..2ba3593 100644
--- a/test.bat
+++ b/test.bat
@@ -1,38 +1,39 @@
-@echo off
-
-::Project UppercuT - http://uppercut.googlecode.com
-::No edits to this file are required - http://uppercut.pbwiki.com
-
-if '%2' NEQ '' goto usage
-if '%3' NEQ '' goto usage
-if '%1' == '/?' goto usage
-if '%1' == '-?' goto usage
-if '%1' == '?' goto usage
-if '%1' == '/help' goto usage
-
-SET DIR=%~d0%~p0%
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
-
-%NANT% /f:.\build\compile.step -D:build.config.settings=%build.config.settings%
-
-if %ERRORLEVEL% NEQ 0 goto errors
-
-%NANT% /f:.\build\analyzers\test.step %1 -D:build.config.settings=%build.config.settings%
-%NANT% /f:.\build\analyzers\test.step open_results -D:build.config.settings=%build.config.settings%
-
-if %ERRORLEVEL% NEQ 0 goto errors
-
-goto finish
-
-:usage
-echo.
-echo Usage: test.bat
-echo Usage: test.bat all - to run all tests
-echo.
-goto finish
-
-:errors
-EXIT /B %ERRORLEVEL%
-
+@echo off
+
+::Project UppercuT - http://uppercut.googlecode.com
+::No edits to this file are required - http://uppercut.pbwiki.com
+
+if '%2' NEQ '' goto usage
+if '%3' NEQ '' goto usage
+if '%1' == '/?' goto usage
+if '%1' == '-?' goto usage
+if '%1' == '?' goto usage
+if '%1' == '/help' goto usage
+
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
+
+%NANT% /f:"%BUILD_DIR%build\compile.step" -D:build.config.settings=%build.config.settings%
+
+if %ERRORLEVEL% NEQ 0 goto errors
+
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:"%BUILD_DIR%build\analyzers\test.step" %1 -D:build.config.settings=%build.config.settings%
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:"%BUILD_DIR%build\analyzers\test.step" open_results -D:build.config.settings=%build.config.settings%
+
+if %ERRORLEVEL% NEQ 0 goto errors
+
+goto finish
+
+:usage
+echo.
+echo Usage: test.bat
+echo Usage: test.bat all - to run all tests
+echo.
+goto finish
+
+:errors
+EXIT /B %ERRORLEVEL%
+
 :finish
\ No newline at end of file
diff --git a/zip.bat b/zip.bat
index 2738109..e35f8ae 100644
--- a/zip.bat
+++ b/zip.bat
@@ -1,23 +1,25 @@
-@echo off
-
-::Project UppercuT - http://uppercut.googlecode.com
-::No edits to this file are required - http://uppercut.pbwiki.com
-
-SET DIR=%~d0%~p0%
-::This is gone once teamcity can call multiple files
-call "%DIR%build.bat"
-if %ERRORLEVEL% NEQ 0 goto errors
-
-SET NANT="%DIR%lib\Nant\nant.exe"
-SET build.config.settings="%DIR%settings\UppercuT.config"
-
-%NANT% %1 /f:.\build\zip.build -D:build.config.settings=%build.config.settings%
-
-if %ERRORLEVEL% NEQ 0 goto errors
-
-goto finish
-
-:errors
-EXIT /B %ERRORLEVEL%
-
+@echo off
+
+::Project UppercuT - http://uppercut.googlecode.com
+::No edits to this file are required - http://uppercut.pbwiki.com
+
+SET DIR=%cd%
+SET BUILD_DIR=%~d0%~p0%
+
+::This is gone once teamcity can call multiple files
+call "%BUILD_DIR%build.bat" %*
+if %ERRORLEVEL% NEQ 0 goto errors
+
+SET NANT="%BUILD_DIR%lib\Nant\nant.exe"
+SET build.config.settings="%DIR%\settings\UppercuT.config"
+
+%NANT% -logger:NAnt.Core.DefaultLogger -quiet /f:"%BUILD_DIR%build\zip.build" -D:build.config.settings=%build.config.settings% %*
+
+if %ERRORLEVEL% NEQ 0 goto errors
+
+goto finish
+
+:errors
+EXIT /B %ERRORLEVEL%
+
 :finish
\ No newline at end of file