diff --git a/build/vc100/turtle.vcxproj b/build/vc100/turtle.vcxproj
index 488e168..b52241a 100644
--- a/build/vc100/turtle.vcxproj
+++ b/build/vc100/turtle.vcxproj
@@ -18,6 +18,37 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\libraries\turtle\action.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\args.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\boost_test_error.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\check.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\child.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\cleanup.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\config.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\constraint.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\constraints.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\context.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\default_error.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\error.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\expectation.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\function.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\group.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\invocation.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\is_functor.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\lambda.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\log.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\mock.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\node.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\object.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\operators.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\parent.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\root.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\sequence.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\type_name.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\verifiable.hpp" />
+    <ClInclude Include="..\..\src\libraries\turtle\yes_no_type.hpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}</ProjectGuid>
   </PropertyGroup>
@@ -137,32 +168,6 @@
       <AdditionalLibraryDirectories>$(OutDir) ; ../../lib/vc100_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\libraries\turtle\action.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\args.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\check.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\config.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\constraints.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\error.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\expectation.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\format.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\function.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\functional.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\has_operator.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\invocation.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\is_formattable.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\is_functor.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\is_serializable.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\mock.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\node.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\object.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\operators.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\placeholder.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\root.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\sequence.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\type_name.hpp" />
-    <ClInclude Include="..\..\src\libraries\turtle\verifiable.hpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/build/vc100/turtle.vcxproj.filters b/build/vc100/turtle.vcxproj.filters
index b1a367e..29cebce 100644
--- a/build/vc100/turtle.vcxproj.filters
+++ b/build/vc100/turtle.vcxproj.filters
@@ -7,34 +7,34 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\libraries\turtle\action.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\args.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\check.hpp">
+    <ClInclude Include="..\..\src\libraries\turtle\cleanup.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\config.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\constraint.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\constraints.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\context.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\default_error.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\error.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\expectation.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\format.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\function.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\functional.hpp">
+    <ClInclude Include="..\..\src\libraries\turtle\group.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\invocation.hpp">
@@ -43,6 +43,12 @@
     <ClInclude Include="..\..\src\libraries\turtle\is_functor.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\lambda.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\log.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\mock.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -55,7 +61,7 @@
     <ClInclude Include="..\..\src\libraries\turtle\operators.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\placeholder.hpp">
+    <ClInclude Include="..\..\src\libraries\turtle\parent.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\libraries\turtle\root.hpp">
@@ -70,13 +76,22 @@
     <ClInclude Include="..\..\src\libraries\turtle\verifiable.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\has_operator.hpp">
+    <ClInclude Include="..\..\src\libraries\turtle\yes_no_type.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\is_formattable.hpp">
+    <ClInclude Include="..\..\src\libraries\turtle\action.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\libraries\turtle\is_serializable.hpp">
+    <ClInclude Include="..\..\src\libraries\turtle\args.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\boost_test_error.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\check.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\turtle\child.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/build/vc100/turtle_bench.vcxproj b/build/vc100/turtle_bench.vcxproj
index c26c28f..4a68807 100644
--- a/build/vc100/turtle_bench.vcxproj
+++ b/build/vc100/turtle_bench.vcxproj
@@ -18,6 +18,17 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class_10_max_args.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class_20_max_args.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class_30_max_args.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp" />
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2D607783-30B9-46DE-81E2-28513B31D5D2}</ProjectGuid>
   </PropertyGroup>
@@ -175,12 +186,6 @@
       <FixedBaseAddress>false</FixedBaseAddress>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\applications\turtle_bench\turtle_bench.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\applications\turtle_bench\turtle_bench.hpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/build/vc100/turtle_bench.vcxproj.filters b/build/vc100/turtle_bench.vcxproj.filters
index 8e6e728..6c6f6e2 100644
--- a/build/vc100/turtle_bench.vcxproj.filters
+++ b/build/vc100/turtle_bench.vcxproj.filters
@@ -7,13 +7,32 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\applications\turtle_bench\turtle_bench.cpp">
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class_30_max_args.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class_10_max_args.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\bench_test\turtle_bench_0_class_20_max_args.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\applications\turtle_bench\turtle_bench.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/vc100/turtle_test.vcxproj b/build/vc100/turtle_test.vcxproj
index 2e9efb0..3a9123e 100644
--- a/build/vc100/turtle_test.vcxproj
+++ b/build/vc100/turtle_test.vcxproj
@@ -18,26 +18,23 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\tests\turtle_test\mock_error.hpp" />
+  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\tests\turtle_test\constraints_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\error_test.cpp" />
-    <ClCompile Include="..\..\src\tests\turtle_test\format_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\function_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\integration_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\invocation_test.cpp" />
-    <ClCompile Include="..\..\src\tests\turtle_test\is_formattable_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\is_functor_test.cpp" />
-    <ClCompile Include="..\..\src\tests\turtle_test\is_serializable_test.cpp" />
+    <ClCompile Include="..\..\src\tests\turtle_test\log_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\max_args_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\mock_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\object_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\sequence_test.cpp" />
     <ClCompile Include="..\..\src\tests\turtle_test\type_name_test.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\tests\turtle_test\mock_error.hpp" />
-    <ClInclude Include="..\..\src\tests\turtle_test\silent_error.hpp" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{74810A2A-33D8-47D6-9A50-71261F1683F5}</ProjectGuid>
     <RootNamespace>turtle_test</RootNamespace>
diff --git a/build/vc100/turtle_test.vcxproj.filters b/build/vc100/turtle_test.vcxproj.filters
index bee76d5..52ff5b9 100644
--- a/build/vc100/turtle_test.vcxproj.filters
+++ b/build/vc100/turtle_test.vcxproj.filters
@@ -7,27 +7,11 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\tests\turtle_test\function_test.cpp">
+    <ClInclude Include="..\..\src\tests\turtle_test\mock_error.hpp">
       <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tests\turtle_test\integration_test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tests\turtle_test\invocation_test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tests\turtle_test\is_formattable_test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tests\turtle_test\is_functor_test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tests\turtle_test\is_serializable_test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tests\turtle_test\max_args_test.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
     <ClCompile Include="..\..\src\tests\turtle_test\mock_test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -46,16 +30,23 @@
     <ClCompile Include="..\..\src\tests\turtle_test\error_test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\tests\turtle_test\format_test.cpp">
+    <ClCompile Include="..\..\src\tests\turtle_test\function_test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\turtle_test\integration_test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\turtle_test\invocation_test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\turtle_test\is_functor_test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\turtle_test\log_test.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tests\turtle_test\max_args_test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\tests\turtle_test\mock_error.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\tests\turtle_test\silent_error.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/vc80/turtle.vcproj b/build/vc80/turtle.vcproj
index f36b314..75d4635 100644
--- a/build/vc80/turtle.vcproj
+++ b/build/vc80/turtle.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="turtle"
 	ProjectGUID="{831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}"
 	>