diff --git a/change/react-native-windows-2019-12-11-12-44-46-JSValue_Read_Write.json b/change/react-native-windows-2019-12-11-12-44-46-JSValue_Read_Write.json
new file mode 100644
index 00000000000..6da3069cc6f
--- /dev/null
+++ b/change/react-native-windows-2019-12-11-12-44-46-JSValue_Read_Write.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Strongly typed value serialization and deserialization using IJSValueReader, JSValue, and IJSValueWriter",
+  "packageName": "react-native-windows",
+  "email": "vmorozov@microsoft.com",
+  "commit": "d7599a1fbbb88300ccd2b3e280b74fda9f41f061",
+  "date": "2019-12-11T20:44:46.143Z"
+}
\ No newline at end of file
diff --git a/packages/microsoft-reactnative-sampleapps/index.windows.js b/packages/microsoft-reactnative-sampleapps/index.windows.js
index 95cf4f33a0a..cafab488a58 100644
--- a/packages/microsoft-reactnative-sampleapps/index.windows.js
+++ b/packages/microsoft-reactnative-sampleapps/index.windows.js
@@ -38,6 +38,12 @@ var getCallback = function(prefix) {
   };
 };
 
+var getErrorCallback = function(prefix) {
+  return function(error) {
+    log(prefix + (error || {}).message);
+  };
+};
+
 class SampleApp extends Component {
   componentDidMount() {
     this._TimedEventCSSub = SampleModuleCSEmitter.addListener('TimedEventCS', getCallback('SampleModuleCS.TimedEventCS() => '));
@@ -77,10 +83,10 @@ class SampleApp extends Component {
     NativeModules.SampleModuleCS.ExplicitCallbackMethodWithArgs(numberArg, getCallback('SampleModuleCS.ExplicitCallbackMethodWithArgs => '));
 
     var promise1 = NativeModules.SampleModuleCS.ExplicitPromiseMethod();
-    promise1.then(getCallback('SampleModuleCS.ExplicitPromiseMethod then => ')).catch(getCallback('SampleModuleCS.ExplicitPromiseMethod catch => '));
+    promise1.then(getCallback('SampleModuleCS.ExplicitPromiseMethod then => ')).catch(getErrorCallback('SampleModuleCS.ExplicitPromiseMethod catch => '));
 
     var promise2 = NativeModules.SampleModuleCS.ExplicitPromiseMethodWithArgs(numberArg);
-    promise2.then(getCallback('SampleModuleCS.ExplicitPromiseMethodWithArgs then => ')).catch(getCallback('SampleModuleCS.ExplicitPromiseMethodWithArgs catch => '));
+    promise2.then(getCallback('SampleModuleCS.ExplicitPromiseMethodWithArgs then => ')).catch(getErrorCallback('SampleModuleCS.ExplicitPromiseMethodWithArgs catch => '));
 
     log('SampleModuleCS.SyncReturnMethod => ' + NativeModules.SampleModuleCS.SyncReturnMethod());
 
@@ -115,10 +121,10 @@ class SampleApp extends Component {
     NativeModules.SampleModuleCPP.ExplicitCallbackMethodWithArgs(numberArg, getCallback('SampleModuleCPP.ExplicitCallbackMethodWithArgs => '));
 
     var promise1 = NativeModules.SampleModuleCPP.ExplicitPromiseMethod();
-    promise1.then(getCallback('SampleModuleCPP.ExplicitPromiseMethod then => ')).catch(getCallback('SampleModuleCPP.ExplicitPromiseMethod catch => '));
+    promise1.then(getCallback('SampleModuleCPP.ExplicitPromiseMethod then => ')).catch(getErrorCallback('SampleModuleCPP.ExplicitPromiseMethod catch => '));
 
     var promise2 = NativeModules.SampleModuleCPP.ExplicitPromiseMethodWithArgs(numberArg);
-    promise2.then(getCallback('SampleModuleCPP.ExplicitPromiseMethodWithArgs then => ')).catch(getCallback('SampleModuleCPP.ExplicitPromiseMethodWithArgs catch => '));
+    promise2.then(getCallback('SampleModuleCPP.ExplicitPromiseMethodWithArgs then => ')).catch(getErrorCallback('SampleModuleCPP.ExplicitPromiseMethodWithArgs catch => '));
 
     log('SampleModuleCPP.SyncReturnMethod => ' + NativeModules.SampleModuleCPP.SyncReturnMethod());
 
@@ -191,7 +197,6 @@ class SampleApp extends Component {
             <Text style={styles.boxText}>CircleCPP!</Text>
           </View>
         </CircleCPP>
-
         <Text style={styles.instructions}>
           Hello from Microsoft!
         </Text>
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp
index 96a1bd527cf..e6dd0f47b3c 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/ReactPackageProvider.cpp
@@ -6,7 +6,6 @@
 
 #include "DebugConsole.h"
 
-using namespace Microsoft::ReactNative;
 using namespace winrt::Microsoft::ReactNative::Bridge;
 
 namespace winrt::SampleApp::implementation {
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj.filters b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj.filters
index 87afcd43391..872971f9b86 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj.filters
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleApp.vcxproj.filters
@@ -44,9 +44,6 @@
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Filter Include="Assets">
       <UniqueIdentifier>{e48dc53e-40b1-40cb-970a-f89935452892}</UniqueIdentifier>
@@ -54,6 +51,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="readme.txt" />
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln
index 36c9235cc8f..bdef09722ff 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln
@@ -46,14 +46,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\..\..\vnext\Co
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx.UnitTests", "..\..\..\vnext\Microsoft.ReactNative.Cxx.UnitTests\Microsoft.ReactNative.Cxx.UnitTests.vcxproj", "{6C60E295-C8CA-4DC5-B8BE-09888F58B249}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed.UnitTests", "..\..\..\vnext\Microsoft.ReactNative.Managed.UnitTests\Microsoft.ReactNative.Managed.UnitTests.csproj", "{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{09f4e6c1-2d12-4059-aa96-0b190861fd6a}*SharedItemsImports = 4
 		..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9
 		..\..\..\vnext\Chakra\Chakra.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4
 		..\..\..\vnext\Shared\Shared.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4
+		..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{46d76f7a-8fd9-4a7d-8102-2857e5da6b84}*SharedItemsImports = 4
 		..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{47eec7f3-40d3-49ba-82c1-eaf103b54215}*SharedItemsImports = 4
 		..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{67a1076f-7790-4203-86ea-4402ccb5e782}*SharedItemsImports = 13
+		..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4
 		..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{93f7572c-64b9-4096-9ef9-6ba0ede2b50d}*SharedItemsImports = 4
 		..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4
 		..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{c0a6bd9c-3ee5-4b12-8ce4-cee95178539c}*SharedItemsImports = 4
@@ -62,9 +68,11 @@ Global
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
@@ -72,6 +80,9 @@ Global
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|ARM.ActiveCfg = Debug|ARM
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|ARM.Build.0 = Debug|ARM
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|ARM.Deploy.0 = Debug|ARM
+		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|ARM64.Deploy.0 = Debug|ARM64
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|x64.ActiveCfg = Debug|x64
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|x64.Build.0 = Debug|x64
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Debug|x64.Deploy.0 = Debug|x64
@@ -81,6 +92,9 @@ Global
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM.ActiveCfg = Release|ARM
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM.Build.0 = Release|ARM
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM.Deploy.0 = Release|ARM
+		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM64.Build.0 = Release|ARM64
+		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|ARM64.Deploy.0 = Release|ARM64
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|x64.ActiveCfg = Release|x64
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|x64.Build.0 = Release|x64
 		{09F4E6C1-2D12-4059-AA96-0B190861FD6A}.Release|x64.Deploy.0 = Release|x64
@@ -90,6 +104,7 @@ Global
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|ARM.Build.0 = Debug|ARM
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|ARM.Deploy.0 = Debug|ARM
+		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|x64.ActiveCfg = Debug|x64
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|x64.Build.0 = Debug|x64
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Debug|x64.Deploy.0 = Debug|x64
@@ -99,6 +114,7 @@ Global
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|ARM.ActiveCfg = Release|ARM
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|ARM.Build.0 = Release|ARM
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|ARM.Deploy.0 = Release|ARM
+		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|ARM64.ActiveCfg = Release|Win32
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|x64.ActiveCfg = Release|x64
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|x64.Build.0 = Release|x64
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|x64.Deploy.0 = Release|x64
@@ -107,112 +123,166 @@ Global
 		{93F7572C-64B9-4096-9EF9-6BA0EDE2B50D}.Release|x86.Deploy.0 = Release|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM
+		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM
+		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.ActiveCfg = Debug|ARM
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM.Build.0 = Debug|ARM
+		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.ActiveCfg = Debug|x64
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x64.Build.0 = Debug|x64
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.ActiveCfg = Debug|Win32
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Debug|x86.Build.0 = Debug|Win32
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.ActiveCfg = Release|ARM
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM.Build.0 = Release|ARM
+		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|ARM64.ActiveCfg = Release|Win32
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.ActiveCfg = Release|x64
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x64.Build.0 = Release|x64
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.ActiveCfg = Release|Win32
 		{2D5D43D9-CFFC-4C40-B4CD-02EFB4E2742B}.Release|x86.Build.0 = Release|Win32
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM
+		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM
+		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|Win32
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32
 		{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM
+		{11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM
+		{11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|Win32
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32
 		{11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM
+		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM
+		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|Win32
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32
 		{F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|ARM.ActiveCfg = Debug|ARM
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|ARM.Build.0 = Debug|ARM
+		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|ARM64.ActiveCfg = Debug|x86
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x64.ActiveCfg = Debug|x64
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x64.Build.0 = Debug|x64
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x86.ActiveCfg = Debug|x86
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Debug|x86.Build.0 = Debug|x86
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|ARM.ActiveCfg = Release|ARM
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|ARM.Build.0 = Release|ARM
+		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|ARM64.ActiveCfg = Release|x86
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x64.ActiveCfg = Release|x64
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x64.Build.0 = Release|x64
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x86.ActiveCfg = Release|x86
 		{C0A6BD9C-3EE5-4B12-8CE4-CEE95178539C}.Release|x86.Build.0 = Release|x86
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|ARM.ActiveCfg = Debug|ARM
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|ARM.Build.0 = Debug|ARM
+		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x64.ActiveCfg = Debug|x64
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x64.Build.0 = Debug|x64
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x86.ActiveCfg = Debug|Win32
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Debug|x86.Build.0 = Debug|Win32
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|ARM.ActiveCfg = Release|ARM
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|ARM.Build.0 = Release|ARM
+		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|ARM64.ActiveCfg = Release|Win32
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x64.ActiveCfg = Release|x64
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x64.Build.0 = Release|x64
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x86.ActiveCfg = Release|Win32
 		{47EEC7F3-40D3-49BA-82C1-EAF103B54215}.Release|x86.Build.0 = Release|Win32
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM
+		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM
+		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.ActiveCfg = Release|Win32
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32
 		{A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM
+		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM
+		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|Win32
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|ARM.ActiveCfg = Debug|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|ARM64.ActiveCfg = Debug|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.ActiveCfg = Debug|x64
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.Build.0 = Debug|x64
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.ActiveCfg = Debug|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.Build.0 = Debug|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM.ActiveCfg = Release|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM64.ActiveCfg = Release|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.ActiveCfg = Release|x64
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.Build.0 = Release|x64
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.ActiveCfg = Release|Win32
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.Build.0 = Release|Win32
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.ActiveCfg = Debug|ARM
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Build.0 = Debug|ARM
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Deploy.0 = Debug|ARM
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Build.0 = Debug|ARM64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.ActiveCfg = Debug|x64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Build.0 = Debug|x64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Deploy.0 = Debug|x64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.ActiveCfg = Debug|x86
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Build.0 = Debug|x86
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Deploy.0 = Debug|x86
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.ActiveCfg = Release|ARM
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Build.0 = Release|ARM
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Deploy.0 = Release|ARM
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.ActiveCfg = Release|ARM64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Build.0 = Release|ARM64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Deploy.0 = Release|ARM64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.ActiveCfg = Release|x64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Build.0 = Release|x64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Deploy.0 = Release|x64
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.ActiveCfg = Release|x86
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Build.0 = Release|x86
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -229,6 +299,8 @@ Global
 		{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
 		{67A1076F-7790-4203-86EA-4402CCB5E782} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
 		{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
+		{6C60E295-C8CA-4DC5-B8BE-09888F58B249} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
+		{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AE882847-CAE9-450F-8962-E76672DC23CE}
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp
index 3c624107e1c..fec7cfa9523 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.cpp
@@ -38,7 +38,7 @@ FrameworkElement CircleViewManagerCPP::CreateView() noexcept {
 
 // IViewManagerWithChildren
 
-void CircleViewManagerCPP::AddView(FrameworkElement const &parent, UIElement const &child, int64_t index) noexcept {
+void CircleViewManagerCPP::AddView(FrameworkElement const &parent, UIElement const &child, int64_t /*index*/) noexcept {
   if (auto const &border = parent.try_as<Border>()) {
     border.Child(child);
   }
@@ -50,7 +50,7 @@ void CircleViewManagerCPP::RemoveAllChildren(FrameworkElement const &parent) noe
   }
 }
 
-void CircleViewManagerCPP::RemoveChildAt(FrameworkElement const &parent, int64_t index) noexcept {
+void CircleViewManagerCPP::RemoveChildAt(FrameworkElement const &parent, int64_t /*index*/) noexcept {
   if (auto const &border = parent.try_as<Border>()) {
     border.Child(nullptr);
   }
@@ -58,7 +58,7 @@ void CircleViewManagerCPP::RemoveChildAt(FrameworkElement const &parent, int64_t
 
 void CircleViewManagerCPP::ReplaceChild(
     FrameworkElement const &parent,
-    UIElement const &oldChild,
+    UIElement const & /*oldChild*/,
     UIElement const &newChild) noexcept {
   if (auto const &border = parent.try_as<Border>()) {
     border.Child(newChild);
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h
index 303ef925f05..12f2e12fbf6 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/CircleViewManagerCPP.h
@@ -40,9 +40,9 @@ struct HeightToCornerRadiusConverter
 
   winrt::Windows::Foundation::IInspectable Convert(
       winrt::Windows::Foundation::IInspectable const &value,
-      winrt::Windows::UI::Xaml::Interop::TypeName const &targetType,
-      winrt::Windows::Foundation::IInspectable const &parameter,
-      winrt::hstring const &language) noexcept {
+      winrt::Windows::UI::Xaml::Interop::TypeName const & /*targetType*/,
+      winrt::Windows::Foundation::IInspectable const & /*parameter*/,
+      winrt::hstring const & /*language*/) noexcept {
     double d = winrt::unbox_value<double>(value);
 
     if (isnan(d)) {
@@ -54,9 +54,9 @@ struct HeightToCornerRadiusConverter
 
   winrt::Windows::Foundation::IInspectable ConvertBack(
       winrt::Windows::Foundation::IInspectable const &value,
-      winrt::Windows::UI::Xaml::Interop::TypeName const &targetType,
-      winrt::Windows::Foundation::IInspectable const &parameter,
-      winrt::hstring const &language) noexcept {
+      winrt::Windows::UI::Xaml::Interop::TypeName const & /*targetType*/,
+      winrt::Windows::Foundation::IInspectable const & /*parameter*/,
+      winrt::hstring const & /*language*/) noexcept {
     return value;
   }
 
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp
index 2ee07288c1e..58a46bec3c9 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/ReactPackageProvider.cpp
@@ -12,7 +12,6 @@
 #include "SampleModuleCPP.h"
 
 using namespace winrt::Microsoft::ReactNative::Bridge;
-using namespace Microsoft::ReactNative;
 
 namespace winrt::SampleLibraryCPP::implementation {
 
@@ -21,8 +20,9 @@ void ReactPackageProvider::CreatePackage(IReactPackageBuilder const &packageBuil
   packageBuilder.AddViewManager(L"CustomUserControlViewManagerCPP", [](IReactContext const &reactContext) {
     return winrt::make<CustomUserControlViewManagerCPP>(reactContext);
   });
-  packageBuilder.AddViewManager(
-      L"CircleViewManagerCPP", [](IReactContext const &reactContext) { return winrt::make<CircleViewManagerCPP>(); });
+  packageBuilder.AddViewManager(L"CircleViewManagerCPP", [](IReactContext const & /*reactContext*/) {
+    return winrt::make<CircleViewManagerCPP>();
+  });
 }
 
 } // namespace winrt::SampleLibraryCPP::implementation
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
index 38901561b68..fa6314550c2 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -158,13 +158,13 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h
index 141c6fa115a..c59bc041f49 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleModuleCPP.h
@@ -29,9 +29,9 @@ struct SampleModuleCPP {
   const std::string StringConstant = "Hello World";
 
   REACT_CONSTANT_PROVIDER(ConstantsViaConstantsProvider)
-  void ConstantsViaConstantsProvider(const winrt::Microsoft::ReactNative::Bridge::IJSValueWriter &writer) noexcept {
-    ::Microsoft::ReactNative::WriteProperty(writer, "NumberConstantViaProvider", M_PI);
-    ::Microsoft::ReactNative::WriteProperty(writer, "StringConstantViaProvider", "Hello World");
+  void ConstantsViaConstantsProvider(ReactConstantProvider &constants) noexcept {
+    constants.Add(L"NumberConstantViaProvider", M_PI);
+    constants.Add(L"StringConstantViaProvider", "Hello World");
   }
 
 #pragma endregion
@@ -77,27 +77,24 @@ struct SampleModuleCPP {
   }
 
   REACT_METHOD(ExplicitPromiseMethod);
-  void ExplicitPromiseMethod(
-      std::function<void(double)> &&resolve,
-      std::function<void(std::string)> &&reject) noexcept {
+  void ExplicitPromiseMethod(winrt::Microsoft::ReactNative::Bridge::ReactPromise<double> &&result) noexcept {
     DebugWriteLine(Name, "ExplicitPromiseMethod");
     try {
-      resolve(M_PI);
+      result.Resolve(M_PI);
     } catch (const std::exception &ex) {
-      reject(ex.what());
+      result.Reject(ex.what());
     }
   }
 
   REACT_METHOD(ExplicitPromiseMethodWithArgs);
   void ExplicitPromiseMethodWithArgs(
       double arg,
-      std::function<void(double)> &&resolve,
-      std::function<void(std::string)> &&reject) noexcept {
+      winrt::Microsoft::ReactNative::Bridge::ReactPromise<double> &&result) noexcept {
     DebugWriteLine(Name, "ExplicitPromiseMethodWithArgs", arg);
     try {
-      resolve(M_PI);
+      result.Resolve(M_PI);
     } catch (const std::exception &ex) {
-      reject(ex.what());
+      result.Reject(ex.what());
     }
   }
 
@@ -121,7 +118,7 @@ struct SampleModuleCPP {
 
 #pragma region Events
 
-  REACT_EVENT(TimedEvent, "TimedEventCPP");
+  REACT_EVENT(TimedEvent, L"TimedEventCPP");
   std::function<void(int)> TimedEvent;
 
 #pragma endregion
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleModuleCS.cs b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleModuleCS.cs
index a12360c4238..b96d8fc7406 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleModuleCS.cs
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleModuleCS.cs
@@ -1,15 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.ReactNative.Managed;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-
 using Windows.System.Threading;
 
-using Microsoft.ReactNative.Bridge;
-using Microsoft.ReactNative.Managed;
-
 namespace SampleLibraryCS
 {
     // Sample ReactModule
@@ -83,32 +79,32 @@ public void ExplicitCallbackMethodWithArgs(double arg, ReactCallback<double> cal
         }
 
         [ReactMethod]
-        public void ExplicitPromiseMethod(ReactCallback<double> resolve, ReactCallback<string> reject)
+        public void ExplicitPromiseMethod(IReactPromise<double> result)
         {
             Debug.WriteLine($"{Name}.{nameof(ExplicitPromiseMethod)}()");
 
             try
             {
-                resolve(Math.PI);
+                result.Resolve(Math.PI);
             }
             catch (Exception ex)
             {
-                reject(ex.Message);
+                result.Reject(new ReactError { Message = ex.Message });
             }
         }
 
         [ReactMethod]
-        public void ExplicitPromiseMethodWithArgs(double arg, ReactCallback<double> resolve, ReactCallback<string> reject)
+        public void ExplicitPromiseMethodWithArgs(double arg, IReactPromise<double> result)
         {
             Debug.WriteLine($"{Name}.{nameof(ExplicitPromiseMethodWithArgs)}({arg})");
 
             try
             {
-                resolve(Math.PI);
+                result.Resolve(Math.PI);
             }
             catch (Exception ex)
             {
-                reject(ex.Message);
+                result.Reject(new ReactError { Message = ex.Message });
             }
         }
 
diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
index 6aeb7404fc8..4a7bc4f3790 100644
--- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
+++ b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
@@ -77,15 +77,15 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\boost.1.68.0.0\build\boost.targets" Condition="Exists('..\packages\boost.1.68.0.0\build\boost.targets')" />
-    <Import Project="..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets" Condition="Exists('..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" />
+    <Import Project="$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets" Condition="Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" />
+    <Import Project="$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets" Condition="Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\boost.1.68.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.68.0.0\build\boost.targets'))" />
-    <Error Condition="!Exists('..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
   </Target>
   <Target Name="GetTargetFileName" Returns="$(OutDir)$(TargetName).dll" />
 </Project>
\ No newline at end of file
diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj
index a13b12a0645..60897835fe1 100644
--- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj
+++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj
@@ -120,8 +120,8 @@
     <Import Project="$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets" Condition="Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" />
     <Import Project="$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets" Condition="Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" />
     <Import Project="$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets" Condition="Exists('$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets')" />
-    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
-    <Import Project="..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets" Condition="Exists('..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" />
+    <Import Project="$(SolutionDir)packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
+    <Import Project="$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -130,7 +130,7 @@
     <Error Condition="!Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/vnext/JSI/Desktop/JSI.Desktop.vcxproj b/vnext/JSI/Desktop/JSI.Desktop.vcxproj
index 3cd2dac30fc..914c809bc3d 100644
--- a/vnext/JSI/Desktop/JSI.Desktop.vcxproj
+++ b/vnext/JSI/Desktop/JSI.Desktop.vcxproj
@@ -80,14 +80,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" Condition="'$(CHAKRACOREUWP)'!='true'">
-    <Import Project="..\..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets" Condition="Exists('..\..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" />
-    <Import Project="..\..\packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets" Condition="Exists('..\..\packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets')" />
+    <Import Project="$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" />
+    <Import Project="$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets" Condition="Exists('$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(CHAKRACOREUWP)'!='true'">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets'))" />
-    <Error Condition="!Exists('..\..\packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.42\build\native\ChakraCore.Debugger.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/JSValueReaderTest.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JSValueReaderTest.cpp
new file mode 100644
index 00000000000..be9941c7d02
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JSValueReaderTest.cpp
@@ -0,0 +1,466 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "JSValueReader.h"
+#include <variant>
+#include "JSValueWriter.h"
+#include "JsonJSValueReader.h"
+#include "catch.hpp"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+enum struct RobotModel {
+  T2,
+  R2D2,
+  C3PO,
+};
+
+// We are generating ReadValue for it.
+enum struct RobotShape {
+  Humanoid,
+  Trashcan,
+  Beercan,
+  Quadrocopter,
+};
+
+struct RobotTool {
+  std::string Name;
+  int Weight;
+  bool IsEnabled;
+};
+
+// This is how we can provide "reflection" information about type outside of struct.
+FieldMap GetStructInfo(RobotTool *) {
+  return {{L"Name", &RobotTool::Name}, {L"Weight", &RobotTool::Weight}, {L"IsEnabled", &RobotTool::IsEnabled}};
+}
+
+struct RobotPoint {
+  int X;
+  int Y;
+};
+
+FieldMap GetStructInfo(RobotPoint *) {
+  return {{L"X", &RobotPoint::X}, {L"Y", &RobotPoint::Y}};
+}
+
+// We can provide "reflection" information about struct using REACT_STRUCT and REACT_FIELD macros.
+REACT_STRUCT(T2Extra)
+struct T2Extra {
+  REACT_FIELD(ActorName)
+  std::string ActorName;
+
+  REACT_FIELD(MovieYear)
+  int MovieYear;
+};
+
+REACT_STRUCT(R2D2Extra)
+struct R2D2Extra {
+  REACT_FIELD(MovieSeries)
+  std::string MovieSeries;
+};
+
+struct RobotInfo {
+  RobotModel Model;
+  std::string Name;
+  int Age;
+  RobotShape Shape;
+  std::optional<RobotShape> Shape2;
+  std::optional<RobotShape> Shape3;
+  std::vector<int> Steps;
+  std::map<std::string, int> Dimensions;
+  std::tuple<int, std::string, bool> Badges;
+  std::vector<RobotTool> Tools;
+  std::vector<RobotPoint> Path;
+  std::variant<T2Extra, R2D2Extra> Extra;
+};
+
+// Reading RobotModel enum value. We could use template-based version instead.
+void ReadValue(IJSValueReader const &reader, RobotModel &value) noexcept {
+  value = static_cast<RobotModel>(ReadValue<int>(reader));
+}
+
+// Writing RobotModel enum value. We could use template-based version instead.
+void WriteValue(IJSValueWriter const &writer, RobotModel value) noexcept {
+  WriteValue(writer, static_cast<int>(value));
+}
+
+// Reading discriminating union requires using JSValue.
+void ReadValue(const JSValue &jsValue, std::variant<T2Extra, R2D2Extra> &value) noexcept {
+  switch (ReadValue<RobotModel>(jsValue["Kind"])) {
+    case RobotModel::T2:
+      value = ReadValue<T2Extra>(jsValue);
+      break;
+    case RobotModel::R2D2:
+      value = ReadValue<R2D2Extra>(jsValue);
+      break;
+  }
+}
+
+// Writing discriminating union.
+void WriteValue(IJSValueWriter const &writer, std::variant<T2Extra, R2D2Extra> const &value) noexcept {
+  writer.WriteObjectBegin();
+  if (const T2Extra *t2 = std::get_if<T2Extra>(&value)) {
+    WriteProperty(writer, L"Kind", RobotModel::T2);
+    WriteProperties(writer, *t2);
+  } else if (const R2D2Extra *r2d2 = std::get_if<R2D2Extra>(&value)) {
+    WriteProperty(writer, L"Kind", RobotModel::R2D2);
+    WriteProperties(writer, *r2d2);
+  }
+  writer.WriteObjectEnd();
+}
+
+// Reading RobotInfo value. It could be generated instead.
+void ReadValue(IJSValueReader const &reader, RobotInfo &value) noexcept {
+  value = RobotInfo();
+  if (reader.ValueType() == JSValueType::Object) {
+    hstring propertyName;
+    while (reader.GetNextObjectProperty(/*out*/ propertyName)) {
+      if (propertyName == L"Model")
+        ReadValue(reader, value.Model);
+      else if (propertyName == L"Name")
+        ReadValue(reader, value.Name);
+      else if (propertyName == L"Age")
+        ReadValue(reader, value.Age);
+      else if (propertyName == L"Shape")
+        ReadValue(reader, value.Shape);
+      else if (propertyName == L"Shape2")
+        ReadValue(reader, value.Shape2);
+      else if (propertyName == L"Shape3")
+        ReadValue(reader, value.Shape3);
+      else if (propertyName == L"Steps")
+        ReadValue(reader, value.Steps);
+      else if (propertyName == L"Dimensions")
+        ReadValue(reader, value.Dimensions);
+      else if (propertyName == L"Badges")
+        ReadValue(reader, value.Badges);
+      else if (propertyName == L"Tools")
+        ReadValue(reader, value.Tools);
+      else if (propertyName == L"Path")
+        ReadValue(reader, value.Path);
+      else if (propertyName == L"Extra")
+        ReadValue(reader, value.Extra);
+      else
+        ReadValue<JSValue>(reader);
+    }
+  }
+}
+
+// Writing RobotInfo value. It could be generated instead.
+void WriteValue(IJSValueWriter const &writer, RobotInfo const &value) noexcept {
+  writer.WriteObjectBegin();
+  WriteProperty(writer, L"Model", value.Model);
+  WriteProperty(writer, L"Name", value.Name);
+  WriteProperty(writer, L"Age", value.Age);
+  WriteProperty(writer, L"Shape", value.Shape);
+  WriteProperty(writer, L"Shape2", value.Shape2);
+  WriteProperty(writer, L"Shape3", value.Shape3);
+  WriteProperty(writer, L"Steps", value.Steps);
+  WriteProperty(writer, L"Dimensions", value.Dimensions);
+  WriteProperty(writer, L"Badges", value.Badges);
+  WriteProperty(writer, L"Tools", value.Tools);
+  WriteProperty(writer, L"Path", value.Path);
+  WriteProperty(writer, L"Extra", value.Extra);
+  writer.WriteObjectEnd();
+}
+
+TEST_CASE("TestReadCustomType", "JSValueReaderTest") {
+  const wchar_t *json =
+      LR"JSON({
+        "Model": 1,
+        "Name": "Bob",
+        "Age": 42,
+        "Shape": 1,
+        "Shape2": 2,
+        "Shape3": null,
+        "Steps": [1, 2, 3],
+        "Dimensions": {"Width": 24, "Height": 78},
+        "Badges": [2, "Maverick", true],
+        "Tools": [
+          {"Name": "Screwdriver", "Weight": 2, "IsEnabled": true},
+          {"Name": "Electro-shocker", "Weight": 3, "IsEnabled": false}],
+        "Path": [{"X": 5, "Y": 6}, {"X": 45, "Y": 90}, {"X": 15, "Y": 16}],
+        "Extra": {"Kind": 1, "MovieSeries" : "Episode 2"}
+    })JSON";
+
+  IJSValueReader reader = make<JsonJSValueReader>(json);
+
+  RobotInfo robot = ReadValue<RobotInfo>(reader);
+  REQUIRE(robot.Model == RobotModel::R2D2);
+  REQUIRE(robot.Name == "Bob");
+  REQUIRE(robot.Age == 42);
+  REQUIRE(robot.Shape == RobotShape::Trashcan);
+  REQUIRE(*robot.Shape2 == RobotShape::Beercan);
+  REQUIRE(!robot.Shape3.has_value());
+  REQUIRE(robot.Steps.size() == 3);
+  REQUIRE(robot.Steps[0] == 1);
+  REQUIRE(robot.Steps[1] == 2);
+  REQUIRE(robot.Steps[2] == 3);
+  REQUIRE(robot.Dimensions.size() == 2);
+  REQUIRE(robot.Dimensions["Width"] == 24);
+  REQUIRE(robot.Dimensions["Height"] == 78);
+  REQUIRE(std::get<0>(robot.Badges) == 2);
+  REQUIRE(std::get<1>(robot.Badges) == "Maverick");
+  REQUIRE(std::get<2>(robot.Badges) == true);
+  REQUIRE(robot.Tools.size() == 2);
+  REQUIRE(robot.Tools[0].Name == "Screwdriver");
+  REQUIRE(robot.Tools[0].Weight == 2);
+  REQUIRE(robot.Tools[0].IsEnabled == true);
+  REQUIRE(robot.Tools[1].Name == "Electro-shocker");
+  REQUIRE(robot.Tools[1].Weight == 3);
+  REQUIRE(robot.Tools[1].IsEnabled == false);
+  REQUIRE(robot.Path.size() == 3);
+  REQUIRE(robot.Path[0].X == 5);
+  REQUIRE(robot.Path[0].Y == 6);
+  REQUIRE(robot.Path[1].X == 45);
+  REQUIRE(robot.Path[1].Y == 90);
+  REQUIRE(robot.Path[2].X == 15);
+  REQUIRE(robot.Path[2].Y == 16);
+  const R2D2Extra *r2d2Extra = std::get_if<R2D2Extra>(&robot.Extra);
+  REQUIRE(r2d2Extra != nullptr);
+  REQUIRE(r2d2Extra->MovieSeries == "Episode 2");
+}
+
+TEST_CASE("TestWriteCustomType", "JSValueReaderTest") {
+  RobotInfo robot{};
+  robot.Model = RobotModel::R2D2;
+  robot.Name = "Bob";
+  robot.Age = 42;
+  robot.Shape = RobotShape::Trashcan;
+  robot.Shape2 = RobotShape::Beercan;
+  robot.Shape3 = std::nullopt;
+  robot.Steps = std::vector<int>{1, 2, 3};
+  robot.Dimensions = std::map<std::string, int>{{"Width", 24}, {"Height", 78}};
+  robot.Badges = std::tuple<int, std::string, bool>{2, "Maverick", true};
+  robot.Tools = std::vector<RobotTool>{RobotTool{/*Name =*/"Screwdriver", /*Weight =*/2, /*IsEnabled =*/true},
+                                       RobotTool{/*Name =*/"Electro-shocker", /*Weight =*/3, /*IsEnabled =*/false}};
+  robot.Path = std::vector<RobotPoint>{
+      RobotPoint{/*X =*/5, /*Y =*/6}, RobotPoint{/*X =*/45, /*Y =*/90}, RobotPoint{/*X =*/15, /*Y =*/16}};
+  robot.Extra = R2D2Extra{/*MovieSeries =*/"Episode 2"};
+
+  JSValue jsValue;
+  auto writer = MakeJSValueTreeWriter(jsValue);
+  WriteValue(writer, robot);
+
+  REQUIRE(jsValue["Model"] == (int)RobotModel::R2D2);
+  REQUIRE(jsValue["Name"] == "Bob");
+  REQUIRE(jsValue["Age"] == 42);
+  REQUIRE(jsValue["Shape"] == (int)RobotShape::Trashcan);
+  REQUIRE(jsValue["Shape2"] == (int)RobotShape::Beercan);
+  REQUIRE(jsValue["Shape3"] == nullptr);
+  REQUIRE(jsValue["Steps"].ItemCount() == 3);
+  REQUIRE(jsValue["Steps"][0] == 1);
+  REQUIRE(jsValue["Steps"][1] == 2);
+  REQUIRE(jsValue["Steps"][2] == 3);
+  REQUIRE(jsValue["Dimensions"].PropertyCount() == 2);
+  REQUIRE(jsValue["Dimensions"]["Width"] == 24);
+  REQUIRE(jsValue["Dimensions"]["Height"] == 78);
+  REQUIRE(jsValue["Badges"][0] == 2);
+  REQUIRE(jsValue["Badges"][1] == "Maverick");
+  REQUIRE(jsValue["Badges"][2] == true);
+  REQUIRE(jsValue["Tools"].ItemCount() == 2);
+  REQUIRE(jsValue["Tools"][0]["Name"] == "Screwdriver");
+  REQUIRE(jsValue["Tools"][0]["Weight"] == 2);
+  REQUIRE(jsValue["Tools"][0]["IsEnabled"] == true);
+  REQUIRE(jsValue["Tools"][1]["Name"] == "Electro-shocker");
+  REQUIRE(jsValue["Tools"][1]["Weight"] == 3);
+  REQUIRE(jsValue["Tools"][1]["IsEnabled"] == false);
+  REQUIRE(jsValue["Path"].ItemCount() == 3);
+  REQUIRE(jsValue["Path"][0]["X"] == 5);
+  REQUIRE(jsValue["Path"][0]["Y"] == 6);
+  REQUIRE(jsValue["Path"][1]["X"] == 45);
+  REQUIRE(jsValue["Path"][1]["Y"] == 90);
+  REQUIRE(jsValue["Path"][2]["X"] == 15);
+  REQUIRE(jsValue["Path"][2]["Y"] == 16);
+  REQUIRE(jsValue["Extra"]["MovieSeries"] == "Episode 2");
+}
+
+TEST_CASE("TestReadValueDefaultExtensions", "JSValueReaderTest") {
+  const wchar_t *json =
+      LR"JSON({
+      "StringValue1": "",
+      "StringValue2": "5",
+      "StringValue3": "Hello",
+      "BoolValue1": false,
+      "BoolValue2": true,
+      "IntValue1": 0,
+      "IntValue2": 42,
+      "FloatValue": 3.14,
+      "NullValue": null
+    })JSON";
+
+  IJSValueReader reader = make<JsonJSValueReader>(json);
+
+  REQUIRE(reader.ValueType() == JSValueType::Object);
+  int properyCount = 0;
+  hstring propertyName;
+  while (reader.GetNextObjectProperty(/*out*/ propertyName)) {
+    if (propertyName == L"StringValue1") {
+      REQUIRE(ReadValue<std::string>(reader) == "");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"");
+      REQUIRE(ReadValue<bool>(reader) == false);
+      REQUIRE(ReadValue<int8_t>(reader) == 0);
+      REQUIRE(ReadValue<int16_t>(reader) == 0);
+      REQUIRE(ReadValue<int32_t>(reader) == 0);
+      REQUIRE(ReadValue<int64_t>(reader) == 0);
+      REQUIRE(ReadValue<uint8_t>(reader) == 0);
+      REQUIRE(ReadValue<uint16_t>(reader) == 0);
+      REQUIRE(ReadValue<uint32_t>(reader) == 0);
+      REQUIRE(ReadValue<uint64_t>(reader) == 0);
+      REQUIRE(ReadValue<float>(reader) == 0);
+      REQUIRE(ReadValue<double>(reader) == 0);
+      ++properyCount;
+    } else if (propertyName == L"StringValue2") {
+      REQUIRE(ReadValue<std::string>(reader) == "5");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"5");
+      REQUIRE(ReadValue<bool>(reader) == true);
+      REQUIRE(ReadValue<int8_t>(reader) == 5);
+      REQUIRE(ReadValue<int16_t>(reader) == 5);
+      REQUIRE(ReadValue<int32_t>(reader) == 5);
+      REQUIRE(ReadValue<int64_t>(reader) == 5);
+      REQUIRE(ReadValue<uint8_t>(reader) == 5);
+      REQUIRE(ReadValue<uint16_t>(reader) == 5);
+      REQUIRE(ReadValue<uint32_t>(reader) == 5);
+      REQUIRE(ReadValue<uint64_t>(reader) == 5);
+      REQUIRE(ReadValue<float>(reader) == 5);
+      REQUIRE(ReadValue<double>(reader) == 5);
+      ++properyCount;
+    } else if (propertyName == L"StringValue3") {
+      REQUIRE(ReadValue<std::string>(reader) == "Hello");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"Hello");
+      REQUIRE(ReadValue<bool>(reader) == true);
+      REQUIRE(ReadValue<int8_t>(reader) == 0);
+      REQUIRE(ReadValue<int16_t>(reader) == 0);
+      REQUIRE(ReadValue<int32_t>(reader) == 0);
+      REQUIRE(ReadValue<int64_t>(reader) == 0);
+      REQUIRE(ReadValue<uint8_t>(reader) == 0);
+      REQUIRE(ReadValue<uint16_t>(reader) == 0);
+      REQUIRE(ReadValue<uint32_t>(reader) == 0);
+      REQUIRE(ReadValue<uint64_t>(reader) == 0);
+      REQUIRE(ReadValue<float>(reader) == 0);
+      REQUIRE(ReadValue<double>(reader) == 0);
+      ++properyCount;
+    } else if (propertyName == L"BoolValue1") {
+      REQUIRE(ReadValue<std::string>(reader) == "false");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"false");
+      REQUIRE(ReadValue<bool>(reader) == false);
+      REQUIRE(ReadValue<int8_t>(reader) == 0);
+      REQUIRE(ReadValue<int16_t>(reader) == 0);
+      REQUIRE(ReadValue<int32_t>(reader) == 0);
+      REQUIRE(ReadValue<int64_t>(reader) == 0);
+      REQUIRE(ReadValue<uint8_t>(reader) == 0);
+      REQUIRE(ReadValue<uint16_t>(reader) == 0);
+      REQUIRE(ReadValue<uint32_t>(reader) == 0);
+      REQUIRE(ReadValue<uint64_t>(reader) == 0);
+      REQUIRE(ReadValue<float>(reader) == 0);
+      REQUIRE(ReadValue<double>(reader) == 0);
+      ++properyCount;
+    } else if (propertyName == L"BoolValue2") {
+      REQUIRE(ReadValue<std::string>(reader) == "true");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"true");
+      REQUIRE(ReadValue<bool>(reader) == true);
+      REQUIRE(ReadValue<int8_t>(reader) == 1);
+      REQUIRE(ReadValue<int16_t>(reader) == 1);
+      REQUIRE(ReadValue<int32_t>(reader) == 1);
+      REQUIRE(ReadValue<int64_t>(reader) == 1);
+      REQUIRE(ReadValue<uint8_t>(reader) == 1);
+      REQUIRE(ReadValue<uint16_t>(reader) == 1);
+      REQUIRE(ReadValue<uint32_t>(reader) == 1);
+      REQUIRE(ReadValue<uint64_t>(reader) == 1);
+      REQUIRE(ReadValue<float>(reader) == 1);
+      REQUIRE(ReadValue<double>(reader) == 1);
+      ++properyCount;
+    } else if (propertyName == L"IntValue1") {
+      REQUIRE(ReadValue<std::string>(reader) == "0");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"0");
+      REQUIRE(ReadValue<bool>(reader) == false);
+      REQUIRE(ReadValue<int8_t>(reader) == 0);
+      REQUIRE(ReadValue<int16_t>(reader) == 0);
+      REQUIRE(ReadValue<int32_t>(reader) == 0);
+      REQUIRE(ReadValue<int64_t>(reader) == 0);
+      REQUIRE(ReadValue<uint8_t>(reader) == 0);
+      REQUIRE(ReadValue<uint16_t>(reader) == 0);
+      REQUIRE(ReadValue<uint32_t>(reader) == 0);
+      REQUIRE(ReadValue<uint64_t>(reader) == 0);
+      REQUIRE(ReadValue<float>(reader) == 0);
+      REQUIRE(ReadValue<double>(reader) == 0);
+      ++properyCount;
+    } else if (propertyName == L"IntValue2") {
+      REQUIRE(ReadValue<std::string>(reader) == "42");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"42");
+      REQUIRE(ReadValue<bool>(reader) == true);
+      REQUIRE(ReadValue<int8_t>(reader) == 42);
+      REQUIRE(ReadValue<int16_t>(reader) == 42);
+      REQUIRE(ReadValue<int32_t>(reader) == 42);
+      REQUIRE(ReadValue<int64_t>(reader) == 42);
+      REQUIRE(ReadValue<uint8_t>(reader) == 42);
+      REQUIRE(ReadValue<uint16_t>(reader) == 42);
+      REQUIRE(ReadValue<uint32_t>(reader) == 42);
+      REQUIRE(ReadValue<uint64_t>(reader) == 42);
+      REQUIRE(ReadValue<float>(reader) == 42);
+      REQUIRE(ReadValue<double>(reader) == 42);
+      ++properyCount;
+    } else if (propertyName == L"FloatValue") {
+      REQUIRE(ReadValue<std::string>(reader) == "3.14");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"3.14");
+      REQUIRE(ReadValue<bool>(reader) == true);
+      REQUIRE(ReadValue<int8_t>(reader) == 3);
+      REQUIRE(ReadValue<int16_t>(reader) == 3);
+      REQUIRE(ReadValue<int32_t>(reader) == 3);
+      REQUIRE(ReadValue<int64_t>(reader) == 3);
+      REQUIRE(ReadValue<uint8_t>(reader) == 3);
+      REQUIRE(ReadValue<uint16_t>(reader) == 3);
+      REQUIRE(ReadValue<uint32_t>(reader) == 3);
+      REQUIRE(ReadValue<uint64_t>(reader) == 3);
+      REQUIRE(ReadValue<float>(reader) == 3.14f);
+      REQUIRE(ReadValue<double>(reader) == 3.14);
+      ++properyCount;
+    } else if (propertyName == L"NullValue") {
+      REQUIRE(ReadValue<std::string>(reader) == "");
+      REQUIRE(ReadValue<std::wstring>(reader) == L"");
+      REQUIRE(ReadValue<bool>(reader) == false);
+      REQUIRE(ReadValue<int8_t>(reader) == 0);
+      REQUIRE(ReadValue<int16_t>(reader) == 0);
+      REQUIRE(ReadValue<int32_t>(reader) == 0);
+      REQUIRE(ReadValue<int64_t>(reader) == 0);
+      REQUIRE(ReadValue<uint8_t>(reader) == 0);
+      REQUIRE(ReadValue<uint16_t>(reader) == 0);
+      REQUIRE(ReadValue<uint32_t>(reader) == 0);
+      REQUIRE(ReadValue<uint64_t>(reader) == 0);
+      REQUIRE(ReadValue<float>(reader) == 0);
+      REQUIRE(ReadValue<double>(reader) == 0);
+
+      ++properyCount;
+    }
+  }
+  REQUIRE(properyCount == 9);
+}
+
+TEST_CASE("TestWriteValueDefaultExtensions", "JSValueReaderTest") {
+  JSValue jsValue;
+  auto writer = MakeJSValueTreeWriter(jsValue);
+  writer.WriteObjectBegin();
+  WriteProperty(writer, L"StringValue1", "");
+  WriteProperty(writer, L"StringValue2", "5");
+  WriteProperty(writer, L"StringValue3", "Hello");
+  WriteProperty(writer, L"BoolValue1", false);
+  WriteProperty(writer, L"BoolValue2", true);
+  WriteProperty(writer, L"IntValue1", 0);
+  WriteProperty(writer, L"IntValue2", 42);
+  WriteProperty(writer, L"FloatValue", 3.14);
+  WriteProperty(writer, L"NullValue", nullptr);
+  writer.WriteObjectEnd();
+
+  REQUIRE(jsValue["StringValue1"] == "");
+  REQUIRE(jsValue["StringValue2"] == "5");
+  REQUIRE(jsValue["StringValue3"] == "Hello");
+  REQUIRE(jsValue["BoolValue1"] == false);
+  REQUIRE(jsValue["BoolValue2"] == true);
+  REQUIRE(jsValue["IntValue1"] == 0);
+  REQUIRE(jsValue["IntValue2"] == 42);
+  REQUIRE(jsValue["FloatValue"] == 3.14);
+  REQUIRE(jsValue["NullValue"] == nullptr);
+  REQUIRE(jsValue["NullValue"] == JSValue::Null);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/JSValueTest.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JSValueTest.cpp
new file mode 100644
index 00000000000..4096b502235
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JSValueTest.cpp
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "JSValue.h"
+#include "JsonJSValueReader.h"
+#include "catch.hpp"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+TEST_CASE("TestReadObject", "JSValueTest") {
+  const wchar_t *json =
+      LR"JSON({
+        "NullValue": null,
+        "ObjValue": {},
+        "ArrayValue": [],
+        "StringValue": "Hello",
+        "BoolValue": true,
+        "IntValue": 42,
+        "DoubleValue": 4.5
+      })JSON";
+
+  IJSValueReader reader = make<JsonJSValueReader>(json);
+
+  JSValue jsValue = JSValue::ReadFrom(reader);
+  REQUIRE(jsValue.Type() == JSValueType::Object);
+  REQUIRE(jsValue.Object().at("NullValue").IsNull());
+  REQUIRE(jsValue.Object().at("ObjValue").Object().empty());
+  REQUIRE(jsValue.Object().at("ArrayValue").Array().empty());
+  REQUIRE(jsValue.Object().at("StringValue").String() == "Hello");
+  REQUIRE(jsValue.Object().at("BoolValue").Boolean() == true);
+  REQUIRE(jsValue.Object().at("IntValue").Int64() == 42);
+  REQUIRE(jsValue.Object().at("DoubleValue").Double() == 4.5);
+}
+
+TEST_CASE("TestReadNestedObject", "JSValueTest") {
+  const wchar_t *json =
+      LR"JSON({
+        "NestedObj": {
+          "NullValue": null,
+          "ObjValue": {},
+          "ArrayValue": [],
+          "StringValue": "Hello",
+          "BoolValue": true,
+          "IntValue": 42,
+          "DoubleValue": 4.5
+        }
+      })JSON";
+
+  IJSValueReader reader = make<JsonJSValueReader>(json);
+
+  JSValue jsValue = JSValue::ReadFrom(reader);
+  REQUIRE(jsValue.Type() == JSValueType::Object);
+  const auto &nestedObj = jsValue.Object().at("NestedObj").Object();
+  REQUIRE(nestedObj.at("NullValue").IsNull());
+  REQUIRE(nestedObj.at("ObjValue").Object().empty());
+  REQUIRE(nestedObj.at("ArrayValue").Array().empty());
+  REQUIRE(nestedObj.at("StringValue").String() == "Hello");
+  REQUIRE(nestedObj.at("BoolValue").Boolean() == true);
+  REQUIRE(nestedObj.at("IntValue").Int64() == 42);
+  REQUIRE(nestedObj.at("DoubleValue").Double() == 4.5);
+}
+
+TEST_CASE("TestReadArray", "JSValueTest") {
+  const wchar_t *json = LR"JSON([null, {}, [], "Hello", true, 42, 4.5])JSON";
+  IJSValueReader reader = make<JsonJSValueReader>(json);
+
+  JSValue jsValue = JSValue::ReadFrom(reader);
+  REQUIRE(jsValue.Type() == JSValueType::Array);
+  REQUIRE(jsValue.Array()[0].IsNull());
+  REQUIRE(jsValue.Array()[1].Object().empty());
+  REQUIRE(jsValue.Array()[2].Array().empty());
+  REQUIRE(jsValue.Array()[3].String() == "Hello");
+  REQUIRE(jsValue.Array()[4].Boolean() == true);
+  REQUIRE(jsValue.Array()[5].Int64() == 42);
+  REQUIRE(jsValue.Array()[6].Double() == 4.5);
+}
+
+TEST_CASE("TestReadNestedArray", "JSValueTest") {
+  const wchar_t *json = LR"JSON([[null, {}, [], "Hello", true, 42, 4.5]])JSON";
+  IJSValueReader reader = make<JsonJSValueReader>(json);
+
+  JSValue jsValue = JSValue::ReadFrom(reader);
+  REQUIRE(jsValue.Type() == JSValueType::Array);
+  const auto &nestedArr = jsValue.Array()[0].Array();
+  REQUIRE(nestedArr[0].IsNull());
+  REQUIRE(nestedArr[1].Object().empty());
+  REQUIRE(nestedArr[2].Array().empty());
+  REQUIRE(nestedArr[3].String() == "Hello");
+  REQUIRE(nestedArr[4].Boolean() == true);
+  REQUIRE(nestedArr[5].Int64() == 42);
+  REQUIRE(nestedArr[6].Double() == 4.5);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonJSValueReader.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonJSValueReader.cpp
new file mode 100644
index 00000000000..9af889d2a38
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonJSValueReader.cpp
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "JsonJSValueReader.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+//===========================================================================
+// JsonJSValueReader implementation
+//===========================================================================
+
+JsonJSValueReader::JsonJSValueReader(std::wstring &&jsonText) noexcept
+    : m_jsonText{std::move(jsonText)}, m_jsonReader{JsonSource{m_jsonText}} {
+  SetCurrentValue(m_jsonReader.ReadNext());
+}
+
+JSValueType JsonJSValueReader::ValueType() noexcept {
+  return m_valueType;
+}
+
+bool JsonJSValueReader::GetNextObjectProperty(hstring &propertyName) noexcept {
+  if (!m_isIterating) {
+    if (m_valueType == JSValueType::Object) {
+      if (m_jsonReader.ReadNext() == JsonParseState::Name) {
+        m_stack.push_back(JSValueType::Object);
+        propertyName = GetHString();
+        SetCurrentValue(m_jsonReader.ReadNext());
+        return true;
+      } else {
+        m_isIterating = !m_stack.empty();
+      }
+    }
+  } else if (!m_stack.empty()) {
+    JSValueType valueType = m_stack.back();
+    if (valueType == JSValueType::Object) {
+      if (m_jsonReader.ReadNext() == JsonParseState::Name) {
+        propertyName = GetHString();
+        SetCurrentValue(m_jsonReader.ReadNext());
+        return true;
+      } else {
+        m_valueType = valueType;
+        m_stack.pop_back();
+        m_isIterating = !m_stack.empty();
+      }
+    }
+  }
+
+  propertyName = to_hstring(L"");
+  return false;
+}
+
+bool JsonJSValueReader::GetNextArrayItem() noexcept {
+  if (!m_isIterating) {
+    if (m_valueType == JSValueType::Array) {
+      JsonParseState parseState = m_jsonReader.ReadNext();
+      if (IsContainerOrValue(parseState)) {
+        m_stack.push_back(JSValueType::Array);
+        SetCurrentValue(parseState);
+        return true;
+      } else {
+        m_isIterating = !m_stack.empty();
+      }
+    }
+  } else if (!m_stack.empty()) {
+    JSValueType valueType = m_stack.back();
+    if (valueType == JSValueType::Array) {
+      JsonParseState parseState = m_jsonReader.ReadNext();
+      if (IsContainerOrValue(parseState)) {
+        SetCurrentValue(parseState);
+        return true;
+      } else {
+        m_valueType = valueType;
+        m_stack.pop_back();
+        m_isIterating = !m_stack.empty();
+      }
+    }
+  }
+
+  return false;
+}
+
+void JsonJSValueReader::SetCurrentValue(JsonParseState parseState) noexcept {
+  switch (parseState) {
+    case JsonParseState::StartObject:
+      m_valueType = JSValueType::Object;
+      m_isIterating = false;
+      break;
+
+    case JsonParseState::StartArray:
+      m_valueType = JSValueType::Array;
+      m_isIterating = false;
+      break;
+
+    case JsonParseState::Value: {
+      m_isIterating = true;
+
+      if (m_jsonReader.IsString()) {
+        m_valueType = JSValueType::String;
+        m_stringValue = GetHString();
+        break;
+      }
+
+      if (m_jsonReader.GetInt64(&m_int64Value)) {
+        m_valueType = JSValueType::Int64;
+        break;
+      }
+
+      if (m_jsonReader.GetDouble(&m_doubleValue)) {
+        m_valueType = JSValueType::Double;
+        break;
+      }
+
+      if (m_jsonReader.GetBool(&m_boolValue)) {
+        m_valueType = JSValueType::Boolean;
+        break;
+      }
+
+      m_valueType = JSValueType::Null;
+      break;
+    }
+
+    default:
+      m_valueType = JSValueType::Null;
+      break;
+  }
+}
+
+hstring JsonJSValueReader::GetString() noexcept {
+  return (m_valueType == JSValueType::String) ? m_stringValue : hstring(L"");
+}
+
+bool JsonJSValueReader::GetBoolean() noexcept {
+  return (m_valueType == JSValueType::Boolean) ? m_boolValue : false;
+}
+
+int64_t JsonJSValueReader::GetInt64() noexcept {
+  return (m_valueType == JSValueType::Int64) ? m_int64Value : 0;
+}
+
+double JsonJSValueReader::GetDouble() noexcept {
+  return (m_valueType == JSValueType::Double) ? m_doubleValue : 0;
+}
+
+hstring JsonJSValueReader::GetHString() noexcept {
+  const wchar_t *data;
+  size_t length;
+  if (m_jsonReader.GetString(&data, &length)) {
+    return hstring(data, static_cast<hstring::size_type>(length));
+  } else {
+    return hstring(L"");
+  }
+}
+
+bool JsonJSValueReader::IsContainerOrValue(JsonParseState parseState) noexcept {
+  return parseState == JsonParseState::StartArray || parseState == JsonParseState::StartObject ||
+      parseState == JsonParseState::Value;
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonJSValueReader.h b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonJSValueReader.h
new file mode 100644
index 00000000000..08361f20012
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonJSValueReader.h
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "JsonReader.h"
+#include "winrt/Microsoft.ReactNative.Bridge.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+struct JsonJSValueReader : implements<JsonJSValueReader, IJSValueReader> {
+  JsonJSValueReader(std::wstring &&jsonText) noexcept;
+
+ public: // IJSValueReader
+  JSValueType ValueType() noexcept;
+  bool GetNextObjectProperty(hstring &propertyName) noexcept;
+  bool GetNextArrayItem() noexcept;
+  hstring GetString() noexcept;
+  bool GetBoolean() noexcept;
+  int64_t GetInt64() noexcept;
+  double GetDouble() noexcept;
+
+ private:
+  void SetCurrentValue(JsonParseState parseState) noexcept;
+  hstring GetHString() noexcept;
+  static bool IsContainerOrValue(JsonParseState parseState) noexcept;
+
+ private:
+  const std::wstring m_jsonText;
+  JsonReader m_jsonReader;
+  JSValueType m_valueType{JSValueType::Null};
+  std::vector<JSValueType> m_stack;
+  bool m_isIterating{false};
+  hstring m_stringValue;
+  union {
+    bool m_boolValue;
+    int64_t m_int64Value;
+    double m_doubleValue;
+  };
+};
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.cpp
new file mode 100644
index 00000000000..f67579fa23c
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.cpp
@@ -0,0 +1,379 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// Terms used in here:
+//   Container: represents a [] or {}
+//   isStringContent: is the current value a string? Either a name or quoted value
+
+#include "pch.h"
+#include "JsonReader.h"
+#include "Crash.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+static bool IsSimpleWhitespace(wchar_t c) noexcept {
+  return (c == ' ' || c == '\t' || c == '\r' || c == '\n');
+}
+
+// Main processing loop: reads tokens until end of stream, error, or
+// a valid state transition is reached.
+JsonParseState JsonReader::ReadNext() noexcept {
+  for (;; m_source.Inc()) {
+    if (m_source.IsEndOfData())
+      return JsonParseState::ErrorEndOfData;
+
+    wchar_t ch = m_source.PeekChar();
+
+    if (m_isAllowed.Option.StringChar) {
+      if (m_isAllowed.Option.EscapeChar) {
+        if (HandleEscapeChar(ch))
+          continue;
+        return HandleInvalidData();
+      }
+
+      if (m_isAllowed.Option.EscapeCharHex) {
+        if (HandleEscapeCharHex(ch))
+          continue;
+        return HandleInvalidData();
+      }
+
+      if (ch == '\\') {
+        m_isAllowed.Option.EscapeChar = 1;
+        continue;
+      }
+
+      if (ch == '\"') {
+        if (HandleEndName()) {
+          m_source.Inc();
+          return JsonParseState::Name;
+        }
+
+        if (HandleEndContainerOrValue(JsonParseState::Value)) {
+          m_source.Inc();
+          return JsonParseState::Value;
+        }
+
+        VerifyElseCrashSz(false, "This should be impossible to hit");
+      }
+
+      // Regular string character
+      m_textBuffer += ch;
+      continue;
+    }
+
+    // All whitespace outside of strings is ignored
+    if (IsSimpleWhitespace(ch))
+      continue;
+
+    switch (ch) {
+      case '[':
+        return HandleStartContainer(JsonParseState::StartArray);
+      case ']':
+        return HandleEndContainer(JsonParseState::StartArray, JsonParseState::EndArray);
+      case '{':
+        return HandleStartContainer(JsonParseState::StartObject);
+      case '}':
+        return HandleEndContainer(JsonParseState::StartObject, JsonParseState::EndObject);
+
+      case ',': {
+        if (m_isAllowed.Option.EndComma) {
+          if (HandleEndContainerOrValue(JsonParseState::Value))
+            return JsonParseState::Value;
+
+          ResetContainerState();
+          continue;
+        }
+        break;
+      }
+
+      case '"': {
+        if (HandleBeginString())
+          continue;
+        break;
+      }
+
+      case ':': {
+        if (m_isAllowed.Option.NameDelim) {
+          m_isAllowed.All = 0;
+          OnValueExpected();
+          continue;
+        }
+        break;
+      }
+
+      default: {
+        // Regular non-string character
+        if (HandleNonStringChar(ch))
+          continue;
+
+        break;
+      }
+    }
+
+    return HandleInvalidData();
+  }
+}
+
+// Called when a new Container is started
+// Called after each item in a Container
+void JsonReader::ResetContainerState() noexcept {
+  m_isAllowed.All = 0;
+
+  if (m_states.top() == JsonParseState::StartArray) {
+    OnValueExpected();
+  } else {
+    m_isAllowed.Option.BeginName = 1;
+    m_isStringContent = false;
+    m_textBuffer.clear();
+  }
+}
+
+// Called after '[', ':', ','
+void JsonReader::OnValueExpected() noexcept {
+  m_isAllowed.Option.StartContainer = 1;
+  m_isAllowed.Option.BeginValue = 1;
+  m_isStringContent = false;
+  m_textBuffer.clear();
+}
+
+// Handle the start of a new Container: [ {
+JsonParseState JsonReader::HandleStartContainer(JsonParseState state) noexcept {
+  if (!m_isAllowed.Option.StartContainer)
+    return HandleInvalidData();
+
+  m_states.push(state);
+  ResetContainerState();
+  m_isAllowed.Option.EndContainer = 1;
+
+  m_source.Inc();
+  return state;
+}
+
+// Handle the end of a Container: } ]
+JsonParseState JsonReader::HandleEndContainer(JsonParseState oldState, JsonParseState newState) noexcept {
+  if (!m_isAllowed.Option.EndContainer)
+    return HandleInvalidData();
+
+  // Check for previously ended value first
+  if (HandleEndContainerOrValue(JsonParseState::Value))
+    return JsonParseState::Value;
+
+  if (HandleEndContainerOrValue(oldState)) {
+    m_isStringContent = false;
+    m_textBuffer.clear();
+
+    m_source.Inc();
+    return newState;
+  }
+
+  return HandleInvalidData();
+}
+
+// Handle starting a new string: "
+bool JsonReader::HandleBeginString() noexcept {
+  if (m_isAllowed.Option.BeginName || m_isAllowed.Option.BeginValue) {
+    m_states.push(m_isAllowed.Option.BeginName ? JsonParseState::Name : JsonParseState::Value);
+
+    m_isAllowed.All = 0;
+    m_isAllowed.Option.StringChar = 1;
+    m_isStringContent = true;
+    return true;
+  }
+
+  return false;
+}
+
+// Handle value characters: numbers, true, false, null
+bool JsonReader::HandleNonStringChar(wchar_t ch) noexcept {
+  // FUTURE: could add more validation here
+
+  if (m_isAllowed.Option.NonStringChar) {
+    m_textBuffer += ch;
+    return true;
+  }
+
+  if (m_isAllowed.Option.BeginValue) {
+    m_isAllowed.All = 0;
+    m_isAllowed.Option.NonStringChar = 1;
+    m_isAllowed.Option.EndComma = 1;
+    m_isAllowed.Option.EndContainer = 1;
+    m_states.push(JsonParseState::Value);
+    m_textBuffer.clear();
+
+    m_textBuffer += ch;
+    return true;
+  }
+
+  return false;
+}
+
+// Handle an escaped string character
+bool JsonReader::HandleEscapeChar(wchar_t ch) noexcept {
+  switch (ch) {
+    case '\"':
+    case '\\':
+    case '/':
+      break;
+    case 'b':
+      ch = '\b';
+      break;
+    case 'f':
+      ch = '\f';
+      break;
+    case 'n':
+      ch = '\n';
+      break;
+    case 'r':
+      ch = '\r';
+      break;
+    case 't':
+      ch = '\t';
+      break;
+    case 'v':
+      ch = '\v';
+      break;
+
+    case 'u':
+      // Switch to hex-mode
+      m_isAllowed.Option.EscapeChar = 0;
+      m_isAllowed.Option.EscapeCharHex = 1;
+      m_hexStartIndex = m_textBuffer.length();
+      return true;
+
+    default:
+      return false;
+  }
+
+  m_textBuffer += ch;
+
+  m_isAllowed.Option.EscapeChar = 0;
+  return true;
+}
+
+// Appends the current char into the buffer
+// If all hex characters have been collected, try converting to wchar
+bool JsonReader::HandleEscapeCharHex(wchar_t ch) noexcept {
+  constexpr size_t HexCharCount = 4;
+
+  m_textBuffer += ch;
+  if (m_textBuffer.length() < m_hexStartIndex + HexCharCount)
+    return true;
+
+  const wchar_t *hexStart = m_textBuffer.c_str() + m_hexStartIndex;
+  wchar_t *hexEnd = nullptr;
+  ch = static_cast<wchar_t>(wcstoul(hexStart, &hexEnd, 16 /*base*/));
+
+  if (hexStart + HexCharCount != hexEnd)
+    return false;
+
+  m_textBuffer.resize(m_hexStartIndex);
+  m_textBuffer += ch;
+
+  m_isAllowed.Option.EscapeCharHex = 0;
+  return true;
+}
+
+// Helper for handling the end of a Container or value: , ] }
+bool JsonReader::HandleEndContainerOrValue(JsonParseState state) noexcept {
+  if (m_states.top() == state) {
+    m_states.pop();
+
+    m_isAllowed.All = 0;
+    if (m_states.size() > 0) {
+      m_isAllowed.Option.EndComma = 1;
+      m_isAllowed.Option.EndContainer = 1;
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+// Handle the end of a name: "
+bool JsonReader::HandleEndName() noexcept {
+  if (m_states.top() == JsonParseState::Name) {
+    m_states.pop();
+    m_isAllowed.All = 0;
+    m_isAllowed.Option.NameDelim = 1;
+    return true;
+  }
+
+  return false;
+}
+
+// Return the current string literal
+bool JsonReader::GetString(const wchar_t **value, size_t *valueLength) noexcept {
+  if (m_isStringContent) {
+    *value = m_textBuffer.c_str();
+    *valueLength = m_textBuffer.length();
+    return true;
+  }
+
+  *value = nullptr;
+  *valueLength = 0;
+  return false;
+}
+
+// Return the current value as a bool
+bool JsonReader::GetBool(bool *value) noexcept {
+  if (!m_isStringContent) {
+    if (m_textBuffer.compare(L"true") == 0) {
+      *value = true;
+      return true;
+    }
+
+    if (m_textBuffer.compare(L"false") == 0) {
+      *value = false;
+      return true;
+    }
+  }
+
+  *value = false;
+  return false;
+}
+
+// Return the current value as an Int64
+bool JsonReader::GetInt64(int64_t *value) noexcept {
+  if (!m_isStringContent && m_textBuffer.length()) {
+    wchar_t *end = nullptr;
+    auto iValue = _wcstoi64(m_textBuffer.c_str(), &end, 10 /*base*/);
+    if (end == m_textBuffer.c_str() + m_textBuffer.size()) {
+      *value = iValue;
+      return true;
+    }
+
+    // Didn't read enough characters, fall through and fail
+  }
+
+  *value = 0;
+  return false;
+}
+
+// Return the current value as a Double
+bool JsonReader::GetDouble(double *value) noexcept {
+  if (!m_isStringContent && m_textBuffer.length()) {
+    wchar_t *end = nullptr;
+    auto dvalue = wcstod(m_textBuffer.c_str(), &end);
+    if (end == m_textBuffer.c_str() + m_textBuffer.size()) {
+      *value = dvalue;
+      return true;
+    }
+
+    // Didn't read enough characters, fall through and fail
+  }
+
+  *value = 0;
+  return false;
+}
+
+// Return true if the current value is the null value
+bool JsonReader::IsNull() noexcept {
+  if (!m_isStringContent) {
+    return (m_textBuffer.compare(L"null") == 0);
+  }
+
+  return false;
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.h b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.h
new file mode 100644
index 00000000000..34b4f332f07
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/JsonReader.h
@@ -0,0 +1,144 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// Simple JsonReader
+
+#include <cstdint>
+#include <stack>
+#include <string_view>
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+struct JsonSource {
+  static_assert(sizeof(wchar_t) == 2, "This code expects 2-byte wchars");
+
+  JsonSource(std::wstring_view buffer) noexcept : m_current{buffer.data()}, m_end{buffer.data() + buffer.size()} {}
+
+  // Caller is responsible for checking IsEndOfData() before calling PeekChar()
+  wchar_t PeekChar() const noexcept {
+    return *m_current;
+  }
+
+  // Caller is responsible for checking IsEndOfData() before calling Inc()
+  void Inc() noexcept {
+    ++m_current;
+  }
+
+  bool IsEndOfData() const noexcept {
+    return m_current == m_end;
+  }
+
+ private:
+  const wchar_t *m_current = nullptr;
+  const wchar_t *m_end = nullptr;
+};
+
+enum class JsonParseState {
+  StartArray,
+  StartObject,
+  Name,
+  Value,
+  EndObject,
+  EndArray,
+
+  // Returned for invalid data
+  ErrorInvalidData,
+
+  // End of input reached before end of Json.
+  ErrorEndOfData,
+};
+
+struct JsonReader {
+ public:
+  JsonReader(JsonSource source) : m_source{source} {
+    m_isAllowed.All = 0;
+    m_isAllowed.Option.StartContainer = 1;
+  }
+
+  JsonReader(const JsonReader &) = delete;
+  JsonReader &operator=(const JsonReader &) = delete;
+
+  JsonParseState ReadNext() noexcept;
+  bool GetString(_Deref_post_count_(*valueLength) const wchar_t **value, _Out_ size_t *valueLength) noexcept;
+  bool GetBool(_Out_ bool *value) noexcept;
+  bool GetInt64(_Out_ std::int64_t *value) noexcept;
+  bool GetDouble(_Out_ double *value) noexcept;
+  bool IsNull() noexcept;
+  bool IsString() noexcept {
+    return m_isStringContent;
+  }
+
+ private:
+  void ResetContainerState() noexcept;
+  void OnValueExpected() noexcept;
+
+  JsonParseState HandleStartContainer(JsonParseState state) noexcept;
+  JsonParseState HandleEndContainer(JsonParseState oldState, JsonParseState newState) noexcept;
+
+  bool HandleBeginString() noexcept;
+  bool HandleNonStringChar(wchar_t wch) noexcept;
+  bool HandleEscapeChar(wchar_t wch) noexcept;
+  bool HandleEscapeCharHex(wchar_t wch) noexcept;
+  bool HandleEndContainerOrValue(JsonParseState state) noexcept;
+  bool HandleEndName() noexcept;
+
+  JsonParseState HandleInvalidData() noexcept {
+    m_isAllowed.All = 0;
+    return JsonParseState::ErrorInvalidData;
+  }
+
+ private:
+  JsonSource m_source;
+
+  // Tracks the next allowed state(s)
+  union {
+    struct {
+      // [ or {
+      uint32_t StartContainer : 1;
+
+      // "
+      uint32_t BeginName : 1;
+
+      // :
+      uint32_t NameDelim : 1;
+
+      // " or value char
+      uint32_t BeginValue : 1;
+
+      // valid name or value char
+      uint32_t NonStringChar : 1;
+
+      // valid string character
+      uint32_t StringChar : 1;
+
+      // valid escape char
+      uint32_t EscapeChar : 1;
+
+      // 4 hex digits
+      uint32_t EscapeCharHex : 1;
+
+      // ] or }
+      uint32_t EndContainer : 1;
+
+      // ,
+      uint32_t EndComma : 1;
+    } Option;
+
+    uint32_t All;
+
+  } m_isAllowed;
+
+  // Stores the current name / value text
+  std::wstring m_textBuffer;
+
+  // Stack of parse states (Array, Object, Name, Value)
+  std::stack<JsonParseState> m_states;
+
+  // Used when decoding \uHHHH values
+  size_t m_hexStartIndex = 0;
+
+  // True when m_textBuffer contains a name or value string
+  bool m_isStringContent = false;
+};
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj
new file mode 100644
index 00000000000..090ceaf2d69
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <CppWinRTOptimized>true</CppWinRTOptimized>
+    <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
+    <MinimalCoreWin>true</MinimalCoreWin>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{6c60e295-c8ca-4dc5-b8be-09888f58b249}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Microsoft_ReactNative_Cxx_UnitTests</RootNamespace>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems" Label="Shared" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="PropertySheet.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalOptions>%(AdditionalOptions) /permissive- /bigobj</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+    <Midl>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\git\vmoroz\react-native-windows\vnext\Microsoft.ReactNative;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </Midl>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="catch.hpp" />
+    <ClInclude Include="JsonJSValueReader.h" />
+    <ClInclude Include="JsonReader.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="ReactModuleBuilderMock.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="JsonJSValueReader.cpp" />
+    <ClCompile Include="JsonReader.cpp" />
+    <ClCompile Include="JSValueReaderTest.cpp" />
+    <ClCompile Include="JSValueTest.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="NativeModuleTest.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ReactModuleBuilderMock.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="catch.runsettings" />
+    <None Include="packages.config" />
+    <None Include="PropertySheet.props" />
+    <Text Include="readme.txt">
+      <DeploymentContent>false</DeploymentContent>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="..\Microsoft.ReactNative\IBoxedValue.idl" />
+    <Midl Include="..\Microsoft.ReactNative\IJSValueReader.idl" />
+    <Midl Include="..\Microsoft.ReactNative\IJSValueWriter.idl" />
+    <Midl Include="..\Microsoft.ReactNative\IReactContext.idl" />
+    <Midl Include="..\Microsoft.ReactNative\IReactModuleBuilder.idl" />
+    <Midl Include="..\Microsoft.ReactNative\IReactPackageBuilder.idl" />
+    <Midl Include="..\Microsoft.ReactNative\IViewManager.idl" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190730.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/NativeModuleTest.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/NativeModuleTest.cpp
new file mode 100644
index 00000000000..554e1510084
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/NativeModuleTest.cpp
@@ -0,0 +1,775 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include <sstream>
+#include "NativeModules.h"
+#include "ReactModuleBuilderMock.h"
+#include "catch.hpp"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+REACT_STRUCT(Point)
+struct Point {
+  REACT_FIELD(X)
+  int X;
+
+  REACT_FIELD(Y)
+  int Y;
+};
+
+REACT_MODULE(SimpleNativeModule)
+struct SimpleNativeModule {
+  REACT_METHOD(Add)
+  int Add(int x, int y) noexcept {
+    return x + y;
+  }
+
+  REACT_METHOD(Negate)
+  int Negate(int x) noexcept {
+    return -x;
+  }
+
+  REACT_METHOD(SayHello)
+  std::string SayHello() noexcept {
+    return "Hello";
+  }
+
+  REACT_METHOD(StaticAdd)
+  static int StaticAdd(int x, int y) noexcept {
+    return x + y;
+  }
+
+  REACT_METHOD(StaticNegate)
+  static int StaticNegate(int x) noexcept {
+    return -x;
+  }
+
+  REACT_METHOD(StaticSayHello)
+  static std::string StaticSayHello() noexcept {
+    return "Hello";
+  }
+
+  REACT_METHOD(SayHello0)
+  void SayHello0() noexcept {
+    Message = "Hello_0";
+  }
+
+  REACT_METHOD(PrintPoint)
+  void PrintPoint(Point pt) noexcept {
+    std::stringstream ss;
+    ss << "Point: (" << pt.X << ", " << pt.Y << ")";
+    Message = ss.str();
+  }
+
+  REACT_METHOD(PrintLine)
+  void PrintLine(Point start, Point end) noexcept {
+    std::stringstream ss;
+    ss << "Line: (" << start.X << ", " << start.Y << ")-(" << end.X << ", " << end.Y << ")";
+    Message = ss.str();
+  }
+
+  REACT_METHOD(StaticSayHello1)
+  static void StaticSayHello1() noexcept {
+    StaticMessage = "Hello_1";
+  }
+
+  REACT_METHOD(StaticPrintPoint)
+  static void StaticPrintPoint(Point pt) noexcept {
+    std::stringstream ss;
+    ss << "Static Point: (" << pt.X << ", " << pt.Y << ")";
+    StaticMessage = ss.str();
+  }
+
+  REACT_METHOD(StaticPrintLine)
+  static void StaticPrintLine(Point start, Point end) noexcept {
+    std::stringstream ss;
+    ss << "Static Line: (" << start.X << ", " << start.Y << ")-(" << end.X << ", " << end.Y << ")";
+    StaticMessage = ss.str();
+  }
+
+  REACT_METHOD(AddCallback)
+  void AddCallback(int x, int y, std::function<void(int)> const &resolve) noexcept {
+    resolve(x + y);
+  }
+
+  REACT_METHOD(NegateCallback)
+  void NegateCallback(int x, std::function<void(int)> const &resolve) noexcept {
+    resolve(-x);
+  }
+
+  REACT_METHOD(SayHelloCallback)
+  void SayHelloCallback(std::function<void(const std::string &)> const &resolve) noexcept {
+    resolve("Hello_2");
+  }
+
+  REACT_METHOD(StaticAddCallback)
+  static void StaticAddCallback(int x, int y, std::function<void(int)> const &resolve) noexcept {
+    resolve(x + y);
+  }
+
+  REACT_METHOD(StaticNegateCallback)
+  static void StaticNegateCallback(int x, std::function<void(int)> const &resolve) noexcept {
+    resolve(-x);
+  }
+
+  REACT_METHOD(StaticSayHelloCallback)
+  static void StaticSayHelloCallback(std::function<void(const std::string &)> const &resolve) noexcept {
+    resolve("Static Hello_2");
+  }
+
+  REACT_METHOD(DivideCallbacks)
+  void DivideCallbacks(
+      int x,
+      int y,
+      std::function<void(int)> const &resolve,
+      std::function<void(const std::string &)> const &reject) noexcept {
+    if (y != 0) {
+      resolve(x / y);
+    } else {
+      reject("Division by 0");
+    }
+  }
+
+  REACT_METHOD(NegateCallbacks)
+  void NegateCallbacks(
+      int x,
+      std::function<void(int)> const &resolve,
+      std::function<void(const std::string &)> const &reject) noexcept {
+    if (x >= 0) {
+      resolve(-x);
+    } else {
+      reject("Already negative");
+    }
+  }
+
+  REACT_METHOD(ResolveSayHelloCallbacks)
+  void ResolveSayHelloCallbacks(
+      std::function<void(const std::string &)> const &resolve,
+      std::function<void(const std::string &)> const & /*reject*/) noexcept {
+    resolve("Hello_3");
+  }
+
+  REACT_METHOD(RejectSayHelloCallbacks)
+  void RejectSayHelloCallbacks(
+      std::function<void(const std::string &)> const & /*resolve*/,
+      std::function<void(const std::string &)> const &reject) noexcept {
+    reject("Goodbye");
+  }
+
+  REACT_METHOD(StaticDivideCallbacks)
+  static void StaticDivideCallbacks(
+      int x,
+      int y,
+      std::function<void(int)> const &resolve,
+      std::function<void(const std::string &)> const &reject) noexcept {
+    if (y != 0) {
+      resolve(x / y);
+    } else {
+      reject("Division by 0");
+    }
+  }
+
+  REACT_METHOD(StaticNegateCallbacks)
+  static void StaticNegateCallbacks(
+      int x,
+      std::function<void(int)> const &resolve,
+      std::function<void(const std::string &)> const &reject) noexcept {
+    if (x >= 0) {
+      resolve(-x);
+    } else {
+      reject("Already negative");
+    }
+  }
+
+  REACT_METHOD(StaticResolveSayHelloCallbacks)
+  static void StaticResolveSayHelloCallbacks(
+      std::function<void(const std::string &)> const &resolve,
+      std::function<void(const std::string &)> const & /*reject*/) noexcept {
+    resolve("Hello_3");
+  }
+
+  REACT_METHOD(StaticRejectSayHelloCallbacks)
+  static void StaticRejectSayHelloCallbacks(
+      std::function<void(const std::string &)> const & /*resolve*/,
+      std::function<void(const std::string &)> const &reject) noexcept {
+    reject("Goodbye");
+  }
+
+  REACT_METHOD(DividePromise)
+  void DividePromise(int x, int y, ReactPromise<int> &&result) noexcept {
+    if (y != 0) {
+      result.Resolve(x / y);
+    } else {
+      ReactError error{};
+      error.Message = "Division by 0";
+      result.Reject(std::move(error));
+    }
+  }
+
+  REACT_METHOD(NegatePromise)
+  void NegatePromise(int x, ReactPromise<int> &&result) noexcept {
+    if (x >= 0) {
+      result.Resolve(-x);
+    } else {
+      ReactError error{};
+      error.Message = "Already negative";
+      result.Reject(std::move(error));
+    }
+  }
+
+  REACT_METHOD(ResolveSayHelloPromise)
+  void ResolveSayHelloPromise(ReactPromise<std::string> &&result) noexcept {
+    result.Resolve("Hello_4");
+  }
+
+  REACT_METHOD(RejectSayHelloPromise)
+  void RejectSayHelloPromise(ReactPromise<std::string> &&result) noexcept {
+    ReactError error{};
+    error.Message = "Promise rejected";
+    result.Reject(std::move(error));
+  }
+
+  REACT_METHOD(StaticDividePromise)
+  static void StaticDividePromise(int x, int y, ReactPromise<int> &&result) noexcept {
+    if (y != 0) {
+      result.Resolve(x / y);
+    } else {
+      ReactError error{};
+      error.Message = "Division by 0";
+      result.Reject(std::move(error));
+    }
+  }
+
+  REACT_METHOD(StaticNegatePromise)
+  static void StaticNegatePromise(int x, ReactPromise<int> &&result) noexcept {
+    if (x >= 0) {
+      result.Resolve(-x);
+    } else {
+      ReactError error{};
+      error.Message = "Already negative";
+      result.Reject(std::move(error));
+    }
+  }
+
+  REACT_METHOD(StaticResolveSayHelloPromise)
+  static void StaticResolveSayHelloPromise(ReactPromise<std::string> &&result) noexcept {
+    result.Resolve("Hello_4");
+  }
+
+  REACT_METHOD(StaticRejectSayHelloPromise)
+  static void StaticRejectSayHelloPromise(ReactPromise<std::string> &&result) noexcept {
+    ReactError error{};
+    error.Message = "Promise rejected";
+    result.Reject(std::move(error));
+  }
+
+  REACT_SYNC_METHOD(AddSync)
+  int AddSync(int x, int y) noexcept {
+    return x + y;
+  }
+
+  REACT_SYNC_METHOD(NegateSync)
+  int NegateSync(int x) noexcept {
+    return -x;
+  }
+
+  REACT_SYNC_METHOD(SayHelloSync)
+  std::string SayHelloSync() noexcept {
+    return "Hello";
+  }
+
+  REACT_SYNC_METHOD(StaticAddSync)
+  static int StaticAddSync(int x, int y) noexcept {
+    return x + y;
+  }
+
+  REACT_SYNC_METHOD(StaticNegateSync)
+  static int StaticNegateSync(int x) noexcept {
+    return -x;
+  }
+
+  REACT_SYNC_METHOD(StaticSayHelloSync)
+  static std::string StaticSayHelloSync() noexcept {
+    return "Hello";
+  }
+
+  REACT_CONSTANT(Constant1)
+  const std::string Constant1{"MyConstant1"};
+
+  REACT_CONSTANT(Constant2, L"const2")
+  const std::string Constant2{"MyConstant2"};
+
+  REACT_CONSTANT(Constant3, L"const3")
+  static constexpr Point Constant3{/*X =*/2, /*Y =*/3};
+
+  REACT_CONSTANT(Constant4)
+  static constexpr Point Constant4{/*X =*/3, /*Y =*/4};
+
+  REACT_CONSTANT_PROVIDER(Constant5)
+  void Constant5(ReactConstantProvider &provider) noexcept {
+    provider.Add(L"const51", Point{/*X =*/12, /*Y =*/14});
+    provider.Add(L"const52", "MyConstant52");
+  }
+
+  REACT_CONSTANT_PROVIDER(Constant6)
+  static void Constant6(ReactConstantProvider &provider) noexcept {
+    provider.Add(L"const61", Point{/*X =*/15, /*Y =*/17});
+    provider.Add(L"const62", "MyConstant62");
+  }
+
+  REACT_EVENT(OnIntResult1)
+  std::function<void(int)> OnIntResult1;
+
+  REACT_EVENT(OnPointResult2, L"onPointResult2")
+  std::function<void(const Point &)> OnPointResult2;
+
+  std::string Message;
+  static std::string StaticMessage;
+};
+
+/*static*/ std::string SimpleNativeModule::StaticMessage;
+
+// Common base class used by all unit tests below.
+struct NativeModuleTestFixture {
+  NativeModuleTestFixture() {
+    m_moduleBuilder = make<ReactModuleBuilderImpl>(m_builderMock);
+    auto provider = MakeModuleProvider<SimpleNativeModule>();
+    m_moduleObject = provider(m_moduleBuilder);
+    auto reactModule = m_moduleObject.as<IBoxedValue>();
+    m_module = &BoxedValue<SimpleNativeModule>::GetImpl(reactModule);
+  }
+
+ protected:
+  ReactModuleBuilderMock m_builderMock{};
+  IReactModuleBuilder m_moduleBuilder;
+  Windows::Foundation::IInspectable m_moduleObject{nullptr};
+  SimpleNativeModule *m_module;
+};
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_Add", "NativeModuleTest") {
+  m_builderMock.Call1(L"Add", std::function<void(int)>([](int result) noexcept { REQUIRE(result == 8); }), 3, 5);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_Negate", "NativeModuleTest") {
+  m_builderMock.Call1(L"Negate", std::function<void(int)>([](int result) noexcept { REQUIRE(result == -3); }), 3);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_SayHello", "NativeModuleTest") {
+  m_builderMock.Call1(L"SayHello", std::function<void(const std::string &)>([](const std::string &result) noexcept {
+                        REQUIRE(result == "Hello");
+                      }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticAdd", "NativeModuleTest") {
+  m_builderMock.Call1(
+      L"StaticAdd", std::function<void(int)>([](int result) noexcept { REQUIRE(result == 25); }), 20, 5);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticNegate", "NativeModuleTest") {
+  m_builderMock.Call1(L"StaticNegate", std::function<void(int)>([](int result) noexcept { REQUIRE(result == -7); }), 7);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticSayHello", "NativeModuleTest") {
+  m_builderMock.Call1(
+      L"StaticSayHello",
+      std::function<void(const std::string &)>([](const std::string &result) noexcept { REQUIRE(result == "Hello"); }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_SayHello0", "NativeModuleTest") {
+  m_builderMock.Call0(L"SayHello0");
+  REQUIRE(m_module->Message == "Hello_0");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_PrintPoint", "NativeModuleTest") {
+  m_builderMock.Call0(L"PrintPoint", Point{/*X =*/3, /*Y =*/5});
+  REQUIRE(m_module->Message == "Point: (3, 5)");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_PrintLine", "NativeModuleTest") {
+  m_builderMock.Call0(L"PrintLine", Point{/*X =*/3, /*Y =*/5}, Point{/*X =*/6, /*Y =*/8});
+  REQUIRE(m_module->Message == "Line: (3, 5)-(6, 8)");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticSayHello1", "NativeModuleTest") {
+  m_builderMock.Call0(L"StaticSayHello1");
+  REQUIRE(SimpleNativeModule::StaticMessage == "Hello_1");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticPrintPoint", "NativeModuleTest") {
+  m_builderMock.Call0(L"StaticPrintPoint", Point{/*X =*/13, /*Y =*/15});
+  REQUIRE(SimpleNativeModule::StaticMessage == "Static Point: (13, 15)");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticPrintLine", "NativeModuleTest") {
+  m_builderMock.Call0(L"StaticPrintLine", Point{/*X =*/13, /*Y =*/15}, Point{/*X =*/16, /*Y =*/18});
+  REQUIRE(SimpleNativeModule::StaticMessage == "Static Line: (13, 15)-(16, 18)");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_AddCallback", "NativeModuleTest") {
+  m_builderMock.Call1(
+      L"AddCallback", std::function<void(int)>([](int result) noexcept { REQUIRE(result == -1); }), 7, -8);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_NegateCallback", "NativeModuleTest") {
+  m_builderMock.Call1(
+      L"NegateCallback", std::function<void(int)>([](int result) noexcept { REQUIRE(result == -4); }), 4);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_SayHelloCallback", "NativeModuleTest") {
+  m_builderMock.Call1(L"SayHelloCallback", std::function<void(const std::string &)>([
+                      ](const std::string &result) noexcept { REQUIRE(result == "Hello_2"); }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticAddCallback", "NativeModuleTest") {
+  m_builderMock.Call1(
+      L"StaticAddCallback", std::function<void(int)>([](int result) noexcept { REQUIRE(result == 60); }), 4, 56);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticNegateCallback", "NativeModuleTest") {
+  m_builderMock.Call1(
+      L"StaticNegateCallback", std::function<void(int)>([](int result) noexcept { REQUIRE(result == -33); }), 33);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticSayHelloCallback", "NativeModuleTest") {
+  m_builderMock.Call1(L"StaticSayHelloCallback", std::function<void(const std::string &)>([
+                      ](const std::string &result) noexcept { REQUIRE(result == "Static Hello_2"); }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_DivideCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"DivideCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      2);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_DivideCallbacksError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"DivideCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      0);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_NegateCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"NegateCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      5);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_NegateCallbacksError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"NegateCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      -5);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_ResolveSayHelloCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"ResolveSayHelloCallbacks",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_3"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Goodbye"); }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_RejectSayHelloCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"RejectSayHelloCallbacks",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_3"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Goodbye"); }));
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticDivideCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticDivideCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      2);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticDivideCallbacksError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticDivideCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      0);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticNegateCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticNegateCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      5);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticNegateCallbacksError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticNegateCallbacks",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      -5);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticResolveSayHelloCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticResolveSayHelloCallbacks",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_3"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Goodbye"); }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticRejectSayHelloCallbacks", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticRejectSayHelloCallbacks",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_3"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Goodbye"); }));
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_DividePromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"DividePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      2);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_DividePromiseError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"DividePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      0);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_NegatePromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"NegatePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      5);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_NegatePromiseError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"NegatePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      -5);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_ResolveSayHelloPromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"ResolveSayHelloPromise",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_4"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Promise rejected"); }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_RejectSayHelloPromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"RejectSayHelloPromise",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_4"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Promise rejected"); }));
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticDividePromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticDividePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      2);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticDividePromiseError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticDividePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == 3); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Division by 0"); }),
+      6,
+      0);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticNegatePromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticNegatePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      5);
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticNegatePromiseError", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticNegatePromise",
+      std::function<void(int)>([](int result) noexcept { REQUIRE(result == -5); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Already negative"); }),
+      -5);
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticResolveSayHelloPromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticResolveSayHelloPromise",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_4"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Promise rejected"); }));
+  REQUIRE(m_builderMock.IsResolveCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodCall_StaticRejectSayHelloPromise", "NativeModuleTest") {
+  m_builderMock.Call2(
+      L"StaticRejectSayHelloPromise",
+      std::function<void(const std::string &)>(
+          [](const std::string &result) noexcept { REQUIRE(result == "Hello_4"); }),
+      std::function<void(JSValue const &)>(
+          [](JSValue const &error) noexcept { REQUIRE(error["message"] == "Promise rejected"); }));
+  REQUIRE(m_builderMock.IsRejectCallbackCalled());
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodSyncCall_AddSync", "NativeModuleTest") {
+  int result;
+  m_builderMock.CallSync(L"AddSync", /*out*/ result, 3, 5);
+  REQUIRE(result == 8);
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodSyncCall_NegateSync", "NativeModuleTest") {
+  int result;
+  m_builderMock.CallSync(L"NegateSync", /*out*/ result, 7);
+  REQUIRE(result == -7);
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodSyncCall_SayHelloSync", "NativeModuleTest") {
+  std::string result;
+  m_builderMock.CallSync(L"SayHelloSync", /*out*/ result);
+  REQUIRE(result == "Hello");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodSyncCall_StaticAddSync", "NativeModuleTest") {
+  int result;
+  m_builderMock.CallSync(L"StaticAddSync", /*out*/ result, 3, 5);
+  REQUIRE(result == 8);
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodSyncCall_StaticNegateSync", "NativeModuleTest") {
+  int result;
+  m_builderMock.CallSync(L"StaticNegateSync", /*out*/ result, 7);
+  REQUIRE(result == -7);
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestMethodSyncCall_StaticSayHelloSync", "NativeModuleTest") {
+  std::string result;
+  m_builderMock.CallSync(L"StaticSayHelloSync", /*out*/ result);
+  REQUIRE(result == "Hello");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestConstants", "NativeModuleTest") {
+  auto constants = m_builderMock.GetConstants();
+  REQUIRE(constants["Constant1"] == "MyConstant1");
+  REQUIRE(constants["const2"] == "MyConstant2");
+  REQUIRE(constants["const3"]["X"] == 2);
+  REQUIRE(constants["const3"]["Y"] == 3);
+  REQUIRE(constants["Constant4"]["X"] == 3);
+  REQUIRE(constants["Constant4"]["Y"] == 4);
+  REQUIRE(constants["const51"]["X"] == 12);
+  REQUIRE(constants["const51"]["Y"] == 14);
+  REQUIRE(constants["const52"] == "MyConstant52");
+  REQUIRE(constants["const61"]["X"] == 15);
+  REQUIRE(constants["const61"]["Y"] == 17);
+  REQUIRE(constants["const62"] == "MyConstant62");
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestEvent_EventField1", "NativeModuleTest") {
+  bool eventRaised = false;
+  m_builderMock.SetEventHandler(L"OnIntResult1", std::function<void(int)>([&eventRaised](int eventArg) noexcept {
+                                  REQUIRE(eventArg == 42);
+                                  eventRaised = true;
+                                }));
+
+  m_module->OnIntResult1(42);
+  REQUIRE(eventRaised == true);
+}
+
+TEST_CASE_METHOD(NativeModuleTestFixture, "TestEvent_EventField2", "NativeModuleTest") {
+  bool eventRaised = false;
+  m_builderMock.SetEventHandler(
+      L"onPointResult2", std::function<void(const Point &)>([&eventRaised](const Point &eventArg) noexcept {
+        REQUIRE(eventArg.X == 4);
+        REQUIRE(eventArg.Y == 2);
+        eventRaised = true;
+      }));
+
+  m_module->OnPointResult2(Point{/*X =*/4, /*Y =*/2});
+  REQUIRE(eventRaised == true);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/PropertySheet.props b/vnext/Microsoft.ReactNative.Cxx.UnitTests/PropertySheet.props
new file mode 100644
index 00000000000..c6b0691ddda
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/PropertySheet.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+    <!--
+    To customize common C++/WinRT project properties: 
+    * right-click the project node
+    * expand the Common Properties item
+    * select the C++/WinRT property page
+
+    For more advanced scenarios, and complete documentation, please see:
+    https://github.com/Microsoft/xlang/tree/master/src/package/cppwinrt/nuget 
+    -->
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+</Project>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/ReactModuleBuilderMock.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/ReactModuleBuilderMock.cpp
new file mode 100644
index 00000000000..d798a9ee6e3
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/ReactModuleBuilderMock.cpp
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "ReactModuleBuilderMock.h"
+#include "JSValue.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+//===========================================================================
+// ReactModuleBuilderMock implementation
+//===========================================================================
+
+void ReactModuleBuilderMock::SetEventEmitterName(hstring const &name) noexcept {
+  m_eventEmitterName = name;
+}
+
+void ReactModuleBuilderMock::AddMethod(
+    hstring const &name,
+    MethodReturnType returnType,
+    MethodDelegate const &method) noexcept {
+  m_methods.emplace(name, std::tuple<MethodReturnType, MethodDelegate>{returnType, method});
+}
+
+void ReactModuleBuilderMock::AddSyncMethod(hstring const &name, SyncMethodDelegate const &method) noexcept {
+  m_syncMethods.emplace(name, method);
+}
+
+void ReactModuleBuilderMock::AddConstantProvider(ConstantProvider const &constantProvider) noexcept {
+  m_constProviders.push_back(constantProvider);
+}
+
+void ReactModuleBuilderMock::AddEventHandlerSetter(
+    hstring const &name,
+    ReactEventHandlerSetter const &eventHandlerSetter) noexcept {
+  eventHandlerSetter([ this, name = std::wstring{name} ](ReactArgWriter const &argWriter) noexcept {
+    auto it = m_eventHandlers.find(name);
+    if (it != m_eventHandlers.end()) {
+      JSValue jsValue;
+      auto writer = MakeJSValueTreeWriter(jsValue);
+      writer.WriteArrayBegin();
+      argWriter(writer);
+      writer.WriteArrayEnd();
+      auto reader = MakeJSValueTreeReader(jsValue);
+      it->second(reader);
+    }
+  });
+}
+
+JSValueObject ReactModuleBuilderMock::GetConstants() noexcept {
+  JSValue jsValue;
+  auto constantWriter = MakeJSValueTreeWriter(jsValue);
+  constantWriter.WriteObjectBegin();
+  for (const auto &constantProvider : m_constProviders) {
+    constantProvider(constantWriter);
+  }
+
+  constantWriter.WriteObjectEnd();
+  return jsValue.TakeObject();
+}
+
+MethodDelegate ReactModuleBuilderMock::GetMethod0(std::wstring const &methodName) const noexcept {
+  auto it = m_methods.find(methodName);
+  return (it != m_methods.end() && std::get<0>(it->second) == MethodReturnType::Void) ? std::get<1>(it->second)
+                                                                                      : nullptr;
+}
+
+MethodDelegate ReactModuleBuilderMock::GetMethod1(std::wstring const &methodName) const noexcept {
+  auto it = m_methods.find(methodName);
+  return (it != m_methods.end() && std::get<0>(it->second) == MethodReturnType::Callback) ? std::get<1>(it->second)
+                                                                                          : nullptr;
+}
+
+MethodDelegate ReactModuleBuilderMock::GetMethod2(std::wstring const &methodName) const noexcept {
+  auto it = m_methods.find(methodName);
+  return (it != m_methods.end() &&
+          (std::get<0>(it->second) == MethodReturnType::TwoCallbacks ||
+           std::get<0>(it->second) == MethodReturnType::Promise))
+      ? std::get<1>(it->second)
+      : nullptr;
+}
+
+SyncMethodDelegate ReactModuleBuilderMock::GetSyncMethod(std::wstring const &methodName) const noexcept {
+  auto it = m_syncMethods.find(methodName);
+  return (it != m_syncMethods.end()) ? it->second : nullptr;
+}
+
+/*static*/ IJSValueWriter ReactModuleBuilderMock::ArgWriter(JSValue &jsValue) noexcept {
+  return MakeJSValueTreeWriter(jsValue);
+}
+
+/*static*/ IJSValueReader ReactModuleBuilderMock::CreateArgReader(
+    std::function<void(IJSValueWriter const &)> const &argWriter) noexcept {
+  JSValue jsValue;
+  auto writer = MakeJSValueTreeWriter(jsValue);
+  argWriter(writer);
+  return MakeJSValueTreeReader(std::move(jsValue));
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/ReactModuleBuilderMock.h b/vnext/Microsoft.ReactNative.Cxx.UnitTests/ReactModuleBuilderMock.h
new file mode 100644
index 00000000000..35fa6bb2233
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/ReactModuleBuilderMock.h
@@ -0,0 +1,223 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <functional>
+#include "JSValue.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+struct ReactModuleBuilderMock {
+  template <class... TArgs>
+  void Call0(std::wstring const &methodName, TArgs &&... args) noexcept;
+
+  template <class TResult, class... TArgs>
+  void Call1(std::wstring const &methodName, std::function<void(TResult)> const &resolve, TArgs &&... args) noexcept;
+
+  template <class TResult, class TError, class... TArgs>
+  void Call2(
+      std::wstring const &methodName,
+      std::function<void(TResult)> const &resolve,
+      std::function<void(TError)> const &reject,
+      TArgs &&... args) noexcept;
+
+  template <class TResult, class... TArgs>
+  void CallSync(std::wstring const &methodName, TResult &result, TArgs &&... args) noexcept;
+
+  JSValueObject GetConstants() noexcept;
+
+  template <class T>
+  void SetEventHandler(std::wstring const &eventName, std::function<void(T)> const &eventHandler) noexcept;
+
+  bool IsResolveCallbackCalled() const noexcept;
+  void IsResolveCallbackCalled(bool value) noexcept;
+  bool IsRejectCallbackCalled() const noexcept;
+  void IsRejectCallbackCalled(bool value) noexcept;
+
+ public: // IReactModuleBuilder
+  void SetEventEmitterName(hstring const &name) noexcept;
+  void AddMethod(hstring const &name, MethodReturnType returnType, MethodDelegate const &method) noexcept;
+  void AddSyncMethod(hstring const &name, SyncMethodDelegate const &method) noexcept;
+  void AddConstantProvider(ConstantProvider const &constantProvider) noexcept;
+  void AddEventHandlerSetter(hstring const &name, ReactEventHandlerSetter const &eventHandlerSetter) noexcept;
+
+ private:
+  MethodDelegate GetMethod0(std::wstring const &methodName) const noexcept;
+  MethodDelegate GetMethod1(std::wstring const &methodName) const noexcept;
+  MethodDelegate GetMethod2(std::wstring const &methodName) const noexcept;
+  SyncMethodDelegate GetSyncMethod(std::wstring const &methodName) const noexcept;
+
+  static IJSValueWriter ArgWriter(JSValue &jsValue) noexcept;
+  template <class... TArgs>
+  static IJSValueReader ArgReader(TArgs &&... args) noexcept;
+  static IJSValueReader CreateArgReader(std::function<void(IJSValueWriter const &)> const &argWriter) noexcept;
+
+  template <class T>
+  MethodResultCallback ResolveCallback(JSValue const &jsValue, std::function<void(T)> const &resolve) noexcept;
+  template <class T>
+  MethodResultCallback RejectCallback(JSValue const &jsValue, std::function<void(T)> const &reject) noexcept;
+
+ private:
+  std::wstring m_eventEmitterName;
+  std::map<std::wstring, std::tuple<MethodReturnType, MethodDelegate>> m_methods;
+  std::map<std::wstring, SyncMethodDelegate> m_syncMethods;
+  std::vector<ConstantProvider> m_constProviders;
+  std::map<std::wstring, std::function<void(IJSValueReader &)>> m_eventHandlers;
+  bool m_isResolveCallbackCalled;
+  bool m_isRejectCallbackCalled;
+};
+
+struct ReactModuleBuilderImpl : implements<ReactModuleBuilderImpl, IReactModuleBuilder> {
+  ReactModuleBuilderImpl(ReactModuleBuilderMock &mock) noexcept;
+
+ public: // IReactModuleBuilder
+  void SetEventEmitterName(hstring const &name) noexcept;
+  void AddMethod(hstring const &name, MethodReturnType returnType, MethodDelegate const &method) noexcept;
+  void AddSyncMethod(hstring const &name, SyncMethodDelegate const &method) noexcept;
+  void AddConstantProvider(ConstantProvider const &constantProvider) noexcept;
+  void AddEventHandlerSetter(hstring const &name, ReactEventHandlerSetter const &eventHandlerSetter) noexcept;
+
+ private:
+  ReactModuleBuilderMock &m_mock;
+};
+
+//===========================================================================
+// ReactModuleBuilderMock inline implementation
+//===========================================================================
+
+template <class... TArgs>
+inline void ReactModuleBuilderMock::Call0(std::wstring const &methodName, TArgs &&... args) noexcept {
+  if (auto method = GetMethod0(methodName)) {
+    JSValue jsValue;
+    method(ArgReader(std::forward<TArgs>(args)...), ArgWriter(jsValue), nullptr, nullptr);
+  }
+}
+
+template <class TResult, class... TArgs>
+inline void ReactModuleBuilderMock::Call1(
+    std::wstring const &methodName,
+    std::function<void(TResult)> const &resolve,
+    TArgs &&... args) noexcept {
+  if (auto method = GetMethod1(methodName)) {
+    JSValue jsValue;
+    method(ArgReader(std::forward<TArgs>(args)...), ArgWriter(jsValue), ResolveCallback(jsValue, resolve), nullptr);
+  }
+}
+
+template <class TResult, class TError, class... TArgs>
+inline void ReactModuleBuilderMock::Call2(
+    std::wstring const &methodName,
+    std::function<void(TResult)> const &resolve,
+    std::function<void(TError)> const &reject,
+    TArgs &&... args) noexcept {
+  if (auto method = GetMethod2(methodName)) {
+    JSValue jsValue;
+    method(
+        ArgReader(std::forward<TArgs>(args)...),
+        ArgWriter(jsValue),
+        ResolveCallback(jsValue, resolve),
+        RejectCallback(jsValue, reject));
+  }
+}
+
+template <class TResult, class... TArgs>
+inline void
+ReactModuleBuilderMock::CallSync(std::wstring const &methodName, TResult &result, TArgs &&... args) noexcept {
+  if (auto method = GetSyncMethod(methodName)) {
+    JSValue jsValue;
+    method(ArgReader(std::forward<TArgs>(args)...), ArgWriter(jsValue));
+    ReadArgs(MakeJSValueTreeReader(jsValue), result);
+  }
+}
+
+template <class T>
+inline void ReactModuleBuilderMock::SetEventHandler(
+    std::wstring const &eventName,
+    std::function<void(T)> const &eventHandler) noexcept {
+  m_eventHandlers.emplace(eventName, [eventHandler](IJSValueReader const &reader) noexcept {
+    std::remove_const_t<std::remove_reference_t<T>> arg;
+    ReadArgs(reader, /*out*/ arg);
+    eventHandler(arg);
+  });
+}
+
+template <class... TArgs>
+inline /*static*/ IJSValueReader ReactModuleBuilderMock::ArgReader(TArgs &&... args) noexcept {
+  return CreateArgReader([&args...](IJSValueWriter const &writer) mutable noexcept {
+    WriteArgs(writer, std::forward<TArgs>(args)...);
+  });
+}
+
+template <class T>
+inline MethodResultCallback ReactModuleBuilderMock::ResolveCallback(
+    JSValue const &jsValue,
+    std::function<void(T)> const &resolve) noexcept {
+  return [ this, &jsValue, &resolve ](IJSValueWriter const & /*writer*/) noexcept {
+    std::remove_const_t<std::remove_reference_t<T>> arg;
+    ReadArgs(MakeJSValueTreeReader(jsValue), arg);
+    resolve(arg);
+    m_isResolveCallbackCalled = true;
+  };
+}
+
+template <class T>
+inline MethodResultCallback ReactModuleBuilderMock::RejectCallback(
+    JSValue const &jsValue,
+    std::function<void(T)> const &reject) noexcept {
+  return [ this, &jsValue, &reject ](IJSValueWriter const & /*writer*/) noexcept {
+    std::remove_const_t<std::remove_reference_t<T>> arg;
+    ReadArgs(MakeJSValueTreeReader(jsValue), arg);
+    reject(arg);
+    m_isRejectCallbackCalled = true;
+  };
+}
+
+inline bool ReactModuleBuilderMock::IsResolveCallbackCalled() const noexcept {
+  return m_isResolveCallbackCalled;
+}
+
+inline void ReactModuleBuilderMock::IsResolveCallbackCalled(bool value) noexcept {
+  m_isResolveCallbackCalled = value;
+}
+
+inline bool ReactModuleBuilderMock::IsRejectCallbackCalled() const noexcept {
+  return m_isRejectCallbackCalled;
+}
+
+inline void ReactModuleBuilderMock::IsRejectCallbackCalled(bool value) noexcept {
+  m_isRejectCallbackCalled = value;
+}
+
+//===========================================================================
+// ReactModuleBuilderImpl inline implementation
+//===========================================================================
+
+inline ReactModuleBuilderImpl::ReactModuleBuilderImpl(ReactModuleBuilderMock &mock) noexcept : m_mock{mock} {}
+
+inline void ReactModuleBuilderImpl::SetEventEmitterName(hstring const &name) noexcept {
+  m_mock.SetEventEmitterName(name);
+}
+
+inline void ReactModuleBuilderImpl::AddMethod(
+    hstring const &name,
+    MethodReturnType returnType,
+    MethodDelegate const &method) noexcept {
+  m_mock.AddMethod(name, returnType, method);
+}
+
+inline void ReactModuleBuilderImpl::AddSyncMethod(hstring const &name, SyncMethodDelegate const &method) noexcept {
+  m_mock.AddSyncMethod(name, method);
+}
+
+inline void ReactModuleBuilderImpl::AddConstantProvider(ConstantProvider const &constantProvider) noexcept {
+  m_mock.AddConstantProvider(constantProvider);
+}
+
+inline void ReactModuleBuilderImpl::AddEventHandlerSetter(
+    hstring const &name,
+    ReactEventHandlerSetter const &eventHandlerSetter) noexcept {
+  m_mock.AddEventHandlerSetter(name, eventHandlerSetter);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/catch.hpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/catch.hpp
new file mode 100644
index 00000000000..b4eccfc1483
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/catch.hpp
@@ -0,0 +1,17597 @@
+/*
+ *  Catch v2.11.0
+ *  Generated: 2019-11-15 15:01:56.628356
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2019 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+// start catch.hpp
+
+
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 11
+#define CATCH_VERSION_PATCH 0
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// start catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+     // Because REQUIREs trigger GCC's -Wparentheses, and because still
+     // supported version of g++ have only buggy support for _Pragmas,
+     // Wparentheses have to be suppressed globally.
+#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
+
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+// end catch_suppress_warnings.h
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#  define CATCH_CONFIG_ALL_PARTS
+#endif
+
+// In the impl file, we want to have access to all parts of the headers
+// Can also be used to sanely support PCHs
+#if defined(CATCH_CONFIG_ALL_PARTS)
+#  define CATCH_CONFIG_EXTERNAL_INTERFACES
+#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#    undef CATCH_CONFIG_DISABLE_MATCHERS
+#  endif
+#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  endif
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+// start catch_platform.h
+
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX == 1
+#  define CATCH_PLATFORM_MAC
+# elif TARGET_OS_IPHONE == 1
+#  define CATCH_PLATFORM_IPHONE
+# endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+#  define CATCH_PLATFORM_WINDOWS
+#endif
+
+// end catch_platform.h
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// start catch_user_interfaces.h
+
+namespace Catch {
+    unsigned int rngSeed();
+}
+
+// end catch_user_interfaces.h
+// start catch_tag_alias_autoregistrar.h
+
+// start catch_common.h
+
+// start catch_compiler_capabilities.h
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+#ifdef __cplusplus
+
+#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+
+#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+#    define CATCH_CPP17_OR_GREATER
+#  endif
+
+#endif
+
+#if defined(CATCH_CPP17_OR_GREATER)
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+// We have to avoid both ICC and Clang, because they try to mask themselves
+// as gcc, and we want only GCC in this block
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
+#endif
+
+#if defined(__clang__)
+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
+
+#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that non-Windows platforms support posix signals by default
+#if !defined(CATCH_PLATFORM_WINDOWS)
+    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
+    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#endif
+
+#ifdef __OS400__
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#       define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+
+# endif
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#if defined(_MSC_VER)
+
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
+
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#    define CATCH_CONFIG_COLOUR_NONE
+#  else
+#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+#  endif
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+#  if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+#    define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#  endif
+#endif // _MSC_VER
+
+#if defined(_REENTRANT) || defined(_MSC_VER)
+// Enable async processing, as -pthread is specified or no additional linking is required
+# define CATCH_INTERNAL_CONFIG_USE_ASYNC
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// DJGPP
+#ifdef __DJGPP__
+#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use of __COUNTER__ is suppressed during code analysis in
+// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
+// handled by it.
+// Otherwise all supported compilers support COUNTER macro,
+// but user still might want to turn it off
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+#if defined(__UCLIBC__)
+#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Various stdlib support checks that require __has_include
+#if defined(__has_include)
+  // Check if string_view is available and usable
+  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+  #endif
+
+  // Check if optional is available and usable
+  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if byte is available and usable
+  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if variant is available and usable
+  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+  #    if defined(__clang__) && (__clang_major__ < 8)
+         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+         // fix should be in clang 8, workaround in libstdc++ 8.2
+  #      include <ciso646>
+  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #        define CATCH_CONFIG_NO_CPP17_VARIANT
+  #      else
+  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #    else
+  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #    endif // defined(__clang__) && (__clang_major__ < 8)
+  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // defined(__has_include)
+
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
+#   define CATCH_CONFIG_WCHAR
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+#    define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#  define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+#  define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+#  define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
+#endif
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+#  define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+#  define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#  define CATCH_CONFIG_USE_ASYNC
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#  define CATCH_CONFIG_ANDROID_LOGWRITE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Even if we do not think the compiler has that warning, we still have
+// to provide a macro that can be used by the code.
+#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
+#endif
+
+#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#elif defined(__clang__) && (__clang_major__ < 5)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#endif
+
+// end catch_compiler_capabilities.h
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+
+    protected:
+        NonCopyable();
+        virtual ~NonCopyable();
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
+        :   file( _file ),
+            line( _line )
+        {}
+
+        SourceLineInfo( SourceLineInfo const& other )            = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
+        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
+        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
+
+        bool empty() const noexcept { return file[0] == '\0'; }
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // Bring in operator<< from global namespace into Catch namespace
+    // This is necessary because the overload of operator<< above makes
+    // lookup stop at namespace Catch
+    using ::operator<<;
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() const;
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+// end catch_common.h
+namespace Catch {
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_tag_alias_autoregistrar.h
+// start catch_test_registry.h
+
+// start catch_interfaces_testcase.h
+
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestInvoker {
+        virtual void invoke () const = 0;
+        virtual ~ITestInvoker();
+    };
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+// end catch_interfaces_testcase.h
+// start catch_stringref.h
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+#include <cassert>
+
+namespace Catch {
+
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+        using const_iterator = const char*;
+
+    private:
+        static constexpr char const* const s_empty = "";
+
+        char const* m_start = s_empty;
+        size_type m_size = 0;
+
+    public: // construction
+        constexpr StringRef() noexcept = default;
+
+        StringRef( char const* rawChars ) noexcept;
+
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
+
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
+        }
+
+    public: // operators
+        auto operator == ( StringRef const& other ) const noexcept -> bool;
+        auto operator != (StringRef const& other) const noexcept -> bool {
+            return !(*this == other);
+        }
+
+        auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
+
+    public: // named queries
+        constexpr auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        constexpr auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        // Returns the current start pointer. If the StringRef is not
+        // null-terminated, throws std::domain_exception
+        auto c_str() const -> char const*;
+
+    public: // substrings and searches
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
+
+        // Returns the current start pointer. May not be null-terminated.
+        auto data() const noexcept -> char const*;
+
+        constexpr auto isNullTerminated() const noexcept -> bool {
+            return m_start[m_size] == '\0';
+        }
+
+    public: // iterators
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+    };
+
+    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
+    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+
+    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+} // namespace Catch
+
+constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
+
+// end catch_stringref.h
+// start catch_preprocessor.hpp
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
+#else
+// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
+#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
+#endif
+
+#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
+#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
+
+#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
+    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
+
+#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
+#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
+#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
+#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
+#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
+#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
+#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _4, _5, _6)
+#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
+#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
+#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
+#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
+
+#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+
+#define INTERNAL_CATCH_TYPE_GEN\
+    template<typename...> struct TypeList {};\
+    template<typename...Ts>\
+    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
+    template<template<typename...> class...> struct TemplateTypeList{};\
+    template<template<typename...> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
+    template<typename...>\
+    struct append;\
+    template<typename...>\
+    struct rewrap;\
+    template<template<typename...> class, typename...>\
+    struct create;\
+    template<template<typename...> class, typename>\
+    struct convert;\
+    \
+    template<typename T> \
+    struct append<T> { using type = T; };\
+    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
+    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
+    template< template<typename...> class L1, typename...E1, typename...Rest>\
+    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
+    \
+    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
+    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
+    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
+    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
+    \
+    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
+    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
+    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
+    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
+
+#define INTERNAL_CATCH_NTTP_1(signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
+    \
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
+    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
+    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
+    template<typename TestType> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
+    template<typename TestType> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_NTTP_0
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
+#else
+#define INTERNAL_CATCH_NTTP_0(signature)
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
+#endif
+
+// end catch_preprocessor.hpp
+// start catch_meta.hpp
+
+
+#include <type_traits>
+
+namespace Catch {
+    template<typename T>
+    struct always_false : std::false_type {};
+
+    template <typename> struct true_given : std::true_type {};
+    struct is_callable_tester {
+        template <typename Fun, typename... Args>
+        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
+        template <typename...>
+        std::false_type static test(...);
+    };
+
+    template <typename T>
+    struct is_callable;
+
+    template <typename Fun, typename... Args>
+    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
+
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
+    // replaced with std::invoke_result here. Also *_t format is preferred over
+    // typename *::type format.
+    template <typename Func, typename U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U>>>;
+#else
+    template <typename Func, typename U>
+    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U)>::type>::type>::type;
+#endif
+
+} // namespace Catch
+
+namespace mpl_{
+    struct na;
+}
+
+// end catch_meta.hpp
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+    void (C::*m_testAsMethod)();
+public:
+    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+    void invoke() const override {
+        C obj;
+        (obj.*m_testAsMethod)();
+    }
+};
+
+auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
+
+template<typename C>
+auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
+    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
+}
+
+struct NameAndTags {
+    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+    StringRef name;
+    StringRef tags;
+};
+
+struct AutoReg : NonCopyable {
+    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+    ~AutoReg();
+};
+
+} // end namespace Catch
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+        namespace{                        \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test();              \
+            };                            \
+        }                                 \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
+        namespace{                                                                                  \
+            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        }                                                                                           \
+        }                                                                                           \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+#endif
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestName{\
+                TestName(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+            return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
+        template<typename TestType> static void TestFuncName();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
+            INTERNAL_CATCH_TYPE_GEN                                                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
+            template<typename... Types>                               \
+            struct TestName {                                         \
+                void reg_tests() {                                          \
+                    int index = 0;                                    \
+                    using expander = int[];                           \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */\
+                }                                                     \
+            };                                                        \
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }                                                             \
+        }                                                             \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> static void TestFunc();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+        INTERNAL_CATCH_TYPE_GEN\
+        template<typename... Types>                               \
+        struct TestName {                                         \
+            void reg_tests() {                                          \
+                int index = 0;                                    \
+                using expander = int[];                           \
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */\
+            }                                                     \
+        };\
+        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename convert<TestName, TmplList>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFunc()
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList )
+
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestNameClass{\
+                TestNameClass(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+                return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+                void test();\
+            };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
+            INTERNAL_CATCH_TYPE_GEN                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+            void test();\
+        };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename convert<TestNameClass, TmplList>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
+
+// end catch_test_registry.h
+// start catch_capture.hpp
+
+// start catch_assertionhandler.h
+
+// start catch_assertioninfo.h
+
+// start catch_result_type.h
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    bool isOk( ResultWas::OfType resultType );
+    bool isJustInfo( int flags );
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+    bool shouldContinueOnFailure( int flags );
+    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+// end catch_result_type.h
+namespace Catch {
+
+    struct AssertionInfo
+    {
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+
+        // We want to delete this constructor but a compiler bug in 4.8 means
+        // the struct is then treated as non-aggregate
+        //AssertionInfo() = delete;
+    };
+
+} // end namespace Catch
+
+// end catch_assertioninfo.h
+// start catch_decomposer.h
+
+// start catch_tostring.h
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+// start catch_stream.h
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+    class StringRef;
+
+    struct IStream {
+        virtual ~IStream();
+        virtual std::ostream& stream() const = 0;
+    };
+
+    auto makeStream( StringRef const &filename ) -> IStream const*;
+
+    class ReusableStringStream : NonCopyable {
+        std::size_t m_index;
+        std::ostream* m_oss;
+    public:
+        ReusableStringStream();
+        ~ReusableStringStream();
+
+        auto str() const -> std::string;
+
+        template<typename T>
+        auto operator << ( T const& value ) -> ReusableStringStream& {
+            *m_oss << value;
+            return *this;
+        }
+        auto get() -> std::ostream& { return *m_oss; }
+    };
+}
+
+// end catch_stream.h
+// start catch_interfaces_enum_values_registry.h
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+        struct EnumInfo {
+            StringRef m_name;
+            std::vector<std::pair<int, StringRef>> m_values;
+
+            ~EnumInfo();
+
+            StringRef lookup( int value ) const;
+        };
+    } // namespace Detail
+
+    struct IMutableEnumValuesRegistry {
+        virtual ~IMutableEnumValuesRegistry();
+
+        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
+
+        template<typename E>
+        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
+            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
+            std::vector<int> intValues;
+            intValues.reserve( values.size() );
+            for( auto enumValue : values )
+                intValues.push_back( static_cast<int>( enumValue ) );
+            return registerEnum( enumName, allEnums, intValues );
+        }
+    };
+
+} // Catch
+
+// end catch_interfaces_enum_values_registry.h
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
+
+#ifdef __OBJC__
+// start catch_objc_arc.hpp
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+// end catch_objc_arc.hpp
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+namespace Catch {
+    namespace Detail {
+
+        extern const std::string unprintableString;
+
+        std::string rawMemoryToString( const void *object, std::size_t size );
+
+        template<typename T>
+        std::string rawMemoryToString( const T& object ) {
+          return rawMemoryToString( &object, sizeof(object) );
+        }
+
+        template<typename T>
+        class IsStreamInsertable {
+            template<typename Stream, typename U>
+            static auto test(int)
+                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
+
+            template<typename, typename>
+            static auto test(...)->std::false_type;
+
+        public:
+            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+        };
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e );
+
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+        std::string>::type convertUnstreamable( T const& ) {
+            return Detail::unprintableString;
+        }
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+         std::string>::type convertUnstreamable(T const& ex) {
+            return ex.what();
+        }
+
+        template<typename T>
+        typename std::enable_if<
+            std::is_enum<T>::value
+        , std::string>::type convertUnstreamable( T const& value ) {
+            return convertUnknownEnumToString( value );
+        }
+
+#if defined(_MANAGED)
+        //! Convert a CLR string to a utf8 std::string
+        template<typename T>
+        std::string clrReferenceToString( T^ ref ) {
+            if (ref == nullptr)
+                return std::string("null");
+            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+            cli::pin_ptr<System::Byte> p = &bytes[0];
+            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+        }
+#endif
+
+    } // namespace Detail
+
+    // If we decide for C++14, change these to enable_if_ts
+    template <typename T, typename = void>
+    struct StringMaker {
+        template <typename Fake = T>
+        static
+        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert(const Fake& value) {
+                ReusableStringStream rss;
+                // NB: call using the function-like syntax to avoid ambiguity with
+                // user-defined templated operator<< under clang.
+                rss.operator<<(value);
+                return rss.str();
+        }
+
+        template <typename Fake = T>
+        static
+        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+            return Detail::convertUnstreamable(value);
+#else
+            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+        }
+    };
+
+    namespace Detail {
+
+        // This function dispatches all stringification requests inside of Catch.
+        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+        template <typename T>
+        std::string stringify(const T& e) {
+            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
+        }
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e ) {
+            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
+        }
+
+#if defined(_MANAGED)
+        template <typename T>
+        std::string stringify( T^ e ) {
+            return ::Catch::StringMaker<T^>::convert(e);
+        }
+#endif
+
+    } // namespace Detail
+
+    // Some predefined specializations
+
+    template<>
+    struct StringMaker<std::string> {
+        static std::string convert(const std::string& str);
+    };
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::string_view> {
+        static std::string convert(std::string_view str);
+    };
+#endif
+
+    template<>
+    struct StringMaker<char const *> {
+        static std::string convert(char const * str);
+    };
+    template<>
+    struct StringMaker<char *> {
+        static std::string convert(char * str);
+    };
+
+#ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::wstring_view> {
+        static std::string convert(std::wstring_view str);
+    };
+# endif
+
+    template<>
+    struct StringMaker<wchar_t const *> {
+        static std::string convert(wchar_t const * str);
+    };
+    template<>
+    struct StringMaker<wchar_t *> {
+        static std::string convert(wchar_t * str);
+    };
+#endif
+
+    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
+    //      while keeping string semantics?
+    template<int SZ>
+    struct StringMaker<char[SZ]> {
+        static std::string convert(char const* str) {
+            return ::Catch::Detail::stringify(std::string{ str });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<signed char[SZ]> {
+        static std::string convert(signed char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<unsigned char[SZ]> {
+        static std::string convert(unsigned char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<int> {
+        static std::string convert(int value);
+    };
+    template<>
+    struct StringMaker<long> {
+        static std::string convert(long value);
+    };
+    template<>
+    struct StringMaker<long long> {
+        static std::string convert(long long value);
+    };
+    template<>
+    struct StringMaker<unsigned int> {
+        static std::string convert(unsigned int value);
+    };
+    template<>
+    struct StringMaker<unsigned long> {
+        static std::string convert(unsigned long value);
+    };
+    template<>
+    struct StringMaker<unsigned long long> {
+        static std::string convert(unsigned long long value);
+    };
+
+    template<>
+    struct StringMaker<bool> {
+        static std::string convert(bool b);
+    };
+
+    template<>
+    struct StringMaker<char> {
+        static std::string convert(char c);
+    };
+    template<>
+    struct StringMaker<signed char> {
+        static std::string convert(signed char c);
+    };
+    template<>
+    struct StringMaker<unsigned char> {
+        static std::string convert(unsigned char c);
+    };
+
+    template<>
+    struct StringMaker<std::nullptr_t> {
+        static std::string convert(std::nullptr_t);
+    };
+
+    template<>
+    struct StringMaker<float> {
+        static std::string convert(float value);
+        static int precision;
+    };
+
+    template<>
+    struct StringMaker<double> {
+        static std::string convert(double value);
+        static int precision;
+    };
+
+    template <typename T>
+    struct StringMaker<T*> {
+        template <typename U>
+        static std::string convert(U* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+    template <typename R, typename C>
+    struct StringMaker<R C::*> {
+        static std::string convert(R C::* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+#if defined(_MANAGED)
+    template <typename T>
+    struct StringMaker<T^> {
+        static std::string convert( T^ ref ) {
+            return ::Catch::Detail::clrReferenceToString(ref);
+        }
+    };
+#endif
+
+    namespace Detail {
+        template<typename InputIterator>
+        std::string rangeToString(InputIterator first, InputIterator last) {
+            ReusableStringStream rss;
+            rss << "{ ";
+            if (first != last) {
+                rss << ::Catch::Detail::stringify(*first);
+                for (++first; first != last; ++first)
+                    rss << ", " << ::Catch::Detail::stringify(*first);
+            }
+            rss << " }";
+            return rss.str();
+        }
+    }
+
+#ifdef __OBJC__
+    template<>
+    struct StringMaker<NSString*> {
+        static std::string convert(NSString * nsstring) {
+            if (!nsstring)
+                return "nil";
+            return std::string("@") + [nsstring UTF8String];
+        }
+    };
+    template<>
+    struct StringMaker<NSObject*> {
+        static std::string convert(NSObject* nsObject) {
+            return ::Catch::Detail::stringify([nsObject description]);
+        }
+
+    };
+    namespace Detail {
+        inline std::string stringify( NSString* nsstring ) {
+            return StringMaker<NSString*>::convert( nsstring );
+        }
+
+    } // namespace Detail
+#endif // __OBJC__
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+    template<typename T1, typename T2>
+    struct StringMaker<std::pair<T1, T2> > {
+        static std::string convert(const std::pair<T1, T2>& pair) {
+            ReusableStringStream rss;
+            rss << "{ "
+                << ::Catch::Detail::stringify(pair.first)
+                << ", "
+                << ::Catch::Detail::stringify(pair.second)
+                << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+    template<typename T>
+    struct StringMaker<std::optional<T> > {
+        static std::string convert(const std::optional<T>& optional) {
+            ReusableStringStream rss;
+            if (optional.has_value()) {
+                rss << ::Catch::Detail::stringify(*optional);
+            } else {
+                rss << "{ }";
+            }
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+    namespace Detail {
+        template<
+            typename Tuple,
+            std::size_t N = 0,
+            bool = (N < std::tuple_size<Tuple>::value)
+            >
+            struct TupleElementPrinter {
+            static void print(const Tuple& tuple, std::ostream& os) {
+                os << (N ? ", " : " ")
+                    << ::Catch::Detail::stringify(std::get<N>(tuple));
+                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+            }
+        };
+
+        template<
+            typename Tuple,
+            std::size_t N
+        >
+            struct TupleElementPrinter<Tuple, N, false> {
+            static void print(const Tuple&, std::ostream&) {}
+        };
+
+    }
+
+    template<typename ...Types>
+    struct StringMaker<std::tuple<Types...>> {
+        static std::string convert(const std::tuple<Types...>& tuple) {
+            ReusableStringStream rss;
+            rss << '{';
+            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+            rss << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
+namespace Catch {
+    template<>
+    struct StringMaker<std::monostate> {
+        static std::string convert(const std::monostate&) {
+            return "{ }";
+        }
+    };
+
+    template<typename... Elements>
+    struct StringMaker<std::variant<Elements...>> {
+        static std::string convert(const std::variant<Elements...>& variant) {
+            if (variant.valueless_by_exception()) {
+                return "{valueless variant}";
+            } else {
+                return std::visit(
+                    [](const auto& value) {
+                        return ::Catch::Detail::stringify(value);
+                    },
+                    variant
+                );
+            }
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+    struct not_this_one {}; // Tag type for detecting which begin/ end are being selected
+
+    // Import begin/ end from std here so they are considered alongside the fallback (...) overloads in this namespace
+    using std::begin;
+    using std::end;
+
+    not_this_one begin( ... );
+    not_this_one end( ... );
+
+    template <typename T>
+    struct is_range {
+        static const bool value =
+            !std::is_same<decltype(begin(std::declval<T>())), not_this_one>::value &&
+            !std::is_same<decltype(end(std::declval<T>())), not_this_one>::value;
+    };
+
+#if defined(_MANAGED) // Managed types are never ranges
+    template <typename T>
+    struct is_range<T^> {
+        static const bool value = false;
+    };
+#endif
+
+    template<typename Range>
+    std::string rangeToString( Range const& range ) {
+        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+    }
+
+    // Handle vector<bool> specially
+    template<typename Allocator>
+    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+        ReusableStringStream rss;
+        rss << "{ ";
+        bool first = true;
+        for( bool b : v ) {
+            if( first )
+                first = false;
+            else
+                rss << ", ";
+            rss << ::Catch::Detail::stringify( b );
+        }
+        rss << " }";
+        return rss.str();
+    }
+
+    template<typename R>
+    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
+        static std::string convert( R const& range ) {
+            return rangeToString( range );
+        }
+    };
+
+    template <typename T, int SZ>
+    struct StringMaker<T[SZ]> {
+        static std::string convert(T const(&arr)[SZ]) {
+            return rangeToString(arr);
+        }
+    };
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+    static std::string symbol();
+};
+
+template <class Ratio>
+std::string ratio_string<Ratio>::symbol() {
+    Catch::ReusableStringStream rss;
+    rss << '[' << Ratio::num << '/'
+        << Ratio::den << ']';
+    return rss.str();
+}
+template <>
+struct ratio_string<std::atto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::femto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::pico> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::nano> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::micro> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::milli> {
+    static std::string symbol();
+};
+
+    ////////////
+    // std::chrono::duration specializations
+    template<typename Value, typename Ratio>
+    struct StringMaker<std::chrono::duration<Value, Ratio>> {
+        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " s";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " m";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " h";
+            return rss.str();
+        }
+    };
+
+    ////////////
+    // std::chrono::time_point specialization
+    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+    template<typename Clock, typename Duration>
+    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+        }
+    };
+    // std::chrono::time_point<system_clock> specialization
+    template<typename Duration>
+    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+            auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &converted);
+#else
+            std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+
+#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
+namespace Catch { \
+    template<> struct StringMaker<enumName> { \
+        static std::string convert( enumName value ) { \
+            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
+            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
+        } \
+    }; \
+}
+
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_tostring.h
+#include <iosfwd>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
+#endif
+
+namespace Catch {
+
+    struct ITransientExpression {
+        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+        auto getResult() const -> bool { return m_result; }
+        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
+
+        ITransientExpression( bool isBinaryExpression, bool result )
+        :   m_isBinaryExpression( isBinaryExpression ),
+            m_result( result )
+        {}
+
+        // We don't actually need a virtual destructor, but many static analysers
+        // complain if it's not here :-(
+        virtual ~ITransientExpression();
+
+        bool m_isBinaryExpression;
+        bool m_result;
+
+    };
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+    template<typename LhsT, typename RhsT>
+    class BinaryExpr  : public ITransientExpression {
+        LhsT m_lhs;
+        StringRef m_op;
+        RhsT m_rhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            formatReconstructedExpression
+                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+        }
+
+    public:
+        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+        :   ITransientExpression{ true, comparisonResult },
+            m_lhs( lhs ),
+            m_op( op ),
+            m_rhs( rhs )
+        {}
+
+        template<typename T>
+        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+    };
+
+    template<typename LhsT>
+    class UnaryExpr : public ITransientExpression {
+        LhsT m_lhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            os << Catch::Detail::stringify( m_lhs );
+        }
+
+    public:
+        explicit UnaryExpr( LhsT lhs )
+        :   ITransientExpression{ false, static_cast<bool>(lhs) },
+            m_lhs( lhs )
+        {}
+    };
+
+    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
+    template<typename LhsT, typename RhsT>
+    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+    template<typename T>
+    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+
+    template<typename LhsT, typename RhsT>
+    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+    template<typename T>
+    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+
+    template<typename LhsT>
+    class ExprLhs {
+        LhsT m_lhs;
+    public:
+        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+        template<typename RhsT>
+        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
+        }
+        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs == rhs, m_lhs, "==", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
+        }
+        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs != rhs, m_lhs, "!=", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
+        }
+        template<typename RhsT>
+        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
+        }
+        template<typename RhsT>
+        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
+        }
+        template<typename RhsT>
+        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator&& is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename RhsT>
+        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator|| is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+            return UnaryExpr<LhsT>{ m_lhs };
+        }
+    };
+
+    void handleExpression( ITransientExpression const& expr );
+
+    template<typename T>
+    void handleExpression( ExprLhs<T> const& expr ) {
+        handleExpression( expr.makeUnaryExpr() );
+    }
+
+    struct Decomposer {
+        template<typename T>
+        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
+            return ExprLhs<T const&>{ lhs };
+        }
+
+        auto operator <=( bool value ) -> ExprLhs<bool> {
+            return ExprLhs<bool>{ value };
+        }
+    };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_decomposer.h
+// start catch_interfaces_capture.h
+
+#include <string>
+#include <chrono>
+
+namespace Catch {
+
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    struct MessageBuilder;
+    struct Counts;
+    struct AssertionReaction;
+    struct SourceLineInfo;
+
+    struct ITransientExpression;
+    struct IGeneratorTracker;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo;
+    template <typename Duration = std::chrono::duration<double, std::nano>>
+    struct BenchmarkStats;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+
+        virtual auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& name ) = 0;
+        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
+        virtual void benchmarkFailed( std::string const& error ) = 0;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
+
+        virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+        virtual void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleIncomplete
+                (   AssertionInfo const& info ) = 0;
+        virtual void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) = 0;
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+
+        // Deprecated, do not use:
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+        virtual void exceptionEarlyReported() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// end catch_interfaces_capture.h
+namespace Catch {
+
+    struct TestFailureException{};
+    struct AssertionResultData;
+    struct IResultCapture;
+    class RunContext;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated );
+        LazyExpression( LazyExpression const& other );
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const;
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+    struct AssertionReaction {
+        bool shouldDebugBreak = false;
+        bool shouldThrow = false;
+    };
+
+    class AssertionHandler {
+        AssertionInfo m_assertionInfo;
+        AssertionReaction m_reaction;
+        bool m_completed = false;
+        IResultCapture& m_resultCapture;
+
+    public:
+        AssertionHandler
+            (   StringRef const& macroName,
+                SourceLineInfo const& lineInfo,
+                StringRef capturedExpression,
+                ResultDisposition::Flags resultDisposition );
+        ~AssertionHandler() {
+            if ( !m_completed ) {
+                m_resultCapture.handleIncomplete( m_assertionInfo );
+            }
+        }
+
+        template<typename T>
+        void handleExpr( ExprLhs<T> const& expr ) {
+            handleExpr( expr.makeUnaryExpr() );
+        }
+        void handleExpr( ITransientExpression const& expr );
+
+        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
+
+        void handleExceptionThrownAsExpected();
+        void handleUnexpectedExceptionNotThrown();
+        void handleExceptionNotThrownAsExpected();
+        void handleThrowingCallSkipped();
+        void handleUnexpectedInflightException();
+
+        void complete();
+        void setCompleted();
+
+        // query
+        auto allowThrows() const -> bool;
+    };
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
+
+} // namespace Catch
+
+// end catch_assertionhandler.h
+// start catch_message.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    StringRef const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        StringRef macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const;
+        bool operator < ( MessageInfo const& other ) const;
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageStream {
+
+        template<typename T>
+        MessageStream& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        ReusableStringStream m_stream;
+    };
+
+    struct MessageBuilder : MessageStream {
+        MessageBuilder( StringRef const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type );
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+    };
+
+    class ScopedMessage {
+    public:
+        explicit ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage& duplicate ) = delete;
+        ScopedMessage( ScopedMessage&& old );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+        bool m_moved;
+    };
+
+    class Capturer {
+        std::vector<MessageInfo> m_messages;
+        IResultCapture& m_resultCapture = getResultCapture();
+        size_t m_captured = 0;
+    public:
+        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+        ~Capturer();
+
+        void captureValue( size_t index, std::string const& value );
+
+        template<typename T>
+        void captureValues( size_t index, T const& value ) {
+            captureValue( index, Catch::Detail::stringify( value ) );
+        }
+
+        template<typename T, typename... Ts>
+        void captureValues( size_t index, T const& value, Ts const&... values ) {
+            captureValue( index, Catch::Detail::stringify(value) );
+            captureValues( index+1, values... );
+        }
+    };
+
+} // end namespace Catch
+
+// end catch_message.h
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) ) // the expression here is never evaluated at runtime but it forces the compiler to give it a look
+    // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        try { \
+            static_cast<void>(__VA_ARGS__); \
+            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+        } \
+        catch( ... ) { \
+            catchAssertionHandler.handleUnexpectedInflightException(); \
+        } \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
+    varName.captureValues( 0, __VA_ARGS__ )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
+    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_capture.hpp
+// start catch_section.h
+
+// start catch_section_info.h
+
+// start catch_totals.h
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::size_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::size_t passed = 0;
+        std::size_t failed = 0;
+        std::size_t failedButOk = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        int error = 0;
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+// end catch_totals.h
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name );
+
+        // Deprecated
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
+
+        std::string name;
+        std::string description; // !Deprecated: this will always be empty
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// end catch_section_info.h
+// start catch_timer.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
+    auto getEstimatedClockResolution() -> uint64_t;
+
+    class Timer {
+        uint64_t m_nanoseconds = 0;
+    public:
+        void start();
+        auto getElapsedNanoseconds() const -> uint64_t;
+        auto getElapsedMicroseconds() const -> uint64_t;
+        auto getElapsedMilliseconds() const -> unsigned int;
+        auto getElapsedSeconds() const -> double;
+    };
+
+} // namespace Catch
+
+// end catch_timer.h
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        explicit operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_section.h
+// start catch_interfaces_exception.h
+
+// start catch_interfaces_registry_hub.h
+
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+    struct ITagAliasRegistry;
+    struct IMutableEnumValuesRegistry;
+
+    class StartupExceptionRegistry;
+
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
+
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
+    };
+
+    IRegistryHub const& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+// end catch_interfaces_registry_hub.h
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+        static std::string translatorName( signature )
+#endif
+
+#include <exception>
+#include <string>
+#include <vector>
+
+namespace Catch {
+    using exceptionTranslateFunction = std::string(*)();
+
+    struct IExceptionTranslator;
+    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+                try {
+                    if( it == itEnd )
+                        std::rethrow_exception(std::current_exception());
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// end catch_interfaces_exception.h
+// start catch_approx.h
+
+#include <type_traits>
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    private:
+        bool equalityComparisonImpl(double other) const;
+        // Validates the new margin (margin >= 0)
+        // out-of-line to avoid including stdexcept in the header
+        void setMargin(double margin);
+        // Validates the new epsilon (0 < epsilon < 1)
+        // out-of-line to avoid including stdexcept in the header
+        void setEpsilon(double epsilon);
+
+    public:
+        explicit Approx ( double value );
+
+        static Approx custom();
+
+        Approx operator-() const;
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T const& value ) {
+            Approx approx( static_cast<double>(value) );
+            approx.m_epsilon = m_epsilon;
+            approx.m_margin = m_margin;
+            approx.m_scale = m_scale;
+            return approx;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        explicit Approx( T const& value ): Approx(static_cast<double>(value))
+        {}
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            auto lhs_v = static_cast<double>(lhs);
+            return rhs.equalityComparisonImpl(lhs_v);
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( T const& lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( Approx const& lhs, T const& rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T const& newEpsilon ) {
+            double epsilonAsDouble = static_cast<double>(newEpsilon);
+            setEpsilon(epsilonAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T const& newMargin ) {
+            double marginAsDouble = static_cast<double>(newMargin);
+            setMargin(marginAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T const& newScale ) {
+            m_scale = static_cast<double>(newScale);
+            return *this;
+        }
+
+        std::string toString() const;
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val);
+    Detail::Approx operator "" _a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Detail::Approx> {
+    static std::string convert(Catch::Detail::Approx const& value);
+};
+
+} // end namespace Catch
+
+// end catch_approx.h
+// start catch_string_manip.h
+
+#include <string>
+#include <iosfwd>
+#include <vector>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( std::string const& s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    //! Returns a new string without whitespace at the start/end
+    std::string trim( std::string const& str );
+    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
+    StringRef trim(StringRef ref);
+
+    // !!! Be aware, returns refs into original string - make sure original string outlives them
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+}
+
+// end catch_string_manip.h
+#ifndef CATCH_CONFIG_DISABLE_MATCHERS
+// start catch_capture_matchers.h
+
+// start catch_matchers.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        template<typename ArgT> struct MatchAllOf;
+        template<typename ArgT> struct MatchAnyOf;
+        template<typename ArgT> struct MatchNotOf;
+
+        class MatcherUntypedBase {
+        public:
+            MatcherUntypedBase() = default;
+            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
+            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
+            std::string toString() const;
+
+        protected:
+            virtual ~MatcherUntypedBase();
+            virtual std::string describe() const = 0;
+            mutable std::string m_cachedToString;
+        };
+
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+        template<typename ObjectT>
+        struct MatcherMethod {
+            virtual bool match( ObjectT const& arg ) const = 0;
+        };
+
+#if defined(__OBJC__)
+        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
+        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
+        template<>
+        struct MatcherMethod<NSString*> {
+            virtual bool match( NSString* arg ) const = 0;
+        };
+#endif
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
+
+        template<typename T>
+        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
+
+            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
+            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
+            MatchNotOf<T> operator ! () const;
+        };
+
+        template<typename ArgT>
+        struct MatchAllOf : MatcherBase<ArgT> {
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (!matcher->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " and ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAllOf<ArgT>& operator && ( MatcherBase<ArgT> const& other ) {
+                m_matchers.push_back( &other );
+                return *this;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+        template<typename ArgT>
+        struct MatchAnyOf : MatcherBase<ArgT> {
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (matcher->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " or ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAnyOf<ArgT>& operator || ( MatcherBase<ArgT> const& other ) {
+                m_matchers.push_back( &other );
+                return *this;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+
+        template<typename ArgT>
+        struct MatchNotOf : MatcherBase<ArgT> {
+
+            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+            bool match( ArgT const& arg ) const override {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            std::string describe() const override {
+                return "not " + m_underlyingMatcher.toString();
+            }
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+        };
+
+        template<typename T>
+        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
+            return MatchAllOf<T>() && *this && other;
+        }
+        template<typename T>
+        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
+            return MatchAnyOf<T>() || *this || other;
+        }
+        template<typename T>
+        MatchNotOf<T> MatcherBase<T>::operator ! () const {
+            return MatchNotOf<T>( *this );
+        }
+
+    } // namespace Impl
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+// end catch_matchers.h
+// start catch_matchers_exception.hpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+class ExceptionMessageMatcher : public MatcherBase<std::exception> {
+    std::string m_message;
+public:
+
+    ExceptionMessageMatcher(std::string const& message):
+        m_message(message)
+    {}
+
+    bool match(std::exception const& ex) const override;
+
+    std::string describe() const override;
+};
+
+} // namespace Exception
+
+Exception::ExceptionMessageMatcher Message(std::string const& message);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_exception.hpp
+// start catch_matchers_floating.h
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Floating {
+
+        enum class FloatingPointKind : uint8_t;
+
+        struct WithinAbsMatcher : MatcherBase<double> {
+            WithinAbsMatcher(double target, double margin);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_margin;
+        };
+
+        struct WithinUlpsMatcher : MatcherBase<double> {
+            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            uint64_t m_ulps;
+            FloatingPointKind m_type;
+        };
+
+        // Given IEEE-754 format for floats and doubles, we can assume
+        // that float -> double promotion is lossless. Given this, we can
+        // assume that if we do the standard relative comparison of
+        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
+        // the same result if we do this for floats, as if we do this for
+        // doubles that were promoted from floats.
+        struct WithinRelMatcher : MatcherBase<double> {
+            WithinRelMatcher(double target, double epsilon);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_epsilon;
+        };
+
+    } // namespace Floating
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
+    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+    Floating::WithinRelMatcher WithinRel(double target, double eps);
+    // defaults epsilon to 100*numeric_limits<double>::epsilon()
+    Floating::WithinRelMatcher WithinRel(double target);
+    Floating::WithinRelMatcher WithinRel(float target, float eps);
+    // defaults epsilon to 100*numeric_limits<float>::epsilon()
+    Floating::WithinRelMatcher WithinRel(float target);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.h
+// start catch_matchers_generic.hpp
+
+#include <functional>
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+namespace Generic {
+
+namespace Detail {
+    std::string finalizeDescription(const std::string& desc);
+}
+
+template <typename T>
+class PredicateMatcher : public MatcherBase<T> {
+    std::function<bool(T const&)> m_predicate;
+    std::string m_description;
+public:
+
+    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
+        :m_predicate(std::move(elem)),
+        m_description(Detail::finalizeDescription(descr))
+    {}
+
+    bool match( T const& item ) const override {
+        return m_predicate(item);
+    }
+
+    std::string describe() const override {
+        return m_description;
+    }
+};
+
+} // namespace Generic
+
+    // The following functions create the actual matcher objects.
+    // The user has to explicitly specify type to the function, because
+    // inferring std::function<bool(T const&)> is hard (but possible) and
+    // requires a lot of TMP.
+    template<typename T>
+    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
+        return Generic::PredicateMatcher<T>(predicate, description);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_generic.hpp
+// start catch_matchers_string.h
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+            std::string adjustString( std::string const& str ) const;
+            std::string caseSensitivitySuffix() const;
+
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct StringMatcherBase : MatcherBase<std::string> {
+            StringMatcherBase( std::string const& operation, CasedString const& comparator );
+            std::string describe() const override;
+
+            CasedString m_comparator;
+            std::string m_operation;
+        };
+
+        struct EqualsMatcher : StringMatcherBase {
+            EqualsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct ContainsMatcher : StringMatcherBase {
+            ContainsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct StartsWithMatcher : StringMatcherBase {
+            StartsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct EndsWithMatcher : StringMatcherBase {
+            EndsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+
+        struct RegexMatcher : MatcherBase<std::string> {
+            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+            bool match( std::string const& matchee ) const override;
+            std::string describe() const override;
+
+        private:
+            std::string m_regex;
+            CaseSensitive::Choice m_caseSensitivity;
+        };
+
+    } // namespace StdString
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_string.h
+// start catch_matchers_vector.h
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Vector {
+        template<typename T>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T>> {
+
+            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+            bool match(std::vector<T> const &v) const override {
+                for (auto const& el : v) {
+                    if (el == m_comparator) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            T const& m_comparator;
+        };
+
+        template<typename T>
+        struct ContainsMatcher : MatcherBase<std::vector<T>> {
+
+            ContainsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T> const &v) const override {
+                // !TBD: see note in EqualsMatcher
+                if (m_comparator.size() > v.size())
+                    return false;
+                for (auto const& comparator : m_comparator) {
+                    auto present = false;
+                    for (const auto& el : v) {
+                        if (el == comparator) {
+                            present = true;
+                            break;
+                        }
+                    }
+                    if (!present) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            std::vector<T> const& m_comparator;
+        };
+
+        template<typename T>
+        struct EqualsMatcher : MatcherBase<std::vector<T>> {
+
+            EqualsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T> const &v) const override {
+                // !TBD: This currently works if all elements can be compared using !=
+                // - a more general approach would be via a compare template that defaults
+                // to using !=. but could be specialised for, e.g. std::vector<T> etc
+                // - then just call that directly
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != v[i])
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            std::vector<T> const& m_comparator;
+        };
+
+        template<typename T>
+        struct ApproxMatcher : MatcherBase<std::vector<T>> {
+
+            ApproxMatcher(std::vector<T> const& comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T> const &v) const override {
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != approx(v[i]))
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& epsilon( T const& newEpsilon ) {
+                approx.epsilon(newEpsilon);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& margin( T const& newMargin ) {
+                approx.margin(newMargin);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& scale( T const& newScale ) {
+                approx.scale(newScale);
+                return *this;
+            }
+
+            std::vector<T> const& m_comparator;
+            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
+        };
+
+        template<typename T>
+        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T>> {
+            UnorderedEqualsMatcher(std::vector<T> const& target) : m_target(target) {}
+            bool match(std::vector<T> const& vec) const override {
+                // Note: This is a reimplementation of std::is_permutation,
+                //       because I don't want to include <algorithm> inside the common path
+                if (m_target.size() != vec.size()) {
+                    return false;
+                }
+                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
+            }
+
+            std::string describe() const override {
+                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+            }
+        private:
+            std::vector<T> const& m_target;
+        };
+
+    } // namespace Vector
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    template<typename T>
+    Vector::ContainsMatcher<T> Contains( std::vector<T> const& comparator ) {
+        return Vector::ContainsMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::ContainsElementMatcher<T> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::EqualsMatcher<T> Equals( std::vector<T> const& comparator ) {
+        return Vector::EqualsMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::ApproxMatcher<T> Approx( std::vector<T> const& comparator ) {
+        return Vector::ApproxMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::UnorderedEqualsMatcher<T> UnorderedEquals(std::vector<T> const& target) {
+        return Vector::UnorderedEqualsMatcher<T>(target);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_vector.h
+namespace Catch {
+
+    template<typename ArgT, typename MatcherT>
+    class MatchExpr : public ITransientExpression {
+        ArgT const& m_arg;
+        MatcherT m_matcher;
+        StringRef m_matcherString;
+    public:
+        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
+        :   ITransientExpression{ true, matcher.match( arg ) },
+            m_arg( arg ),
+            m_matcher( matcher ),
+            m_matcherString( matcherString )
+        {}
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            auto matcherAsString = m_matcher.toString();
+            os << Catch::Detail::stringify( m_arg ) << ' ';
+            if( matcherAsString == Detail::unprintableString )
+                os << m_matcherString;
+            else
+                os << matcherAsString;
+        }
+    };
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
+
+    template<typename ArgT, typename MatcherT>
+    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
+        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
+    }
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__ ); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ex ) { \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+// end catch_capture_matchers.h
+#endif
+// start catch_generators.hpp
+
+// start catch_interfaces_generatortracker.h
+
+
+#include <memory>
+
+namespace Catch {
+
+    namespace Generators {
+        class GeneratorUntypedBase {
+        public:
+            GeneratorUntypedBase() = default;
+            virtual ~GeneratorUntypedBase();
+            // Attempts to move the generator to the next element
+             //
+             // Returns true iff the move succeeded (and a valid element
+             // can be retrieved).
+            virtual bool next() = 0;
+        };
+        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
+
+    } // namespace Generators
+
+    struct IGeneratorTracker {
+        virtual ~IGeneratorTracker();
+        virtual auto hasGenerator() const -> bool = 0;
+        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+    };
+
+} // namespace Catch
+
+// end catch_interfaces_generatortracker.h
+// start catch_enforce.h
+
+#include <exception>
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    template <typename Ex>
+    [[noreturn]]
+    void throw_exception(Ex const& e) {
+        throw e;
+    }
+#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
+    [[noreturn]]
+    void throw_exception(std::exception const& e);
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg);
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg);
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg);
+
+} // namespace Catch;
+
+#define CATCH_MAKE_MSG(...) \
+    (Catch::ReusableStringStream() << __VA_ARGS__).str()
+
+#define CATCH_INTERNAL_ERROR(...) \
+    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
+
+#define CATCH_ERROR(...) \
+    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_RUNTIME_ERROR(...) \
+    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_ENFORCE( condition, ... ) \
+    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
+
+// end catch_enforce.h
+#include <memory>
+#include <vector>
+#include <cassert>
+
+#include <utility>
+#include <exception>
+
+namespace Catch {
+
+class GeneratorException : public std::exception {
+    const char* const m_msg = "";
+
+public:
+    GeneratorException(const char* msg):
+        m_msg(msg)
+    {}
+
+    const char* what() const noexcept override final;
+};
+
+namespace Generators {
+
+    // !TBD move this into its own location?
+    namespace pf{
+        template<typename T, typename... Args>
+        std::unique_ptr<T> make_unique( Args&&... args ) {
+            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+        }
+    }
+
+    template<typename T>
+    struct IGenerator : GeneratorUntypedBase {
+        virtual ~IGenerator() = default;
+
+        // Returns the current element of the generator
+        //
+        // \Precondition The generator is either freshly constructed,
+        // or the last call to `next()` returned true
+        virtual T const& get() const = 0;
+        using type = T;
+    };
+
+    template<typename T>
+    class SingleValueGenerator final : public IGenerator<T> {
+        T m_value;
+    public:
+        SingleValueGenerator(T const& value) : m_value( value ) {}
+        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
+
+        T const& get() const override {
+            return m_value;
+        }
+        bool next() override {
+            return false;
+        }
+    };
+
+    template<typename T>
+    class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "FixedValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
+        std::vector<T> m_values;
+        size_t m_idx = 0;
+    public:
+        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
+
+        T const& get() const override {
+            return m_values[m_idx];
+        }
+        bool next() override {
+            ++m_idx;
+            return m_idx < m_values.size();
+        }
+    };
+
+    template <typename T>
+    class GeneratorWrapper final {
+        std::unique_ptr<IGenerator<T>> m_generator;
+    public:
+        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
+            m_generator(std::move(generator))
+        {}
+        T const& get() const {
+            return m_generator->get();
+        }
+        bool next() {
+            return m_generator->next();
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> value(T&& value) {
+        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+    }
+    template <typename T>
+    GeneratorWrapper<T> values(std::initializer_list<T> values) {
+        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
+    }
+
+    template<typename T>
+    class Generators : public IGenerator<T> {
+        std::vector<GeneratorWrapper<T>> m_generators;
+        size_t m_current = 0;
+
+        void populate(GeneratorWrapper<T>&& generator) {
+            m_generators.emplace_back(std::move(generator));
+        }
+        void populate(T&& val) {
+            m_generators.emplace_back(value(std::move(val)));
+        }
+        template<typename U>
+        void populate(U&& val) {
+            populate(T(std::move(val)));
+        }
+        template<typename U, typename... Gs>
+        void populate(U&& valueOrGenerator, Gs... moreGenerators) {
+            populate(std::forward<U>(valueOrGenerator));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+    public:
+        template <typename... Gs>
+        Generators(Gs... moreGenerators) {
+            m_generators.reserve(sizeof...(Gs));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+        T const& get() const override {
+            return m_generators[m_current].get();
+        }
+
+        bool next() override {
+            if (m_current >= m_generators.size()) {
+                return false;
+            }
+            const bool current_status = m_generators[m_current].next();
+            if (!current_status) {
+                ++m_current;
+            }
+            return m_current < m_generators.size();
+        }
+    };
+
+    template<typename... Ts>
+    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
+        return values<std::tuple<Ts...>>( tuples );
+    }
+
+    // Tag type to signal that a generator sequence should convert arguments to a specific type
+    template <typename T>
+    struct as {};
+
+    template<typename T, typename... Gs>
+    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs... moreGenerators ) -> Generators<T> {
+        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
+    }
+    template<typename T>
+    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+        return Generators<T>(std::move(generator));
+    }
+    template<typename T, typename... Gs>
+    auto makeGenerators( T&& val, Gs... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
+    }
+    template<typename T, typename U, typename... Gs>
+    auto makeGenerators( as<T>, U&& val, Gs... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
+    }
+
+    auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
+
+    template<typename L>
+    // Note: The type after -> is weird, because VS2015 cannot parse
+    //       the expression used in the typedef inside, when it is in
+    //       return type. Yeah.
+    auto generate( SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
+        using UnderlyingType = typename decltype(generatorExpression())::type;
+
+        IGeneratorTracker& tracker = acquireGeneratorTracker( lineInfo );
+        if (!tracker.hasGenerator()) {
+            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
+        }
+
+        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
+        return generator.get();
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+#define GENERATE( ... ) \
+    Catch::Generators::generate( CATCH_INTERNAL_LINEINFO, [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } )
+#define GENERATE_COPY( ... ) \
+    Catch::Generators::generate( CATCH_INTERNAL_LINEINFO, [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } )
+#define GENERATE_REF( ... ) \
+    Catch::Generators::generate( CATCH_INTERNAL_LINEINFO, [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } )
+
+// end catch_generators.hpp
+// start catch_generators_generic.hpp
+
+namespace Catch {
+namespace Generators {
+
+    template <typename T>
+    class TakeGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        size_t m_returned = 0;
+        size_t m_target;
+    public:
+        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target(target)
+        {
+            assert(target != 0 && "Empty generators are not allowed");
+        }
+        T const& get() const override {
+            return m_generator.get();
+        }
+        bool next() override {
+            ++m_returned;
+            if (m_returned >= m_target) {
+                return false;
+            }
+
+            const auto success = m_generator.next();
+            // If the underlying generator does not contain enough values
+            // then we cut short as well
+            if (!success) {
+                m_returned = m_target;
+            }
+            return success;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
+    }
+
+    template <typename T, typename Predicate>
+    class FilterGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        Predicate m_predicate;
+    public:
+        template <typename P = Predicate>
+        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_predicate(std::forward<P>(pred))
+        {
+            if (!m_predicate(m_generator.get())) {
+                // It might happen that there are no values that pass the
+                // filter. In that case we throw an exception.
+                auto has_initial_value = next();
+                if (!has_initial_value) {
+                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
+                }
+            }
+        }
+
+        T const& get() const override {
+            return m_generator.get();
+        }
+
+        bool next() override {
+            bool success = m_generator.next();
+            if (!success) {
+                return false;
+            }
+            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+            return success;
+        }
+    };
+
+    template <typename T, typename Predicate>
+    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
+    }
+
+    template <typename T>
+    class RepeatGenerator : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
+        GeneratorWrapper<T> m_generator;
+        mutable std::vector<T> m_returned;
+        size_t m_target_repeats;
+        size_t m_current_repeat = 0;
+        size_t m_repeat_index = 0;
+    public:
+        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target_repeats(repeats)
+        {
+            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+        }
+
+        T const& get() const override {
+            if (m_current_repeat == 0) {
+                m_returned.push_back(m_generator.get());
+                return m_returned.back();
+            }
+            return m_returned[m_repeat_index];
+        }
+
+        bool next() override {
+            // There are 2 basic cases:
+            // 1) We are still reading the generator
+            // 2) We are reading our own cache
+
+            // In the first case, we need to poke the underlying generator.
+            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+            if (m_current_repeat == 0) {
+                const auto success = m_generator.next();
+                if (!success) {
+                    ++m_current_repeat;
+                }
+                return m_current_repeat < m_target_repeats;
+            }
+
+            // In the second case, we need to move indices forward and check that we haven't run up against the end
+            ++m_repeat_index;
+            if (m_repeat_index == m_returned.size()) {
+                m_repeat_index = 0;
+                ++m_current_repeat;
+            }
+            return m_current_repeat < m_target_repeats;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
+    }
+
+    template <typename T, typename U, typename Func>
+    class MapGenerator : public IGenerator<T> {
+        // TBD: provide static assert for mapping function, for friendly error message
+        GeneratorWrapper<U> m_generator;
+        Func m_function;
+        // To avoid returning dangling reference, we have to save the values
+        T m_cache;
+    public:
+        template <typename F2 = Func>
+        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+            m_generator(std::move(generator)),
+            m_function(std::forward<F2>(function)),
+            m_cache(m_function(m_generator.get()))
+        {}
+
+        T const& get() const override {
+            return m_cache;
+        }
+        bool next() override {
+            const auto success = m_generator.next();
+            if (success) {
+                m_cache = m_function(m_generator.get());
+            }
+            return success;
+        }
+    };
+
+    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T, typename U, typename Func>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T>
+    class ChunkGenerator final : public IGenerator<std::vector<T>> {
+        std::vector<T> m_chunk;
+        size_t m_chunk_size;
+        GeneratorWrapper<T> m_generator;
+        bool m_used_up = false;
+    public:
+        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
+            m_chunk_size(size), m_generator(std::move(generator))
+        {
+            m_chunk.reserve(m_chunk_size);
+            if (m_chunk_size != 0) {
+                m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
+            }
+        }
+        std::vector<T> const& get() const override {
+            return m_chunk;
+        }
+        bool next() override {
+            m_chunk.clear();
+            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
+                if (!m_generator.next()) {
+                    return false;
+                }
+                m_chunk.push_back(m_generator.get());
+            }
+            return true;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<std::vector<T>>(
+            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
+        );
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_generic.hpp
+// start catch_generators_specific.hpp
+
+// start catch_context.h
+
+#include <memory>
+
+namespace Catch {
+
+    struct IResultCapture;
+    struct IRunner;
+    struct IConfig;
+    struct IMutableContext;
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual IConfigPtr const& getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( IConfigPtr const& config ) = 0;
+
+    private:
+        static IMutableContext *currentContext;
+        friend IMutableContext& getCurrentMutableContext();
+        friend void cleanUpContext();
+        static void createContext();
+    };
+
+    inline IMutableContext& getCurrentMutableContext()
+    {
+        if( !IMutableContext::currentContext )
+            IMutableContext::createContext();
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *IMutableContext::currentContext;
+    }
+
+    inline IContext& getCurrentContext()
+    {
+        return getCurrentMutableContext();
+    }
+
+    void cleanUpContext();
+
+    class SimplePcg32;
+    SimplePcg32& rng();
+}
+
+// end catch_context.h
+// start catch_interfaces_config.h
+
+// start catch_option.hpp
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( nullptr ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = nullptr;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
+
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
+        }
+
+    private:
+        T *nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+// end catch_option.hpp
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        NoAssertions = 0x01,
+        NoTests = 0x02
+    }; };
+
+    struct ShowDurations { enum OrNot {
+        DefaultForReporter,
+        Always,
+        Never
+    }; };
+    struct RunTests { enum InWhatOrder {
+        InDeclarationOrder,
+        InLexicographicalOrder,
+        InRandomOrder
+    }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+
+    struct IConfig : NonCopyable {
+
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual std::ostream& stream() const = 0;
+        virtual std::string name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutNoTests() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
+        virtual RunTests::InWhatOrder runOrder() const = 0;
+        virtual unsigned int rngSeed() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
+
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+    };
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+}
+
+// end catch_interfaces_config.h
+// start catch_random_number_generator.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    // This is a simple implementation of C++11 Uniform Random Number
+    // Generator. It does not provide all operators, because Catch2
+    // does not use it, but it should behave as expected inside stdlib's
+    // distributions.
+    // The implementation is based on the PCG family (http://pcg-random.org)
+    class SimplePcg32 {
+        using state_type = std::uint64_t;
+    public:
+        using result_type = std::uint32_t;
+        static constexpr result_type (min)() {
+            return 0;
+        }
+        static constexpr result_type (max)() {
+            return static_cast<result_type>(-1);
+        }
+
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+
+        explicit SimplePcg32(result_type seed_);
+
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
+
+        result_type operator()();
+
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
+    };
+
+} // end namespace Catch
+
+// end catch_random_number_generator.h
+#include <random>
+
+namespace Catch {
+namespace Generators {
+
+template <typename Float>
+class RandomFloatingGenerator final : public IGenerator<Float> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_real_distribution<Float> m_dist;
+    Float m_current_number;
+public:
+
+    RandomFloatingGenerator(Float a, Float b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Float const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+template <typename Integer>
+class RandomIntegerGenerator final : public IGenerator<Integer> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_int_distribution<Integer> m_dist;
+    Integer m_current_number;
+public:
+
+    RandomIntegerGenerator(Integer a, Integer b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Integer const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+// TODO: Ideally this would be also constrained against the various char types,
+//       but I don't expect users to run into that in practice.
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+class RangeGenerator final : public IGenerator<T> {
+    T m_current;
+    T m_end;
+    T m_step;
+    bool m_positive;
+
+public:
+    RangeGenerator(T const& start, T const& end, T const& step):
+        m_current(start),
+        m_end(end),
+        m_step(step),
+        m_positive(m_step > T(0))
+    {
+        assert(m_current != m_end && "Range start and end cannot be equal");
+        assert(m_step != T(0) && "Step size cannot be zero");
+        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
+    }
+
+    RangeGenerator(T const& start, T const& end):
+        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
+    {}
+
+    T const& get() const override {
+        return m_current;
+    }
+
+    bool next() override {
+        m_current += m_step;
+        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
+    }
+};
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
+    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
+}
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end) {
+    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
+}
+
+template <typename T>
+class IteratorGenerator final : public IGenerator<T> {
+    static_assert(!std::is_same<T, bool>::value,
+        "IteratorGenerator currently does not support bools"
+        "because of std::vector<bool> specialization");
+
+    std::vector<T> m_elems;
+    size_t m_current = 0;
+public:
+    template <typename InputIterator, typename InputSentinel>
+    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
+        if (m_elems.empty()) {
+            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
+        }
+    }
+
+    T const& get() const override {
+        return m_elems[m_current];
+    }
+
+    bool next() override {
+        ++m_current;
+        return m_current != m_elems.size();
+    }
+};
+
+template <typename InputIterator,
+          typename InputSentinel,
+          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
+GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
+}
+
+template <typename Container,
+          typename ResultType = typename Container::value_type>
+GeneratorWrapper<ResultType> from_range(Container const& cnt) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+}
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_specific.hpp
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    struct ITestInvoker;
+
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5,
+            Benchmark = 1 << 6
+        };
+
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::vector<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
+
+        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::vector<std::string> tags;
+        std::vector<std::string> lcaseTags;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+
+    private:
+        std::shared_ptr<ITestInvoker> test;
+    };
+
+    TestCase makeTestCase(  ITestInvoker* testCase,
+                            std::string const& className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public ITestInvoker {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline std::size_t registerTestMethods() {
+        std::size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( nullptr, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                bool match( NSString* str ) const override {
+                    return false;
+                }
+
+                NSString* CATCH_ARC_STRONG m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                std::string describe() const override {
+                    return "equals string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                std::string describe() const override {
+                    return "contains string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                std::string describe() const override {
+                    return "starts with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                std::string describe() const override {
+                    return "ends with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+// Benchmarking needs the externally-facing parts of reporters to work
+#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+        virtual ~WildcardPattern() = default;
+        virtual bool matches( std::string const& str ) const;
+
+    private:
+        std::string normaliseString( std::string const& str ) const;
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    struct IConfig;
+
+    class TestSpec {
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            std::string const m_name;
+        };
+        using PatternPtr = std::shared_ptr<Pattern>;
+
+        class NamePattern : public Pattern {
+        public:
+            explicit NamePattern( std::string const& name, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            PatternPtr m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<PatternPtr> m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const;
+            std::string name() const;
+        };
+
+    public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCase const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+        using vectorStrings = std::vector<std::string>;
+
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
+        const vectorStrings & getInvalidArgs() const;
+
+    private:
+        std::vector<Filter> m_filters;
+        std::vector<std::string> m_invalidArgs;
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        Mode lastMode = None;
+        bool m_exclusion = false;
+        std::size_t m_pos = 0;
+        std::size_t m_realPatternPos = 0;
+        std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        bool visitChar( char c );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
+        void escape();
+        bool isControlChar( char c ) const;
+        void saveLastMode();
+        void revertBackToLastMode();
+        void addFilter();
+        bool separate();
+
+        // Handles common preprocessing of the pattern for name/tag patterns
+        std::string preprocessPattern();
+        // Adds the current pattern as a test name
+        void addNamePattern();
+        // Adds the current pattern as a tag
+        void addTagPattern();
+
+        inline void addCharToPattern(char c) {
+            m_substring += c;
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+
+    };
+    TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct IStream;
+
+    struct ConfigData {
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listTestNamesOnly = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+
+        int abortAfter = -1;
+        unsigned int rngSeed = 0;
+
+        bool benchmarkNoAnalysis = false;
+        unsigned int benchmarkSamples = 100;
+        double benchmarkConfidenceInterval = 0.95;
+        unsigned int benchmarkResamples = 100000;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+        UseColour::YesOrNo useColour = UseColour::Auto;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        virtual ~Config() = default;
+
+        std::string const& getFilename() const;
+
+        bool listTests() const;
+        bool listTestNamesOnly() const;
+        bool listTags() const;
+        bool listReporters() const;
+
+        std::string getProcessName() const;
+        std::string const& getReporterName() const;
+
+        std::vector<std::string> const& getTestsOrTags() const override;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        std::ostream& stream() const override;
+        std::string name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutNoTests() const override;
+        ShowDurations::OrNot showDurations() const override;
+        RunTests::InWhatOrder runOrder() const override;
+        unsigned int rngSeed() const override;
+        UseColour::YesOrNo useColour() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+        bool benchmarkNoAnalysis() const override;
+        int benchmarkSamples() const override;
+        double benchmarkConfidenceInterval() const override;
+        unsigned int benchmarkResamples() const override;
+
+    private:
+
+        IStream const* openStream();
+        ConfigData m_data;
+
+        std::unique_ptr<IStream const> m_stream;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_estimate.hpp
+
+ // Statistics estimates
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct Estimate {
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
+            double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate.hpp
+// start catch_outlier_classification.hpp
+
+// Outlier information
+
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
+
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_outlier_classification.hpp
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+#include <algorithm>
+
+namespace Catch {
+
+    struct ReporterConfig {
+        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+        std::ostream& stream() const;
+        IConfigPtr fullConfig() const;
+
+    private:
+        std::ostream* m_stream;
+        IConfigPtr m_fullConfig;
+    };
+
+    struct ReporterPreferences {
+        bool shouldRedirectStdOut = false;
+        bool shouldReportAllAssertions = false;
+    };
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name );
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount );
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+        virtual ~AssertionStats();
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+        virtual ~SectionStats();
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting );
+
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+        virtual ~TestCaseStats();
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+        TestGroupStats( GroupInfo const& _groupInfo );
+
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+        virtual ~TestGroupStats();
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+        virtual ~TestRunStats();
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    template <class Duration>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Duration> samples;
+        Benchmark::Estimate<Duration> mean;
+        Benchmark::Estimate<Duration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+
+        template <typename Duration2>
+        operator BenchmarkStats<Duration2>() const {
+            std::vector<Duration2> samples2;
+            samples2.reserve(samples.size());
+            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+            return {
+                info,
+                std::move(samples2),
+                mean,
+                standardDeviation,
+                outliers,
+                outlierVariance,
+            };
+        }
+    };
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IStreamingReporter {
+        virtual ~IStreamingReporter() = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+        // static std::set<Verbosity> getSupportedVerbosities()
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void reportInvalidArguments(std::string const&) {}
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& ) {}
+        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
+        virtual void benchmarkFailed( std::string const& ) {}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        // Default empty implementation provided
+        virtual void fatalErrorEncountered( StringRef name );
+
+        virtual bool isMulti() const;
+    };
+    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+    struct IReporterFactory {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IReporterRegistry {
+        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+        using Listeners = std::vector<IReporterFactoryPtr>;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result);
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    std::string serializeFilters( std::vector<std::string> const& container );
+
+    template<typename DerivedT>
+    struct StreamingReporterBase : IStreamingReporter {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        ~StreamingReporterBase() override = default;
+
+        void noMatchingTestCases(std::string const&) override {}
+
+        void reportInvalidArguments(std::string const&) override {}
+
+        void testRunStarting(TestRunInfo const& _testRunInfo) override {
+            currentTestRunInfo = _testRunInfo;
+        }
+
+        void testGroupStarting(GroupInfo const& _groupInfo) override {
+            currentGroupInfo = _groupInfo;
+        }
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = _testInfo;
+        }
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo.reset();
+        }
+        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+            currentGroupInfo.reset();
+        }
+        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<typename DerivedT>
+    struct CumulativeReporterBase : IStreamingReporter {
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+            virtual ~SectionNode() = default;
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == (std::shared_ptr<SectionNode> const& other) const {
+                return operator==(*other);
+            }
+
+            SectionStats stats;
+            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+            using Assertions = std::vector<AssertionStats>;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() (std::shared_ptr<SectionNode> const& node) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+            void operator=(BySectionInfo const&) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+        ~CumulativeReporterBase() override = default;
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        void testRunStarting( TestRunInfo const& ) override {}
+        void testGroupStarting( GroupInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            std::shared_ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                auto it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = std::make_shared<SectionNode>( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = std::move(node);
+        }
+
+        void assertionStarting(AssertionInfo const&) override {}
+
+        bool assertionEnded(AssertionStats const& assertionStats) override {
+            assert(!m_sectionStack.empty());
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back(assertionStats);
+            return true;
+        }
+        void sectionEnded(SectionStats const& sectionStats) override {
+            assert(!m_sectionStack.empty());
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& testCaseStats) override {
+            auto node = std::make_shared<TestCaseNode>(testCaseStats);
+            assert(m_sectionStack.size() == 0);
+            node->children.push_back(m_rootSection);
+            m_testCases.push_back(node);
+            m_rootSection.reset();
+
+            assert(m_deepestSection);
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        void testGroupEnded(TestGroupStats const& testGroupStats) override {
+            auto node = std::make_shared<TestGroupNode>(testGroupStats);
+            node->children.swap(m_testCases);
+            m_testGroups.push_back(node);
+        }
+        void testRunEnded(TestRunStats const& testRunStats) override {
+            auto node = std::make_shared<TestRunNode>(testRunStats);
+            node->children.swap(m_testGroups);
+            m_testRuns.push_back(node);
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+        std::shared_ptr<SectionNode> m_rootSection;
+        std::shared_ptr<SectionNode> m_deepestSection;
+        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+        TestEventListenerBase( ReporterConfig const& _config );
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+        void assertionStarting(AssertionInfo const&) override;
+        bool assertionEnded(AssertionStats const&) override;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour&& other ) noexcept;
+        Colour& operator=( Colour&& other ) noexcept;
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved = false;
+    };
+
+    std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+
+            std::string getDescription() const override {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        explicit ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+            std::string getDescription() const override {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
+        }
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    // Fwd decls
+    struct SummaryColumn;
+    class TablePrinter;
+
+    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+        std::unique_ptr<TablePrinter> m_tablePrinter;
+
+        ConsoleReporter(ReporterConfig const& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats<> const& stats) override;
+        void benchmarkFailed(std::string const& error) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+        void testRunStarting(TestRunInfo const& _testRunInfo) override;
+    private:
+
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void lazyPrintGroupInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotals(Totals const& totals);
+        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+        void printTotalsDivider(Totals const& totals);
+        void printSummaryDivider();
+        void printTestFilters();
+
+    private:
+        bool m_headerPrinted = false;
+    };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
+
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+    enum class XmlFormatting {
+        None = 0x00,
+        Indent = 0x01,
+        Newline = 0x02,
+    };
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
+
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+            ~ScopedElement();
+
+            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+            XmlFormatting m_fmt;
+        };
+
+        XmlWriter( std::ostream& os = Catch::cout() );
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        void writeStylesheetRef( std::string const& url );
+
+        XmlWriter& writeBlankLine();
+
+        void ensureTagClosed();
+
+    private:
+
+        void applyFormatting(XmlFormatting fmt);
+
+        void writeDeclaration();
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+// end catch_xmlwriter.h
+namespace Catch {
+
+    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+    public:
+        JunitReporter(ReporterConfig const& _config);
+
+        ~JunitReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& /*spec*/) override;
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEndedCumulative() override;
+
+        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection(std::string const& className,
+                          std::string const& rootName,
+                          SectionNode const& sectionNode);
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase<XmlReporter> {
+    public:
+        XmlReporter(ReporterConfig const& _config);
+
+        ~XmlReporter() override;
+
+        static std::string getDescription();
+
+        virtual std::string getStylesheetRef() const;
+
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+    public: // StreamingReporterBase
+
+        void noMatchingTestCases(std::string const& s) override;
+
+        void testRunStarting(TestRunInfo const& testInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionEnded(SectionStats const& sectionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEnded(TestRunStats const& testRunStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const&) override;
+        void benchmarkEnded(BenchmarkStats<> const&) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_xml.h
+
+// end catch_external_interfaces.h
+#endif
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_benchmarking_all.hpp
+
+// A proxy header that includes all of the benchmarking headers to allow
+// concise include of the benchmarking features. You should prefer the
+// individual includes in standard use.
+
+// start catch_benchmark.hpp
+
+ // Benchmark
+
+// start catch_chronometer.hpp
+
+// User-facing chronometer
+
+
+// start catch_clock.hpp
+
+// Clocks
+
+
+#include <chrono>
+#include <ratio>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
+
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
+
+        using default_clock = std::chrono::steady_clock;
+
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
+
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_clock.hpp
+// start catch_optimizer.hpp
+
+ // Hinting the optimizer
+
+
+#if defined(_MSC_VER)
+#   include <atomic> // atomic_thread_fence
+#endif
+
+namespace Catch {
+    namespace Benchmark {
+#if defined(__GNUC__) || defined(__clang__)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            asm volatile("" : : "g"(p) : "memory");
+        }
+        inline void keep_memory() {
+            asm volatile("" : : : "memory");
+        }
+
+        namespace Detail {
+            inline void optimizer_barrier() { keep_memory(); }
+        } // namespace Detail
+#elif defined(_MSC_VER)
+
+#pragma optimize("", off)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            // thanks @milleniumbug
+            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
+        }
+        // TODO equivalent keep_memory()
+#pragma optimize("", on)
+
+        namespace Detail {
+            inline void optimizer_barrier() {
+                std::atomic_thread_fence(std::memory_order_seq_cst);
+            }
+        } // namespace Detail
+
+#endif
+
+        template <typename T>
+        inline void deoptimize_value(T&& x) {
+            keep_memory(&x);
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
+            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
+            std::forward<Fn>(fn) (std::forward<Args...>(args...));
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_optimizer.hpp
+// start catch_complete_invoke.hpp
+
+// Invoke with a special case for void
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                    return {};
+                }
+            };
+            template <typename Sig>
+            using ResultOf_t = typename std::result_of<Sig>::type;
+
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<ResultOf_t<Fun(Args...)>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<ResultOf_t<Fun(Args...)>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
+            }
+
+            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
+        } // namespace Detail
+
+        template <typename Fun>
+        Detail::CompleteType_t<Detail::ResultOf_t<Fun()>> user_code(Fun&& fun) {
+            CATCH_TRY{
+                return Detail::complete_invoke(std::forward<Fun>(fun));
+            } CATCH_CATCH_ALL{
+                getResultCapture().benchmarkFailed(translateActiveException());
+                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
+            }
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_complete_invoke.hpp
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct ChronometerConcept {
+                virtual void start() = 0;
+                virtual void finish() = 0;
+                virtual ~ChronometerConcept() = default;
+            };
+            template <typename Clock>
+            struct ChronometerModel final : public ChronometerConcept {
+                void start() override { started = Clock::now(); }
+                void finish() override { finished = Clock::now(); }
+
+                ClockDuration<Clock> elapsed() const { return finished - started; }
+
+                TimePoint<Clock> started;
+                TimePoint<Clock> finished;
+            };
+        } // namespace Detail
+
+        struct Chronometer {
+        public:
+            template <typename Fun>
+            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
+
+            int runs() const { return k; }
+
+            Chronometer(Detail::ChronometerConcept& meter, int k)
+                : impl(&meter)
+                , k(k) {}
+
+        private:
+            template <typename Fun>
+            void measure(Fun&& fun, std::false_type) {
+                measure([&fun](int) { return fun(); }, std::true_type());
+            }
+
+            template <typename Fun>
+            void measure(Fun&& fun, std::true_type) {
+                Detail::optimizer_barrier();
+                impl->start();
+                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
+                impl->finish();
+                Detail::optimizer_barrier();
+            }
+
+            Detail::ChronometerConcept* impl;
+            int k;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_chronometer.hpp
+// start catch_environment.hpp
+
+// Environment information
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct EnvironmentEstimate {
+            Duration mean;
+            OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
+            }
+        };
+        template <typename Clock>
+        struct Environment {
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_environment.hpp
+// start catch_execution_plan.hpp
+
+ // Execution plan
+
+
+// start catch_benchmark_function.hpp
+
+ // Dumb std::function implementation for consistent call overhead
+
+
+#include <cassert>
+#include <type_traits>
+#include <utility>
+#include <memory>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            using Decay = typename std::decay<T>::type;
+            template <typename T, typename U>
+            struct is_related
+                : std::is_same<Decay<T>, Decay<U>> {};
+
+            /// We need to reinvent std::function because every piece of code that might add overhead
+            /// in a measurement context needs to have consistent performance characteristics so that we
+            /// can account for it in the measurement.
+            /// Implementations of std::function with optimizations that aren't always applicable, like
+            /// small buffer optimizations, are not uncommon.
+            /// This is effectively an implementation of std::function without any such optimizations;
+            /// it may be slow, but it is consistently slow.
+            struct BenchmarkFunction {
+            private:
+                struct callable {
+                    virtual void call(Chronometer meter) const = 0;
+                    virtual callable* clone() const = 0;
+                    virtual ~callable() = default;
+                };
+                template <typename Fun>
+                struct model : public callable {
+                    model(Fun&& fun) : fun(std::move(fun)) {}
+                    model(Fun const& fun) : fun(fun) {}
+
+                    model<Fun>* clone() const override { return new model<Fun>(*this); }
+
+                    void call(Chronometer meter) const override {
+                        call(meter, is_callable<Fun(Chronometer)>());
+                    }
+                    void call(Chronometer meter, std::true_type) const {
+                        fun(meter);
+                    }
+                    void call(Chronometer meter, std::false_type) const {
+                        meter.measure(fun);
+                    }
+
+                    Fun fun;
+                };
+
+                struct do_nothing { void operator()() const {} };
+
+                template <typename T>
+                BenchmarkFunction(model<T>* c) : f(c) {}
+
+            public:
+                BenchmarkFunction()
+                    : f(new model<do_nothing>{ {} }) {}
+
+                template <typename Fun,
+                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
+                    BenchmarkFunction(Fun&& fun)
+                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
+
+                BenchmarkFunction(BenchmarkFunction&& that)
+                    : f(std::move(that.f)) {}
+
+                BenchmarkFunction(BenchmarkFunction const& that)
+                    : f(that.f->clone()) {}
+
+                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
+                    f = std::move(that.f);
+                    return *this;
+                }
+
+                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
+                    f.reset(that.f->clone());
+                    return *this;
+                }
+
+                void operator()(Chronometer meter) const { f->call(meter); }
+
+            private:
+                std::unique_ptr<callable> f;
+            };
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_benchmark_function.hpp
+// start catch_repeat.hpp
+
+// repeat algorithm
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Fun>
+            struct repeater {
+                void operator()(int k) const {
+                    for (int i = 0; i < k; ++i) {
+                        fun();
+                    }
+                }
+                Fun fun;
+            };
+            template <typename Fun>
+            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
+                return { std::forward<Fun>(fun) };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_repeat.hpp
+// start catch_run_for_at_least.hpp
+
+// Run a function for a minimum amount of time
+
+
+// start catch_measure.hpp
+
+// Measure
+
+
+// start catch_timing.hpp
+
+// Timing
+
+
+#include <tuple>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration, typename Result>
+        struct Timing {
+            Duration elapsed;
+            Result result;
+            int iterations;
+        };
+        template <typename Clock, typename Sig>
+        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<Detail::ResultOf_t<Sig>>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_timing.hpp
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun, typename... Args>
+            TimingOf<Clock, Fun(Args...)> measure(Fun&& fun, Args&&... args) {
+                auto start = Clock::now();
+                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
+                auto end = Clock::now();
+                auto delta = end - start;
+                return { delta, std::forward<decltype(r)>(r), 1 };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_measure.hpp
+#include <utility>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun(int)> measure_one(Fun&& fun, int iters, std::false_type) {
+                return Detail::measure<Clock>(fun, iters);
+            }
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun(Chronometer)> measure_one(Fun&& fun, int iters, std::true_type) {
+                Detail::ChronometerModel<Clock> meter;
+                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
+
+                return { meter.elapsed(), std::move(result), iters };
+            }
+
+            template <typename Clock, typename Fun>
+            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
+
+            struct optimized_away_error : std::exception {
+                const char* what() const noexcept override {
+                    return "could not measure benchmark, maybe it was optimized away";
+                }
+            };
+
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun(run_for_at_least_argument_t<Clock, Fun>)> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
+                auto iters = seed;
+                while (iters < (1 << 30)) {
+                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
+
+                    if (Timing.elapsed >= how_long) {
+                        return { Timing.elapsed, std::move(Timing.result), iters };
+                    }
+                    iters *= 2;
+                }
+                throw optimized_away_error{};
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_run_for_at_least.hpp
+#include <algorithm>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct ExecutionPlan {
+            int iterations_per_sample;
+            Duration estimated_duration;
+            Detail::BenchmarkFunction benchmark;
+            Duration warmup_time;
+            int warmup_iterations;
+
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }
+
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                    Detail::ChronometerModel<Clock> model;
+                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    auto sample_time = model.elapsed() - env.clock_cost.mean;
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
+                return times;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_execution_plan.hpp
+// start catch_estimate_clock.hpp
+
+ // Environment measurement
+
+
+// start catch_stats.hpp
+
+// Statistical analysis tools
+
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+#include <numeric>
+#include <tuple>
+#include <cmath>
+#include <utility>
+#include <cstddef>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            using sample = std::vector<double>;
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
+
+            template <typename Iterator>
+            OutlierClassification classify_outliers(Iterator first, Iterator last) {
+                std::vector<double> copy(first, last);
+
+                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
+                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
+                auto iqr = q3 - q1;
+                auto los = q1 - (iqr * 3.);
+                auto lom = q1 - (iqr * 1.5);
+                auto him = q3 + (iqr * 1.5);
+                auto his = q3 + (iqr * 3.);
+
+                OutlierClassification o;
+                for (; first != last; ++first) {
+                    auto&& t = *first;
+                    if (t < los) ++o.low_severe;
+                    else if (t < lom) ++o.low_mild;
+                    else if (t > his) ++o.high_severe;
+                    else if (t > him) ++o.high_mild;
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            template <typename Iterator>
+            double mean(Iterator first, Iterator last) {
+                auto count = last - first;
+                double sum = std::accumulate(first, last, 0.);
+                return sum / count;
+            }
+
+            template <typename URng, typename Iterator, typename Estimator>
+            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
+                auto n = last - first;
+                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
+
+                sample out;
+                out.reserve(resamples);
+                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+                    std::vector<double> resampled;
+                    resampled.reserve(n);
+                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
+                    return estimator(resampled.begin(), resampled.end());
+                });
+                std::sort(out.begin(), out.end());
+                return out;
+            }
+
+            template <typename Estimator, typename Iterator>
+            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
+                auto n = last - first;
+                auto second = std::next(first);
+                sample results;
+                results.reserve(n);
+
+                for (auto it = first; it != last; ++it) {
+                    std::iter_swap(it, first);
+                    results.push_back(estimator(second, last));
+                }
+
+                return results;
+            }
+
+            inline double normal_cdf(double x) {
+                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
+            }
+
+            double erfc_inv(double x);
+
+            double normal_quantile(double p);
+
+            template <typename Iterator, typename Estimator>
+            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
+                auto n_samples = last - first;
+
+                double point = estimator(first, last);
+                // Degenerate case with a single sample
+                if (n_samples == 1) return { point, point, point, confidence_level };
+
+                sample jack = jackknife(estimator, first, last);
+                double jack_mean = mean(jack.begin(), jack.end());
+                double sum_squares, sum_cubes;
+                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
+                    auto d = jack_mean - x;
+                    auto d2 = d * d;
+                    auto d3 = d2 * d;
+                    return { sqcb.first + d2, sqcb.second + d3 };
+                });
+
+                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
+                int n = static_cast<int>(resample.size());
+                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
+                // degenerate case with uniform samples
+                if (prob_n == 0) return { point, point, point, confidence_level };
+
+                double bias = normal_quantile(prob_n);
+                double z1 = normal_quantile((1. - confidence_level) / 2.);
+
+                auto cumn = [n](double x) -> int {
+                    return std::lround(normal_cdf(x) * n); };
+                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a(b1);
+                double a2 = a(b2);
+                auto lo = std::max(cumn(a1), 0);
+                auto hi = std::min(cumn(a2), n - 1);
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
+
+            struct bootstrap_analysis {
+                Estimate<double> mean;
+                Estimate<double> standard_deviation;
+                double outlier_variance;
+            };
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_stats.hpp
+#include <algorithm>
+#include <iterator>
+#include <tuple>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock>
+            std::vector<double> resolution(int k) {
+                std::vector<TimePoint<Clock>> times;
+                times.reserve(k + 1);
+                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+
+                std::vector<double> deltas;
+                deltas.reserve(k);
+                std::transform(std::next(times.begin()), times.end(), times.begin(),
+                    std::back_inserter(deltas),
+                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+
+                return deltas;
+            }
+
+            const auto warmup_iterations = 10000;
+            const auto warmup_time = std::chrono::milliseconds(100);
+            const auto minimum_ticks = 1000;
+            const auto warmup_seed = 10000;
+            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            const auto clock_cost_estimation_tick_limit = 100000;
+            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            const auto clock_cost_estimation_iterations = 10000;
+
+            template <typename Clock>
+            int warmup() {
+                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                    .iterations;
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+                    .result;
+                return {
+                    FloatDuration<Clock>(mean(r.begin(), r.end())),
+                    classify_outliers(r.begin(), r.end()),
+                };
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+                auto time_limit = std::min(resolution * clock_cost_estimation_tick_limit, FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                auto time_clock = [](int k) {
+                    return Detail::measure<Clock>([k] {
+                        for (int i = 0; i < k; ++i) {
+                            volatile auto ignored = Clock::now();
+                            (void)ignored;
+                        }
+                    }).elapsed;
+                };
+                time_clock(1);
+                int iters = clock_cost_estimation_iterations;
+                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                std::vector<double> times;
+                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
+                times.reserve(nsamples);
+                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
+                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
+                });
+                return {
+                    FloatDuration<Clock>(mean(times.begin(), times.end())),
+                    classify_outliers(times.begin(), times.end()),
+                };
+            }
+
+            template <typename Clock>
+            Environment<FloatDuration<Clock>> measure_environment() {
+                static Environment<FloatDuration<Clock>>* env = nullptr;
+                if (env) {
+                    return *env;
+                }
+
+                auto iters = Detail::warmup<Clock>();
+                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
+                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
+
+                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
+                return *env;
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate_clock.hpp
+// start catch_analyse.hpp
+
+ // Run and analyse one benchmark
+
+
+// start catch_sample_analysis.hpp
+
+// Benchmark results
+
+
+#include <algorithm>
+#include <vector>
+#include <string>
+#include <iterator>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct SampleAnalysis {
+            std::vector<Duration> samples;
+            Estimate<Duration> mean;
+            Estimate<Duration> standard_deviation;
+            OutlierClassification outliers;
+            double outlier_variance;
+
+            template <typename Duration2>
+            operator SampleAnalysis<Duration2>() const {
+                std::vector<Duration2> samples2;
+                samples2.reserve(samples.size());
+                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+                return {
+                    std::move(samples2),
+                    mean,
+                    standard_deviation,
+                    outliers,
+                    outlier_variance,
+                };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_sample_analysis.hpp
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Duration, typename Iterator>
+            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(last - first);
+                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<Duration> {
+                            Duration(e.point),
+                                Duration(e.lower_bound),
+                                Duration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<Duration> samples2;
+                    samples2.reserve(samples.size());
+                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
+                    return {
+                        std::move(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<Duration> samples;
+                    samples.reserve(last - first);
+
+                    Duration mean = Duration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(Duration(*it));
+                        mean += Duration(*it);
+                    }
+                    mean /= i;
+
+                    return {
+                        std::move(samples),
+                        Estimate<Duration>{mean, mean, mean, 0.0},
+                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_analyse.hpp
+#include <algorithm>
+#include <functional>
+#include <string>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        struct Benchmark {
+            Benchmark(std::string &&name)
+                : name(std::move(name)) {}
+
+            template <class FUN>
+            Benchmark(std::string &&name, FUN &&func)
+                : fun(std::move(func)), name(std::move(name)) {}
+
+            template <typename Clock>
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
+                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(Detail::warmup_time));
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(Detail::warmup_time), Detail::warmup_iterations };
+            }
+
+            template <typename Clock = default_clock>
+            void run() {
+                IConfigPtr cfg = getCurrentContext().getConfig();
+
+                auto env = Detail::measure_environment<Clock>();
+
+                getResultCapture().benchmarkPreparing(name);
+                CATCH_TRY{
+                    auto plan = user_code([&] {
+                        return prepare<Clock>(*cfg, env);
+                    });
+
+                    BenchmarkInfo info {
+                        name,
+                        plan.estimated_duration.count(),
+                        plan.iterations_per_sample,
+                        cfg->benchmarkSamples(),
+                        cfg->benchmarkResamples(),
+                        env.clock_resolution.mean.count(),
+                        env.clock_cost.mean.count()
+                    };
+
+                    getResultCapture().benchmarkStarting(info);
+
+                    auto samples = user_code([&] {
+                        return plan.template run<Clock>(*cfg, env);
+                    });
+
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    getResultCapture().benchmarkEnded(stats);
+
+                } CATCH_CATCH_ALL{
+                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
+                        std::rethrow_exception(std::current_exception());
+                }
+            }
+
+            // sets lambda to be used in fun *and* executes benchmark!
+            template <typename Fun,
+                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
+                Benchmark & operator=(Fun func) {
+                fun = Detail::BenchmarkFunction(func);
+                run();
+                return *this;
+            }
+
+            explicit operator bool() {
+                return true;
+            }
+
+        private:
+            Detail::BenchmarkFunction fun;
+            std::string name;
+        };
+    }
+} // namespace Catch
+
+#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
+#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
+
+#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&](int benchmarkIndex)
+
+#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&]
+
+// end catch_benchmark.hpp
+// start catch_constructor.hpp
+
+// Constructor and destructor helpers
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Detail {
+        template <typename T, bool Destruct>
+        struct ObjectStorage
+        {
+            using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
+
+            ObjectStorage() : data() {}
+
+            ObjectStorage(const ObjectStorage& other)
+            {
+                new(&data) T(other.stored_object());
+            }
+
+            ObjectStorage(ObjectStorage&& other)
+            {
+                new(&data) T(std::move(other.stored_object()));
+            }
+
+            ~ObjectStorage() { destruct_on_exit<T>(); }
+
+            template <typename... Args>
+            void construct(Args&&... args)
+            {
+                new (&data) T(std::forward<Args>(args)...);
+            }
+
+            template <bool AllowManualDestruction = !Destruct>
+            typename std::enable_if<AllowManualDestruction>::type destruct()
+            {
+                stored_object().~T();
+            }
+
+        private:
+            // If this is a constructor benchmark, destruct the underlying object
+            template <typename U>
+            void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
+            // Otherwise, don't
+            template <typename U>
+            void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
+
+            T& stored_object()
+            {
+                return *static_cast<T*>(static_cast<void*>(&data));
+            }
+
+            TStorage data;
+        };
+    }
+
+    template <typename T>
+    using storage_for = Detail::ObjectStorage<T, true>;
+
+    template <typename T>
+    using destructable_object = Detail::ObjectStorage<T, false>;
+}
+
+// end catch_constructor.hpp
+// end catch_benchmarking_all.hpp
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+#ifdef CATCH_IMPL
+// start catch_impl.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// Keep these here for external reporters
+// start catch_test_case_tracker.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+    };
+
+    struct ITracker;
+
+    using ITrackerPtr = std::shared_ptr<ITracker>;
+
+    struct ITracker {
+        virtual ~ITracker();
+
+        // static queries
+        virtual NameAndLocation const& nameAndLocation() const = 0;
+
+        // dynamic queries
+        virtual bool isComplete() const = 0; // Successfully completed or failed
+        virtual bool isSuccessfullyCompleted() const = 0;
+        virtual bool isOpen() const = 0; // Started but not complete
+        virtual bool hasChildren() const = 0;
+
+        virtual ITracker& parent() = 0;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        virtual void markAsNeedingAnotherRun() = 0;
+
+        virtual void addChild( ITrackerPtr const& child ) = 0;
+        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
+        virtual void openChild() = 0;
+
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isGeneratorTracker() const = 0;
+    };
+
+    class TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        ITrackerPtr m_rootTracker;
+        ITracker* m_currentTracker = nullptr;
+        RunState m_runState = NotStarted;
+
+    public:
+
+        ITracker& startRun();
+        void endRun();
+
+        void startCycle();
+        void completeCycle();
+
+        bool completedCycle() const;
+        ITracker& currentTracker();
+        void setCurrentTracker( ITracker* tracker );
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+
+        using Children = std::vector<ITrackerPtr>;
+        NameAndLocation m_nameAndLocation;
+        TrackerContext& m_ctx;
+        ITracker* m_parent;
+        Children m_children;
+        CycleState m_runState = NotStarted;
+
+    public:
+        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        NameAndLocation const& nameAndLocation() const override;
+        bool isComplete() const override;
+        bool isSuccessfullyCompleted() const override;
+        bool isOpen() const override;
+        bool hasChildren() const override;
+
+        void addChild( ITrackerPtr const& child ) override;
+
+        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
+        ITracker& parent() override;
+
+        void openChild() override;
+
+        bool isSectionTracker() const override;
+        bool isGeneratorTracker() const override;
+
+        void open();
+
+        void close() override;
+        void fail() override;
+        void markAsNeedingAnotherRun() override;
+
+    private:
+        void moveToParent();
+        void moveToThis();
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<std::string> m_filters;
+        std::string m_trimmed_name;
+    public:
+        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isSectionTracker() const override;
+
+        bool isComplete() const override;
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
+
+        void tryOpen();
+
+        void addInitialFilters( std::vector<std::string> const& filters );
+        void addNextFilters( std::vector<std::string> const& filters );
+    };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+// end catch_test_case_tracker.h
+
+// start catch_leak_detector.h
+
+namespace Catch {
+
+    struct LeakDetector {
+        LeakDetector();
+        ~LeakDetector();
+    };
+
+}
+// end catch_leak_detector.h
+// Cpp files will be included in the single-header file here
+// start catch_stats.cpp
+
+// Statistical analysis tools
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+
+#include <cassert>
+#include <random>
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+#include <future>
+#endif
+
+namespace {
+    double erf_inv(double x) {
+        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
+        double w, p;
+
+        w = -log((1.0 - x) * (1.0 + x));
+
+        if (w < 6.250000) {
+            w = w - 3.125000;
+            p = -3.6444120640178196996e-21;
+            p = -1.685059138182016589e-19 + p * w;
+            p = 1.2858480715256400167e-18 + p * w;
+            p = 1.115787767802518096e-17 + p * w;
+            p = -1.333171662854620906e-16 + p * w;
+            p = 2.0972767875968561637e-17 + p * w;
+            p = 6.6376381343583238325e-15 + p * w;
+            p = -4.0545662729752068639e-14 + p * w;
+            p = -8.1519341976054721522e-14 + p * w;
+            p = 2.6335093153082322977e-12 + p * w;
+            p = -1.2975133253453532498e-11 + p * w;
+            p = -5.4154120542946279317e-11 + p * w;
+            p = 1.051212273321532285e-09 + p * w;
+            p = -4.1126339803469836976e-09 + p * w;
+            p = -2.9070369957882005086e-08 + p * w;
+            p = 4.2347877827932403518e-07 + p * w;
+            p = -1.3654692000834678645e-06 + p * w;
+            p = -1.3882523362786468719e-05 + p * w;
+            p = 0.0001867342080340571352 + p * w;
+            p = -0.00074070253416626697512 + p * w;
+            p = -0.0060336708714301490533 + p * w;
+            p = 0.24015818242558961693 + p * w;
+            p = 1.6536545626831027356 + p * w;
+        } else if (w < 16.000000) {
+            w = sqrt(w) - 3.250000;
+            p = 2.2137376921775787049e-09;
+            p = 9.0756561938885390979e-08 + p * w;
+            p = -2.7517406297064545428e-07 + p * w;
+            p = 1.8239629214389227755e-08 + p * w;
+            p = 1.5027403968909827627e-06 + p * w;
+            p = -4.013867526981545969e-06 + p * w;
+            p = 2.9234449089955446044e-06 + p * w;
+            p = 1.2475304481671778723e-05 + p * w;
+            p = -4.7318229009055733981e-05 + p * w;
+            p = 6.8284851459573175448e-05 + p * w;
+            p = 2.4031110387097893999e-05 + p * w;
+            p = -0.0003550375203628474796 + p * w;
+            p = 0.00095328937973738049703 + p * w;
+            p = -0.0016882755560235047313 + p * w;
+            p = 0.0024914420961078508066 + p * w;
+            p = -0.0037512085075692412107 + p * w;
+            p = 0.005370914553590063617 + p * w;
+            p = 1.0052589676941592334 + p * w;
+            p = 3.0838856104922207635 + p * w;
+        } else {
+            w = sqrt(w) - 5.000000;
+            p = -2.7109920616438573243e-11;
+            p = -2.5556418169965252055e-10 + p * w;
+            p = 1.5076572693500548083e-09 + p * w;
+            p = -3.7894654401267369937e-09 + p * w;
+            p = 7.6157012080783393804e-09 + p * w;
+            p = -1.4960026627149240478e-08 + p * w;
+            p = 2.9147953450901080826e-08 + p * w;
+            p = -6.7711997758452339498e-08 + p * w;
+            p = 2.2900482228026654717e-07 + p * w;
+            p = -9.9298272942317002539e-07 + p * w;
+            p = 4.5260625972231537039e-06 + p * w;
+            p = -1.9681778105531670567e-05 + p * w;
+            p = 7.5995277030017761139e-05 + p * w;
+            p = -0.00021503011930044477347 + p * w;
+            p = -0.00013871931833623122026 + p * w;
+            p = 1.0103004648645343977 + p * w;
+            p = 4.8499064014085844221 + p * w;
+        }
+        return p * x;
+    }
+
+    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
+        auto m = Catch::Benchmark::Detail::mean(first, last);
+        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
+            double diff = b - m;
+            return a + diff * diff;
+            }) / (last - first);
+            return std::sqrt(variance);
+    }
+
+}
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                auto count = last - first;
+                double idx = (count - 1) * k / static_cast<double>(q);
+                int j = static_cast<int>(idx);
+                double g = idx - j;
+                std::nth_element(first, first + j, last);
+                auto xj = first[j];
+                if (g == 0) return xj;
+
+                auto xj1 = *std::min_element(first + (j + 1), last);
+                return xj + g * (xj1 - xj);
+            }
+
+            double erfc_inv(double x) {
+                return erf_inv(1.0 - x);
+            }
+
+            double normal_quantile(double p) {
+                static const double ROOT_TWO = std::sqrt(2.0);
+
+                double result = 0.0;
+                assert(p >= 0 && p <= 1);
+                if (p < 0 || p > 1) {
+                    return result;
+                }
+
+                result = -erfc_inv(2.0 * p);
+                // result *= normal distribution standard deviation (1.0) * sqrt(2)
+                result *= /*sd * */ ROOT_TWO;
+                // result += normal disttribution mean (0)
+                return result;
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
+                double sb = stddev.point;
+                double mn = mean.point / n;
+                double mg_min = mn / 2.;
+                double sg = std::min(mg_min / 4., sb / std::sqrt(n));
+                double sg2 = sg * sg;
+                double sb2 = sb * sb;
+
+                auto c_max = [n, mn, sb2, sg2](double x) -> double {
+                    double k = mn - x;
+                    double d = k * k;
+                    double nd = n * d;
+                    double k0 = -n * nd;
+                    double k1 = sb2 - n * sg2 + nd;
+                    double det = k1 * k1 - 4 * sg2 * k0;
+                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
+                };
+
+                auto var_out = [n, sb2, sg2](double c) {
+                    double nc = n - c;
+                    return (nc / n) * (sb2 - nc * sg2);
+                };
+
+                return std::min(var_out(1), var_out(std::min(c_max(0.), c_max(mg_min)))) / sb2;
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+                static std::random_device entropy;
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+
+                auto mean = &Detail::mean<std::vector<double>::iterator>;
+                auto stddev = &standard_deviation;
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    return std::async(std::launch::async, [=] {
+                        std::mt19937 rng(seed);
+                        auto resampled = resample(rng, n_resamples, first, last, f);
+                        return bootstrap(confidence_level, first, last, resampled, f);
+                    });
+                };
+
+                auto mean_future = Estimate(mean);
+                auto stddev_future = Estimate(stddev);
+
+                auto mean_estimate = mean_future.get();
+                auto stddev_estimate = stddev_future.get();
+#else
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    std::mt19937 rng(seed);
+                    auto resampled = resample(rng, n_resamples, first, last, f);
+                    return bootstrap(confidence_level, first, last, resampled, f);
+                };
+
+                auto mean_estimate = Estimate(mean);
+                auto stddev_estimate = Estimate(stddev);
+#endif // CATCH_USE_ASYNC
+
+                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
+
+                return { mean_estimate, stddev_estimate, outlier_variance };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+// end catch_stats.cpp
+// start catch_approx.cpp
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+namespace Detail {
+
+    Approx::Approx ( double value )
+    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+        m_margin( 0.0 ),
+        m_scale( 0.0 ),
+        m_value( value )
+    {}
+
+    Approx Approx::custom() {
+        return Approx( 0 );
+    }
+
+    Approx Approx::operator-() const {
+        auto temp(*this);
+        temp.m_value = -temp.m_value;
+        return temp;
+    }
+
+    std::string Approx::toString() const {
+        ReusableStringStream rss;
+        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+        return rss.str();
+    }
+
+    bool Approx::equalityComparisonImpl(const double other) const {
+        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+        // Thanks to Richard Harris for his help refining the scaled margin value
+        return marginComparison(m_value, other, m_margin)
+            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
+    }
+
+    void Approx::setMargin(double newMargin) {
+        CATCH_ENFORCE(newMargin >= 0,
+            "Invalid Approx::margin: " << newMargin << '.'
+            << " Approx::Margin has to be non-negative.");
+        m_margin = newMargin;
+    }
+
+    void Approx::setEpsilon(double newEpsilon) {
+        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
+            "Invalid Approx::epsilon: " << newEpsilon << '.'
+            << " Approx::epsilon has to be in [0, 1]");
+        m_epsilon = newEpsilon;
+    }
+
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val) {
+        return Detail::Approx(val);
+    }
+    Detail::Approx operator "" _a(unsigned long long val) {
+        return Detail::Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+    return value.toString();
+}
+
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
+// start catch_debugger.h
+
+namespace Catch {
+    bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifdef CATCH_TRAP
+    #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+#else
+    #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+#endif
+
+// end catch_debugger.h
+// start catch_run_context.h
+
+// start catch_fatal_condition.h
+
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
+        FatalConditionHandler();
+        static void reset();
+        ~FatalConditionHandler();
+
+    private:
+        static bool isSet;
+        static ULONG guaranteeSize;
+        static PVOID exceptionHandlerHandle;
+    };
+
+} // namespace Catch
+
+#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static bool isSet;
+        static struct sigaction oldSigActions[];
+        static stack_t oldSigStack;
+        static char altStackMem[];
+
+        static void handleSignal( int sig );
+
+        FatalConditionHandler();
+        ~FatalConditionHandler();
+        static void reset();
+    };
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    struct FatalConditionHandler {
+        void reset();
+    };
+}
+
+#endif
+
+// end catch_fatal_condition.h
+#include <string>
+
+namespace Catch {
+
+    struct IMutableContext;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext : public IResultCapture, public IRunner {
+
+    public:
+        RunContext( RunContext const& ) = delete;
+        RunContext& operator =( RunContext const& ) = delete;
+
+        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
+
+        ~RunContext() override;
+
+        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
+        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
+
+        Totals runTest(TestCase const& testCase);
+
+        IConfigPtr config() const;
+        IStreamingReporter& reporter() const;
+
+    public: // IResultCapture
+
+        // Assertion handlers
+        void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) override;
+        void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) override;
+        void handleIncomplete
+                (   AssertionInfo const& info ) override;
+        void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) override;
+
+        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
+
+        void sectionEnded( SectionEndInfo const& endInfo ) override;
+        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
+
+        auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing( std::string const& name ) override;
+        void benchmarkStarting( BenchmarkInfo const& info ) override;
+        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
+        void benchmarkFailed( std::string const& error ) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void pushScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( MessageInfo const& message ) override;
+
+        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
+
+        std::string getCurrentTestName() const override;
+
+        const AssertionResult* getLastResult() const override;
+
+        void exceptionEarlyReported() override;
+
+        void handleFatalErrorCondition( StringRef message ) override;
+
+        bool lastAssertionPassed() override;
+
+        void assertionPassed() override;
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const final;
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+        void invokeActiveTestCase();
+
+        void resetAssertionInfo();
+        bool testForMissingAssertions( Counts& assertions );
+
+        void assertionEnded( AssertionResult const& result );
+        void reportExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    ITransientExpression const *expr,
+                    bool negated );
+
+        void populateReaction( AssertionReaction& reaction );
+
+    private:
+
+        void handleUnfinishedSections();
+
+        TestRunInfo m_runInfo;
+        IMutableContext& m_context;
+        TestCase const* m_activeTestCase = nullptr;
+        ITracker* m_testCaseTracker = nullptr;
+        Option<AssertionResult> m_lastResult;
+
+        IConfigPtr m_config;
+        Totals m_totals;
+        IStreamingReporterPtr m_reporter;
+        std::vector<MessageInfo> m_messages;
+        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        bool m_lastAssertionPassed = false;
+        bool m_shouldReportUnexpected = true;
+        bool m_includeSuccessfulResults;
+    };
+
+    void seedRng(IConfig const& config);
+    unsigned int rngSeed();
+} // end namespace Catch
+
+// end catch_run_context.h
+namespace Catch {
+
+    namespace {
+        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
+            expr.streamReconstructedExpression( os );
+            return os;
+        }
+    }
+
+    LazyExpression::LazyExpression( bool isNegated )
+    :   m_isNegated( isNegated )
+    {}
+
+    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
+
+    LazyExpression::operator bool() const {
+        return m_transientExpression != nullptr;
+    }
+
+    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
+        if( lazyExpr.m_isNegated )
+            os << "!";
+
+        if( lazyExpr ) {
+            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
+                os << "(" << *lazyExpr.m_transientExpression << ")";
+            else
+                os << *lazyExpr.m_transientExpression;
+        }
+        else {
+            os << "{** error - unchecked empty expression requested **}";
+        }
+        return os;
+    }
+
+    AssertionHandler::AssertionHandler
+        (   StringRef const& macroName,
+            SourceLineInfo const& lineInfo,
+            StringRef capturedExpression,
+            ResultDisposition::Flags resultDisposition )
+    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+        m_resultCapture( getResultCapture() )
+    {}
+
+    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+    }
+    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
+        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+    }
+
+    auto AssertionHandler::allowThrows() const -> bool {
+        return getCurrentContext().getConfig()->allowThrows();
+    }
+
+    void AssertionHandler::complete() {
+        setCompleted();
+        if( m_reaction.shouldDebugBreak ) {
+
+            // If you find your debugger stopping you here then go one level up on the
+            // call-stack for the code that caused it (typically a failed assertion)
+
+            // (To go back to the test and change execution, jump over the throw, next)
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+        if (m_reaction.shouldThrow) {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+            throw Catch::TestFailureException();
+#else
+            CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+        }
+    }
+    void AssertionHandler::setCompleted() {
+        m_completed = true;
+    }
+
+    void AssertionHandler::handleUnexpectedInflightException() {
+        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+    }
+
+    void AssertionHandler::handleExceptionThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+    void AssertionHandler::handleExceptionNotThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+    }
+
+    void AssertionHandler::handleThrowingCallSkipped() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    // This is the overload that takes a string and infers the Equals matcher from it
+    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
+        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
+    }
+
+} // namespace Catch
+// end catch_assertionhandler.cpp
+// start catch_assertionresult.cpp
+
+namespace Catch {
+    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+        lazyExpression(_lazyExpression),
+        resultType(_resultType) {}
+
+    std::string AssertionResultData::reconstructExpression() const {
+
+        if( reconstructedExpression.empty() ) {
+            if( lazyExpression ) {
+                ReusableStringStream rss;
+                rss << lazyExpression;
+                reconstructedExpression = rss.str();
+            }
+        }
+        return reconstructedExpression;
+    }
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+    :   m_info( info ),
+        m_resultData( data )
+    {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return !m_info.capturedExpression.empty();
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string AssertionResult::getExpression() const {
+        // Possibly overallocating by 3 characters should be basically free
+        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += "!(";
+        }
+        expr += m_info.capturedExpression;
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += ')';
+        }
+        return expr;
+    }
+
+    std::string AssertionResult::getExpressionInMacro() const {
+        std::string expr;
+        if( m_info.macroName.empty() )
+            expr = static_cast<std::string>(m_info.capturedExpression);
+        else {
+            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+            expr += m_info.macroName;
+            expr += "( ";
+            expr += m_info.capturedExpression;
+            expr += " )";
+        }
+        return expr;
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        std::string expr = m_resultData.reconstructExpression();
+        return expr.empty()
+                ? getExpression()
+                : expr;
+    }
+
+    std::string AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    StringRef AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+} // end namespace Catch
+// end catch_assertionresult.cpp
+// start catch_capture_matchers.cpp
+
+namespace Catch {
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    // This is the general overload that takes a any string matcher
+    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+    // the Equals matcher (so the header does not mention matchers)
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
+        std::string exceptionMessage = Catch::translateActiveException();
+        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
+        handler.handleExpr( expr );
+    }
+
+} // namespace Catch
+// end catch_capture_matchers.cpp
+// start catch_commandline.cpp
+
+// start catch_commandline.h
+
+// start catch_clara.h
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#endif
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// start clara.hpp
+// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See https://github.com/philsquared/Clara for more details
+
+// Clara v1.1.5
+
+
+#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+#include <optional>
+#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#endif
+#endif
+#endif
+
+// ----------- #included from clara_textflow.hpp -----------
+
+// TextFlowCpp
+//
+// A single-header library for wrapping and laying out basic text, by Phil Nash
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// This project is hosted at https://github.com/philsquared/textflowcpp
+
+
+#include <cassert>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+namespace clara {
+namespace TextFlow {
+
+inline auto isWhitespace(char c) -> bool {
+	static std::string chars = " \t\n\r";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableBefore(char c) -> bool {
+	static std::string chars = "[({<|";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableAfter(char c) -> bool {
+	static std::string chars = "])}>.,:;*+-=&/\\";
+	return chars.find(c) != std::string::npos;
+}
+
+class Columns;
+
+class Column {
+	std::vector<std::string> m_strings;
+	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+	size_t m_indent = 0;
+	size_t m_initialIndent = std::string::npos;
+
+public:
+	class iterator {
+		friend Column;
+
+		Column const& m_column;
+		size_t m_stringIndex = 0;
+		size_t m_pos = 0;
+
+		size_t m_len = 0;
+		size_t m_end = 0;
+		bool m_suffix = false;
+
+		iterator(Column const& column, size_t stringIndex)
+			: m_column(column),
+			m_stringIndex(stringIndex) {}
+
+		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+		auto isBoundary(size_t at) const -> bool {
+			assert(at > 0);
+			assert(at <= line().size());
+
+			return at == line().size() ||
+				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
+				isBreakableBefore(line()[at]) ||
+				isBreakableAfter(line()[at - 1]);
+		}
+
+		void calcLength() {
+			assert(m_stringIndex < m_column.m_strings.size());
+
+			m_suffix = false;
+			auto width = m_column.m_width - indent();
+			m_end = m_pos;
+			if (line()[m_pos] == '\n') {
+				++m_end;
+			}
+			while (m_end < line().size() && line()[m_end] != '\n')
+				++m_end;
+
+			if (m_end < m_pos + width) {
+				m_len = m_end - m_pos;
+			} else {
+				size_t len = width;
+				while (len > 0 && !isBoundary(m_pos + len))
+					--len;
+				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
+					--len;
+
+				if (len > 0) {
+					m_len = len;
+				} else {
+					m_suffix = true;
+					m_len = width - 1;
+				}
+			}
+		}
+
+		auto indent() const -> size_t {
+			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+			return initial == std::string::npos ? m_column.m_indent : initial;
+		}
+
+		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Column const& column) : m_column(column) {
+			assert(m_column.m_width > m_column.m_indent);
+			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
+			calcLength();
+			if (m_len == 0)
+				m_stringIndex++; // Empty string
+		}
+
+		auto operator *() const -> std::string {
+			assert(m_stringIndex < m_column.m_strings.size());
+			assert(m_pos <= m_end);
+			return addIndentAndSuffix(line().substr(m_pos, m_len));
+		}
+
+		auto operator ++() -> iterator& {
+			m_pos += m_len;
+			if (m_pos < line().size() && line()[m_pos] == '\n')
+				m_pos += 1;
+			else
+				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
+					++m_pos;
+
+			if (m_pos == line().size()) {
+				m_pos = 0;
+				++m_stringIndex;
+			}
+			if (m_stringIndex < m_column.m_strings.size())
+				calcLength();
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return
+				m_pos == other.m_pos &&
+				m_stringIndex == other.m_stringIndex &&
+				&m_column == &other.m_column;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return !operator==(other);
+		}
+	};
+	using const_iterator = iterator;
+
+	explicit Column(std::string const& text) { m_strings.push_back(text); }
+
+	auto width(size_t newWidth) -> Column& {
+		assert(newWidth > 0);
+		m_width = newWidth;
+		return *this;
+	}
+	auto indent(size_t newIndent) -> Column& {
+		m_indent = newIndent;
+		return *this;
+	}
+	auto initialIndent(size_t newIndent) -> Column& {
+		m_initialIndent = newIndent;
+		return *this;
+	}
+
+	auto width() const -> size_t { return m_width; }
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
+		bool first = true;
+		for (auto line : col) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto operator + (Column const& other)->Columns;
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+class Spacer : public Column {
+
+public:
+	explicit Spacer(size_t spaceWidth) : Column("") {
+		width(spaceWidth);
+	}
+};
+
+class Columns {
+	std::vector<Column> m_columns;
+
+public:
+
+	class iterator {
+		friend Columns;
+		struct EndTag {};
+
+		std::vector<Column> const& m_columns;
+		std::vector<Column::iterator> m_iterators;
+		size_t m_activeIterators;
+
+		iterator(Columns const& columns, EndTag)
+			: m_columns(columns.m_columns),
+			m_activeIterators(0) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.end());
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Columns const& columns)
+			: m_columns(columns.m_columns),
+			m_activeIterators(m_columns.size()) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.begin());
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return m_iterators == other.m_iterators;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return m_iterators != other.m_iterators;
+		}
+		auto operator *() const -> std::string {
+			std::string row, padding;
+
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				auto width = m_columns[i].width();
+				if (m_iterators[i] != m_columns[i].end()) {
+					std::string col = *m_iterators[i];
+					row += padding + col;
+					if (col.size() < width)
+						padding = std::string(width - col.size(), ' ');
+					else
+						padding = "";
+				} else {
+					padding += std::string(width, ' ');
+				}
+			}
+			return row;
+		}
+		auto operator ++() -> iterator& {
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				if (m_iterators[i] != m_columns[i].end())
+					++m_iterators[i];
+			}
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+	};
+	using const_iterator = iterator;
+
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+	auto operator += (Column const& col) -> Columns& {
+		m_columns.push_back(col);
+		return *this;
+	}
+	auto operator + (Column const& col) -> Columns {
+		Columns combined = *this;
+		combined += col;
+		return combined;
+	}
+
+	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
+
+		bool first = true;
+		for (auto line : cols) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+inline auto Column::operator + (Column const& other) -> Columns {
+	Columns cols;
+	cols += *this;
+	cols += other;
+	return cols;
+}
+}
+
+}
+}
+
+// ----------- end of #include from clara_textflow.hpp -----------
+// ........... back in clara.hpp
+
+#include <cctype>
+#include <string>
+#include <memory>
+#include <set>
+#include <algorithm>
+
+#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+namespace Catch { namespace clara {
+namespace detail {
+
+    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
+    template<typename L>
+    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+    template<typename ClassT, typename ReturnT, typename... Args>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
+        static const bool isValid = false;
+    };
+
+    template<typename ClassT, typename ReturnT, typename ArgT>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
+        static const bool isValid = true;
+        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
+        using ReturnType = ReturnT;
+    };
+
+    class TokenStream;
+
+    // Transport for raw args (copied from main args, or supplied via init list for testing)
+    class Args {
+        friend TokenStream;
+        std::string m_exeName;
+        std::vector<std::string> m_args;
+
+    public:
+        Args( int argc, char const* const* argv )
+            : m_exeName(argv[0]),
+              m_args(argv + 1, argv + argc) {}
+
+        Args( std::initializer_list<std::string> args )
+        :   m_exeName( *args.begin() ),
+            m_args( args.begin()+1, args.end() )
+        {}
+
+        auto exeName() const -> std::string {
+            return m_exeName;
+        }
+    };
+
+    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
+    // may encode an option + its argument if the : or = form is used
+    enum class TokenType {
+        Option, Argument
+    };
+    struct Token {
+        TokenType type;
+        std::string token;
+    };
+
+    inline auto isOptPrefix( char c ) -> bool {
+        return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+            || c == '/'
+#endif
+        ;
+    }
+
+    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
+    class TokenStream {
+        using Iterator = std::vector<std::string>::const_iterator;
+        Iterator it;
+        Iterator itEnd;
+        std::vector<Token> m_tokenBuffer;
+
+        void loadBuffer() {
+            m_tokenBuffer.resize( 0 );
+
+            // Skip any empty strings
+            while( it != itEnd && it->empty() )
+                ++it;
+
+            if( it != itEnd ) {
+                auto const &next = *it;
+                if( isOptPrefix( next[0] ) ) {
+                    auto delimiterPos = next.find_first_of( " :=" );
+                    if( delimiterPos != std::string::npos ) {
+                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
+                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
+                    } else {
+                        if( next[1] != '-' && next.size() > 2 ) {
+                            std::string opt = "- ";
+                            for( size_t i = 1; i < next.size(); ++i ) {
+                                opt[1] = next[i];
+                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
+                            }
+                        } else {
+                            m_tokenBuffer.push_back( { TokenType::Option, next } );
+                        }
+                    }
+                } else {
+                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
+                }
+            }
+        }
+
+    public:
+        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
+            loadBuffer();
+        }
+
+        explicit operator bool() const {
+            return !m_tokenBuffer.empty() || it != itEnd;
+        }
+
+        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
+
+        auto operator*() const -> Token {
+            assert( !m_tokenBuffer.empty() );
+            return m_tokenBuffer.front();
+        }
+
+        auto operator->() const -> Token const * {
+            assert( !m_tokenBuffer.empty() );
+            return &m_tokenBuffer.front();
+        }
+
+        auto operator++() -> TokenStream & {
+            if( m_tokenBuffer.size() >= 2 ) {
+                m_tokenBuffer.erase( m_tokenBuffer.begin() );
+            } else {
+                if( it != itEnd )
+                    ++it;
+                loadBuffer();
+            }
+            return *this;
+        }
+    };
+
+    class ResultBase {
+    public:
+        enum Type {
+            Ok, LogicError, RuntimeError
+        };
+
+    protected:
+        ResultBase( Type type ) : m_type( type ) {}
+        virtual ~ResultBase() = default;
+
+        virtual void enforceOk() const = 0;
+
+        Type m_type;
+    };
+
+    template<typename T>
+    class ResultValueBase : public ResultBase {
+    public:
+        auto value() const -> T const & {
+            enforceOk();
+            return m_value;
+        }
+
+    protected:
+        ResultValueBase( Type type ) : ResultBase( type ) {}
+
+        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+        }
+
+        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
+            new( &m_value ) T( value );
+        }
+
+        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
+            if( m_type == ResultBase::Ok )
+                m_value.~T();
+            ResultBase::operator=(other);
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+            return *this;
+        }
+
+        ~ResultValueBase() override {
+            if( m_type == Ok )
+                m_value.~T();
+        }
+
+        union {
+            T m_value;
+        };
+    };
+
+    template<>
+    class ResultValueBase<void> : public ResultBase {
+    protected:
+        using ResultBase::ResultBase;
+    };
+
+    template<typename T = void>
+    class BasicResult : public ResultValueBase<T> {
+    public:
+        template<typename U>
+        explicit BasicResult( BasicResult<U> const &other )
+        :   ResultValueBase<T>( other.type() ),
+            m_errorMessage( other.errorMessage() )
+        {
+            assert( type() != ResultBase::Ok );
+        }
+
+        template<typename U>
+        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
+        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
+        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
+        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
+
+        explicit operator bool() const { return m_type == ResultBase::Ok; }
+        auto type() const -> ResultBase::Type { return m_type; }
+        auto errorMessage() const -> std::string { return m_errorMessage; }
+
+    protected:
+        void enforceOk() const override {
+
+            // Errors shouldn't reach this point, but if they do
+            // the actual error message will be in m_errorMessage
+            assert( m_type != ResultBase::LogicError );
+            assert( m_type != ResultBase::RuntimeError );
+            if( m_type != ResultBase::Ok )
+                std::abort();
+        }
+
+        std::string m_errorMessage; // Only populated if resultType is an error
+
+        BasicResult( ResultBase::Type type, std::string const &message )
+        :   ResultValueBase<T>(type),
+            m_errorMessage(message)
+        {
+            assert( m_type != ResultBase::Ok );
+        }
+
+        using ResultValueBase<T>::ResultValueBase;
+        using ResultBase::m_type;
+    };
+
+    enum class ParseResultType {
+        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
+    };
+
+    class ParseState {
+    public:
+
+        ParseState( ParseResultType type, TokenStream const &remainingTokens )
+        : m_type(type),
+          m_remainingTokens( remainingTokens )
+        {}
+
+        auto type() const -> ParseResultType { return m_type; }
+        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
+
+    private:
+        ParseResultType m_type;
+        TokenStream m_remainingTokens;
+    };
+
+    using Result = BasicResult<void>;
+    using ParserResult = BasicResult<ParseResultType>;
+    using InternalParseResult = BasicResult<ParseState>;
+
+    struct HelpColumns {
+        std::string left;
+        std::string right;
+    };
+
+    template<typename T>
+    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
+        std::stringstream ss;
+        ss << source;
+        ss >> target;
+        if( ss.fail() )
+            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
+        else
+            return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
+        target = source;
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
+        std::string srcLC = source;
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( std::tolower(c) ); } );
+        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
+            target = true;
+        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
+            target = false;
+        else
+            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+    template<typename T>
+    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
+        T temp;
+        auto result = convertInto( source, temp );
+        if( result )
+            target = std::move(temp);
+        return result;
+    }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+    struct NonCopyable {
+        NonCopyable() = default;
+        NonCopyable( NonCopyable const & ) = delete;
+        NonCopyable( NonCopyable && ) = delete;
+        NonCopyable &operator=( NonCopyable const & ) = delete;
+        NonCopyable &operator=( NonCopyable && ) = delete;
+    };
+
+    struct BoundRef : NonCopyable {
+        virtual ~BoundRef() = default;
+        virtual auto isContainer() const -> bool { return false; }
+        virtual auto isFlag() const -> bool { return false; }
+    };
+    struct BoundValueRefBase : BoundRef {
+        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
+    };
+    struct BoundFlagRefBase : BoundRef {
+        virtual auto setFlag( bool flag ) -> ParserResult = 0;
+        virtual auto isFlag() const -> bool { return true; }
+    };
+
+    template<typename T>
+    struct BoundValueRef : BoundValueRefBase {
+        T &m_ref;
+
+        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return convertInto( arg, m_ref );
+        }
+    };
+
+    template<typename T>
+    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+        std::vector<T> &m_ref;
+
+        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
+
+        auto isContainer() const -> bool override { return true; }
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            T temp;
+            auto result = convertInto( arg, temp );
+            if( result )
+                m_ref.push_back( temp );
+            return result;
+        }
+    };
+
+    struct BoundFlagRef : BoundFlagRefBase {
+        bool &m_ref;
+
+        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            m_ref = flag;
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ReturnType>
+    struct LambdaInvoker {
+        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
+
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            return lambda( arg );
+        }
+    };
+
+    template<>
+    struct LambdaInvoker<void> {
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            lambda( arg );
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ArgType, typename L>
+    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
+        ArgType temp{};
+        auto result = convertInto( arg, temp );
+        return !result
+           ? result
+           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
+    }
+
+    template<typename L>
+    struct BoundLambda : BoundValueRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
+        }
+    };
+
+    template<typename L>
+    struct BoundFlagLambda : BoundFlagRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
+
+        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
+        }
+    };
+
+    enum class Optionality { Optional, Required };
+
+    struct Parser;
+
+    class ParserBase {
+    public:
+        virtual ~ParserBase() = default;
+        virtual auto validate() const -> Result { return Result::ok(); }
+        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
+        virtual auto cardinality() const -> size_t { return 1; }
+
+        auto parse( Args const &args ) const -> InternalParseResult {
+            return parse( args.exeName(), TokenStream( args ) );
+        }
+    };
+
+    template<typename DerivedT>
+    class ComposableParserImpl : public ParserBase {
+    public:
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser;
+
+		template<typename T>
+        auto operator+( T const &other ) const -> Parser;
+    };
+
+    // Common code and state for Args and Opts
+    template<typename DerivedT>
+    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+    protected:
+        Optionality m_optionality = Optionality::Optional;
+        std::shared_ptr<BoundRef> m_ref;
+        std::string m_hint;
+        std::string m_description;
+
+        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
+
+    public:
+        template<typename T>
+        ParserRefImpl( T &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+            m_hint( hint )
+        {}
+
+        template<typename LambdaT>
+        ParserRefImpl( LambdaT const &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+            m_hint(hint)
+        {}
+
+        auto operator()( std::string const &description ) -> DerivedT & {
+            m_description = description;
+            return static_cast<DerivedT &>( *this );
+        }
+
+        auto optional() -> DerivedT & {
+            m_optionality = Optionality::Optional;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto required() -> DerivedT & {
+            m_optionality = Optionality::Required;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto isOptional() const -> bool {
+            return m_optionality == Optionality::Optional;
+        }
+
+        auto cardinality() const -> size_t override {
+            if( m_ref->isContainer() )
+                return 0;
+            else
+                return 1;
+        }
+
+        auto hint() const -> std::string { return m_hint; }
+    };
+
+    class ExeName : public ComposableParserImpl<ExeName> {
+        std::shared_ptr<std::string> m_name;
+        std::shared_ptr<BoundValueRefBase> m_ref;
+
+        template<typename LambdaT>
+        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
+            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
+        }
+
+    public:
+        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
+
+        explicit ExeName( std::string &ref ) : ExeName() {
+            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
+        }
+
+        template<typename LambdaT>
+        explicit ExeName( LambdaT const& lambda ) : ExeName() {
+            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
+        }
+
+        // The exe name is not parsed out of the normal tokens, but is handled specially
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+        }
+
+        auto name() const -> std::string { return *m_name; }
+        auto set( std::string const& newName ) -> ParserResult {
+
+            auto lastSlash = newName.find_last_of( "\\/" );
+            auto filename = ( lastSlash == std::string::npos )
+                    ? newName
+                    : newName.substr( lastSlash+1 );
+
+            *m_name = filename;
+            if( m_ref )
+                return m_ref->setValue( filename );
+            else
+                return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    class Arg : public ParserRefImpl<Arg> {
+    public:
+        using ParserRefImpl::ParserRefImpl;
+
+        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            auto const &token = *remainingTokens;
+            if( token.type != TokenType::Argument )
+                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+
+            assert( !m_ref->isFlag() );
+            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+
+            auto result = valueRef->setValue( remainingTokens->token );
+            if( !result )
+                return InternalParseResult( result );
+            else
+                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+        }
+    };
+
+    inline auto normaliseOpt( std::string const &optName ) -> std::string {
+#ifdef CATCH_PLATFORM_WINDOWS
+        if( optName[0] == '/' )
+            return "-" + optName.substr( 1 );
+        else
+#endif
+            return optName;
+    }
+
+    class Opt : public ParserRefImpl<Opt> {
+    protected:
+        std::vector<std::string> m_optNames;
+
+    public:
+        template<typename LambdaT>
+        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
+
+        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
+
+        template<typename LambdaT>
+        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        template<typename T>
+        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        auto operator[]( std::string const &optName ) -> Opt & {
+            m_optNames.push_back( optName );
+            return *this;
+        }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::ostringstream oss;
+            bool first = true;
+            for( auto const &opt : m_optNames ) {
+                if (first)
+                    first = false;
+                else
+                    oss << ", ";
+                oss << opt;
+            }
+            if( !m_hint.empty() )
+                oss << " <" << m_hint << ">";
+            return { { oss.str(), m_description } };
+        }
+
+        auto isMatch( std::string const &optToken ) const -> bool {
+            auto normalisedToken = normaliseOpt( optToken );
+            for( auto const &name : m_optNames ) {
+                if( normaliseOpt( name ) == normalisedToken )
+                    return true;
+            }
+            return false;
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
+                auto const &token = *remainingTokens;
+                if( isMatch(token.token ) ) {
+                    if( m_ref->isFlag() ) {
+                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
+                        auto result = flagRef->setFlag( true );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    } else {
+                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+                        ++remainingTokens;
+                        if( !remainingTokens )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto const &argToken = *remainingTokens;
+                        if( argToken.type != TokenType::Argument )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto result = valueRef->setValue( argToken.token );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    }
+                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+                }
+            }
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+        }
+
+        auto validate() const -> Result override {
+            if( m_optNames.empty() )
+                return Result::logicError( "No options supplied to Opt" );
+            for( auto const &name : m_optNames ) {
+                if( name.empty() )
+                    return Result::logicError( "Option name cannot be empty" );
+#ifdef CATCH_PLATFORM_WINDOWS
+                if( name[0] != '-' && name[0] != '/' )
+                    return Result::logicError( "Option name must begin with '-' or '/'" );
+#else
+                if( name[0] != '-' )
+                    return Result::logicError( "Option name must begin with '-'" );
+#endif
+            }
+            return ParserRefImpl::validate();
+        }
+    };
+
+    struct Help : Opt {
+        Help( bool &showHelpFlag )
+        :   Opt([&]( bool flag ) {
+                showHelpFlag = flag;
+                return ParserResult::ok( ParseResultType::ShortCircuitAll );
+            })
+        {
+            static_cast<Opt &>( *this )
+                    ("display usage information")
+                    ["-?"]["-h"]["--help"]
+                    .optional();
+        }
+    };
+
+    struct Parser : ParserBase {
+
+        mutable ExeName m_exeName;
+        std::vector<Opt> m_options;
+        std::vector<Arg> m_args;
+
+        auto operator|=( ExeName const &exeName ) -> Parser & {
+            m_exeName = exeName;
+            return *this;
+        }
+
+        auto operator|=( Arg const &arg ) -> Parser & {
+            m_args.push_back(arg);
+            return *this;
+        }
+
+        auto operator|=( Opt const &opt ) -> Parser & {
+            m_options.push_back(opt);
+            return *this;
+        }
+
+        auto operator|=( Parser const &other ) -> Parser & {
+            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
+            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
+            return *this;
+        }
+
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser {
+            return Parser( *this ) |= other;
+        }
+
+        // Forward deprecated interface with '+' instead of '|'
+        template<typename T>
+        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
+        template<typename T>
+        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::vector<HelpColumns> cols;
+            for (auto const &o : m_options) {
+                auto childCols = o.getHelpColumns();
+                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+            }
+            return cols;
+        }
+
+        void writeToStream( std::ostream &os ) const {
+            if (!m_exeName.name().empty()) {
+                os << "usage:\n" << "  " << m_exeName.name() << " ";
+                bool required = true, first = true;
+                for( auto const &arg : m_args ) {
+                    if (first)
+                        first = false;
+                    else
+                        os << " ";
+                    if( arg.isOptional() && required ) {
+                        os << "[";
+                        required = false;
+                    }
+                    os << "<" << arg.hint() << ">";
+                    if( arg.cardinality() == 0 )
+                        os << " ... ";
+                }
+                if( !required )
+                    os << "]";
+                if( !m_options.empty() )
+                    os << " options";
+                os << "\n\nwhere options are:" << std::endl;
+            }
+
+            auto rows = getHelpColumns();
+            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
+            size_t optWidth = 0;
+            for( auto const &cols : rows )
+                optWidth = (std::max)(optWidth, cols.left.size() + 2);
+
+            optWidth = (std::min)(optWidth, consoleWidth/2);
+
+            for( auto const &cols : rows ) {
+                auto row =
+                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
+                        TextFlow::Spacer(4) +
+                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
+                os << row << std::endl;
+            }
+        }
+
+        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
+            parser.writeToStream( os );
+            return os;
+        }
+
+        auto validate() const -> Result override {
+            for( auto const &opt : m_options ) {
+                auto result = opt.validate();
+                if( !result )
+                    return result;
+            }
+            for( auto const &arg : m_args ) {
+                auto result = arg.validate();
+                if( !result )
+                    return result;
+            }
+            return Result::ok();
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
+
+            struct ParserInfo {
+                ParserBase const* parser = nullptr;
+                size_t count = 0;
+            };
+            const size_t totalParsers = m_options.size() + m_args.size();
+            assert( totalParsers < 512 );
+            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+            ParserInfo parseInfos[512];
+
+            {
+                size_t i = 0;
+                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
+                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
+            }
+
+            m_exeName.set( exeName );
+
+            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+            while( result.value().remainingTokens() ) {
+                bool tokenParsed = false;
+
+                for( size_t i = 0; i < totalParsers; ++i ) {
+                    auto&  parseInfo = parseInfos[i];
+                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
+                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
+                        if (!result)
+                            return result;
+                        if (result.value().type() != ParseResultType::NoMatch) {
+                            tokenParsed = true;
+                            ++parseInfo.count;
+                            break;
+                        }
+                    }
+                }
+
+                if( result.value().type() == ParseResultType::ShortCircuitAll )
+                    return result;
+                if( !tokenParsed )
+                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
+            }
+            // !TBD Check missing required options
+            return result;
+        }
+    };
+
+    template<typename DerivedT>
+    template<typename T>
+    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
+        return Parser() | static_cast<DerivedT const &>( *this ) | other;
+    }
+} // namespace detail
+
+// A Combined parser
+using detail::Parser;
+
+// A parser for options
+using detail::Opt;
+
+// A parser for arguments
+using detail::Arg;
+
+// Wrapper for argc, argv from main()
+using detail::Args;
+
+// Specifies the name of the executable
+using detail::ExeName;
+
+// Convenience wrapper for option parser that specifies the help option
+using detail::Help;
+
+// enum of result types from a parse
+using detail::ParseResultType;
+
+// Result type for parser operation
+using detail::ParserResult;
+
+}} // namespace Catch::clara
+
+// end clara.hpp
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+// end catch_clara.h
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+// end catch_commandline.h
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+        using namespace clara;
+
+        auto const setWarning = [&]( std::string const& warning ) {
+                auto warningSet = [&]() {
+                    if( warning == "NoAssertions" )
+                        return WarnAbout::NoAssertions;
+
+                    if ( warning == "NoTests" )
+                        return WarnAbout::NoTests;
+
+                    return WarnAbout::Nothing;
+                }();
+
+                if (warningSet == WarnAbout::Nothing)
+                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
+                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+                std::ifstream f( filename.c_str() );
+                if( !f.is_open() )
+                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
+
+                std::string line;
+                while( std::getline( f, line ) ) {
+                    line = trim(line);
+                    if( !line.empty() && !startsWith( line, '#' ) ) {
+                        if( !startsWith( line, '"' ) )
+                            line = '"' + line + '"';
+                        config.testsOrTags.push_back( line );
+                        config.testsOrTags.push_back( "," );
+
+                    }
+                }
+                //Remove comma in the end
+                if(!config.testsOrTags.empty())
+                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
+
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setTestOrder = [&]( std::string const& order ) {
+                if( startsWith( "declared", order ) )
+                    config.runOrder = RunTests::InDeclarationOrder;
+                else if( startsWith( "lexical", order ) )
+                    config.runOrder = RunTests::InLexicographicalOrder;
+                else if( startsWith( "random", order ) )
+                    config.runOrder = RunTests::InRandomOrder;
+                else
+                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setRngSeed = [&]( std::string const& seed ) {
+                if( seed != "time" )
+                    return clara::detail::convertInto( seed, config.rngSeed );
+                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setColourUsage = [&]( std::string const& useColour ) {
+                    auto mode = toLower( useColour );
+
+                    if( mode == "yes" )
+                        config.useColour = UseColour::Yes;
+                    else if( mode == "no" )
+                        config.useColour = UseColour::No;
+                    else if( mode == "auto" )
+                        config.useColour = UseColour::Auto;
+                    else
+                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+                auto keypressLc = toLower( keypress );
+                if( keypressLc == "start" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStart;
+                else if( keypressLc == "exit" )
+                    config.waitForKeypress = WaitForKeypress::BeforeExit;
+                else if( keypressLc == "both" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+                else
+                    return ParserResult::runtimeError( "keypress argument must be one of: start, exit or both. '" + keypress + "' not recognised" );
+            return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setVerbosity = [&]( std::string const& verbosity ) {
+            auto lcVerbosity = toLower( verbosity );
+            if( lcVerbosity == "quiet" )
+                config.verbosity = Verbosity::Quiet;
+            else if( lcVerbosity == "normal" )
+                config.verbosity = Verbosity::Normal;
+            else if( lcVerbosity == "high" )
+                config.verbosity = Verbosity::High;
+            else
+                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setReporter = [&]( std::string const& reporter ) {
+            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+
+            auto lcReporter = toLower( reporter );
+            auto result = factories.find( lcReporter );
+
+            if( factories.end() != result )
+                config.reporterName = lcReporter;
+            else
+                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto cli
+            = ExeName( config.processName )
+            | Help( config.showHelp )
+            | Opt( config.listTests )
+                ["-l"]["--list-tests"]
+                ( "list all/matching test cases" )
+            | Opt( config.listTags )
+                ["-t"]["--list-tags"]
+                ( "list all/matching tags" )
+            | Opt( config.showSuccessfulTests )
+                ["-s"]["--success"]
+                ( "include successful tests in output" )
+            | Opt( config.shouldDebugBreak )
+                ["-b"]["--break"]
+                ( "break into debugger on failure" )
+            | Opt( config.noThrow )
+                ["-e"]["--nothrow"]
+                ( "skip exception tests" )
+            | Opt( config.showInvisibles )
+                ["-i"]["--invisibles"]
+                ( "show invisibles (tabs, newlines)" )
+            | Opt( config.outputFilename, "filename" )
+                ["-o"]["--out"]
+                ( "output filename" )
+            | Opt( setReporter, "name" )
+                ["-r"]["--reporter"]
+                ( "reporter to use (defaults to console)" )
+            | Opt( config.name, "name" )
+                ["-n"]["--name"]
+                ( "suite name" )
+            | Opt( [&]( bool ){ config.abortAfter = 1; } )
+                ["-a"]["--abort"]
+                ( "abort at first failure" )
+            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+                ["-x"]["--abortx"]
+                ( "abort after x failures" )
+            | Opt( setWarning, "warning name" )
+                ["-w"]["--warn"]
+                ( "enable warnings" )
+            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+                ["-d"]["--durations"]
+                ( "show test durations" )
+            | Opt( loadTestNamesFromFile, "filename" )
+                ["-f"]["--input-file"]
+                ( "load test names to run from a file" )
+            | Opt( config.filenamesAsTags )
+                ["-#"]["--filenames-as-tags"]
+                ( "adds a tag for the filename" )
+            | Opt( config.sectionsToRun, "section name" )
+                ["-c"]["--section"]
+                ( "specify section to run" )
+            | Opt( setVerbosity, "quiet|normal|high" )
+                ["-v"]["--verbosity"]
+                ( "set output verbosity" )
+            | Opt( config.listTestNamesOnly )
+                ["--list-test-names-only"]
+                ( "list all/matching test cases names only" )
+            | Opt( config.listReporters )
+                ["--list-reporters"]
+                ( "list all reporters" )
+            | Opt( setTestOrder, "decl|lex|rand" )
+                ["--order"]
+                ( "test case order (defaults to decl)" )
+            | Opt( setRngSeed, "'time'|number" )
+                ["--rng-seed"]
+                ( "set a specific seed for random numbers" )
+            | Opt( setColourUsage, "yes|no" )
+                ["--use-colour"]
+                ( "should output be colourised" )
+            | Opt( config.libIdentify )
+                ["--libidentify"]
+                ( "report name and version according to libidentify standard" )
+            | Opt( setWaitForKeypress, "start|exit|both" )
+                ["--wait-for-keypress"]
+                ( "waits for a keypress before exiting" )
+            | Opt( config.benchmarkSamples, "samples" )
+                ["--benchmark-samples"]
+                ( "number of samples to collect (default: 100)" )
+            | Opt( config.benchmarkResamples, "resamples" )
+                ["--benchmark-resamples"]
+                ( "number of resamples for the bootstrap (default: 100000)" )
+            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
+                ["--benchmark-confidence-interval"]
+                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
+            | Opt( config.benchmarkNoAnalysis )
+                ["--benchmark-no-analysis"]
+                ( "perform only measurements; do not perform any analysis" )
+			| Arg( config.testsOrTags, "test name|pattern|tags" )
+                ( "which test or tests to use" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+// end catch_commandline.cpp
+// start catch_common.cpp
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+        // We can assume that the same file will usually have the same pointer.
+        // Thus, if the pointers are the same, there is no point in calling the strcmp
+        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+    std::string StreamEndStop::operator+() const {
+        return std::string();
+    }
+
+    NonCopyable::NonCopyable() = default;
+    NonCopyable::~NonCopyable() = default;
+
+}
+// end catch_common.cpp
+// start catch_config.cpp
+
+namespace Catch {
+
+    Config::Config( ConfigData const& data )
+    :   m_data( data ),
+        m_stream( openStream() )
+    {
+        // We need to trim filter specs to avoid trouble with superfluous
+        // whitespace (esp. important for bdd macros, as those are manually
+        // aligned with whitespace).
+
+        for (auto& elem : m_data.testsOrTags) {
+            elem = trim(elem);
+        }
+        for (auto& elem : m_data.sectionsToRun) {
+            elem = trim(elem);
+        }
+
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (!m_data.testsOrTags.empty()) {
+            m_hasTestFilters = true;
+            for (auto const& testOrTags : m_data.testsOrTags) {
+                parser.parse(testOrTags);
+            }
+        }
+        m_testSpec = parser.testSpec();
+    }
+
+    std::string const& Config::getFilename() const {
+        return m_data.outputFilename ;
+    }
+
+    bool Config::listTests() const          { return m_data.listTests; }
+    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
+    bool Config::listTags() const           { return m_data.listTags; }
+    bool Config::listReporters() const      { return m_data.listReporters; }
+
+    std::string Config::getProcessName() const { return m_data.processName; }
+    std::string const& Config::getReporterName() const { return m_data.reporterName; }
+
+    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+    TestSpec const& Config::testSpec() const { return m_testSpec; }
+    bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+    bool Config::showHelp() const { return m_data.showHelp; }
+
+    // IConfig interface
+    bool Config::allowThrows() const                   { return !m_data.noThrow; }
+    std::ostream& Config::stream() const               { return m_stream->stream(); }
+    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
+    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
+    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
+    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
+    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
+    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
+    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
+    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
+    int Config::abortAfter() const                     { return m_data.abortAfter; }
+    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
+    Verbosity Config::verbosity() const                { return m_data.verbosity; }
+
+    bool Config::benchmarkNoAnalysis() const           { return m_data.benchmarkNoAnalysis; }
+    int Config::benchmarkSamples() const               { return m_data.benchmarkSamples; }
+    double Config::benchmarkConfidenceInterval() const { return m_data.benchmarkConfidenceInterval; }
+    unsigned int Config::benchmarkResamples() const    { return m_data.benchmarkResamples; }
+
+    IStream const* Config::openStream() {
+        return Catch::makeStream(m_data.outputFilename);
+    }
+
+} // end namespace Catch
+// end catch_config.cpp
+// start catch_console_colour.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+// start catch_errno_guard.h
+
+namespace Catch {
+
+    class ErrnoGuard {
+    public:
+        ErrnoGuard();
+        ~ErrnoGuard();
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+// end catch_errno_guard.h
+#include <sstream>
+
+namespace Catch {
+    namespace {
+
+        struct IColourImpl {
+            virtual ~IColourImpl() = default;
+            virtual void use( Colour::Code _colourCode ) = 0;
+        };
+
+        struct NoColourImpl : IColourImpl {
+            void use( Colour::Code ) {}
+
+            static IColourImpl* instance() {
+                static NoColourImpl s_instance;
+                return &s_instance;
+            }
+        };
+
+    } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl : public IColourImpl {
+    public:
+        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+        {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+                default:
+                    CATCH_ERROR( "Unknown colour requested" );
+            }
+        }
+
+    private:
+        void setTextAttribute( WORD _textAttribute ) {
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+        }
+        HANDLE stdoutHandle;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+    IColourImpl* platformColourInstance() {
+        static Win32ColourImpl s_instance;
+
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = UseColour::Yes;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+    // use POSIX/ ANSI console terminal codes
+    // Thanks to Adam Strzelecki for original contribution
+    // (http://github.com/nanoant)
+    // https://github.com/philsquared/Catch/pull/131
+    class PosixColourImpl : public IColourImpl {
+    public:
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+                case Colour::BrightYellow:  return setColour( "[1;33m" );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+            }
+        }
+        static IColourImpl* instance() {
+            static PosixColourImpl s_instance;
+            return &s_instance;
+        }
+
+    private:
+        void setColour( const char* _escapeCode ) {
+            getCurrentContext().getConfig()->stream()
+                << '\033' << _escapeCode;
+        }
+    };
+
+    bool useColourOnPlatform() {
+        return
+#ifdef CATCH_PLATFORM_MAC
+            !isDebuggerActive() &&
+#endif
+#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
+            isatty(STDOUT_FILENO)
+#else
+            false
+#endif
+            ;
+    }
+    IColourImpl* platformColourInstance() {
+        ErrnoGuard guard;
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = useColourOnPlatform()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? PosixColourImpl::instance()
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
+    Colour::Colour( Colour&& rhs ) noexcept {
+        m_moved = rhs.m_moved;
+        rhs.m_moved = true;
+    }
+    Colour& Colour::operator=( Colour&& rhs ) noexcept {
+        m_moved = rhs.m_moved;
+        rhs.m_moved  = true;
+        return *this;
+    }
+
+    Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+    void Colour::use( Code _colourCode ) {
+        static IColourImpl* impl = platformColourInstance();
+        // Strictly speaking, this cannot possibly happen.
+        // However, under some conditions it does happen (see #1626),
+        // and this change is small enough that we can let practicality
+        // triumph over purity in this case.
+        if (impl != NULL) {
+            impl->use( _colourCode );
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, Colour const& ) {
+        return os;
+    }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_console_colour.cpp
+// start catch_context.cpp
+
+namespace Catch {
+
+    class Context : public IMutableContext, NonCopyable {
+
+    public: // IContext
+        IResultCapture* getResultCapture() override {
+            return m_resultCapture;
+        }
+        IRunner* getRunner() override {
+            return m_runner;
+        }
+
+        IConfigPtr const& getConfig() const override {
+            return m_config;
+        }
+
+        ~Context() override;
+
+    public: // IMutableContext
+        void setResultCapture( IResultCapture* resultCapture ) override {
+            m_resultCapture = resultCapture;
+        }
+        void setRunner( IRunner* runner ) override {
+            m_runner = runner;
+        }
+        void setConfig( IConfigPtr const& config ) override {
+            m_config = config;
+        }
+
+        friend IMutableContext& getCurrentMutableContext();
+
+    private:
+        IConfigPtr m_config;
+        IRunner* m_runner = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
+    };
+
+    IMutableContext *IMutableContext::currentContext = nullptr;
+
+    void IMutableContext::createContext()
+    {
+        currentContext = new Context();
+    }
+
+    void cleanUpContext() {
+        delete IMutableContext::currentContext;
+        IMutableContext::currentContext = nullptr;
+    }
+    IContext::~IContext() = default;
+    IMutableContext::~IMutableContext() = default;
+    Context::~Context() = default;
+
+    SimplePcg32& rng() {
+        static SimplePcg32 s_rng;
+        return s_rng;
+    }
+
+}
+// end catch_context.cpp
+// start catch_debug_console.cpp
+
+// start catch_debug_console.h
+
+#include <string>
+
+namespace Catch {
+    void writeToDebugConsole( std::string const& text );
+}
+
+// end catch_debug_console.h
+#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+
+#else
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+
+#endif // Platform
+// end catch_debug_console.cpp
+// start catch_debugger.cpp
+
+#ifdef CATCH_PLATFORM_MAC
+
+#  include <assert.h>
+#  include <stdbool.h>
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <cstddef>
+#  include <ostream>
+
+#ifdef __apple_build_version__
+    // These headers will only compile with AppleClang (XCode)
+    // For other compilers (Clang, GCC, ... ) we need to exclude them
+#  include <sys/sysctl.h>
+#endif
+
+    namespace Catch {
+        #ifdef __apple_build_version__
+        // The following function is taken directly from the following technical note:
+        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+            int                 mib[4];
+            struct kinfo_proc   info;
+            std::size_t         size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+        #else
+        bool isDebuggerActive() {
+            // We need to find another way to determine this for non-appleclang compilers on macOS
+            return false;
+        }
+        #endif
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+// end catch_debugger.cpp
+// start catch_decomposer.cpp
+
+namespace Catch {
+
+    ITransientExpression::~ITransientExpression() = default;
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+        if( lhs.size() + rhs.size() < 40 &&
+                lhs.find('\n') == std::string::npos &&
+                rhs.find('\n') == std::string::npos )
+            os << lhs << " " << op << " " << rhs;
+        else
+            os << lhs << "\n" << op << "\n" << rhs;
+    }
+}
+// end catch_decomposer.cpp
+// start catch_enforce.cpp
+
+#include <stdexcept>
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+    [[noreturn]]
+    void throw_exception(std::exception const& e) {
+        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+                      << "The message was: " << e.what() << '\n';
+        std::terminate();
+    }
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg) {
+        throw_exception(std::logic_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg) {
+        throw_exception(std::domain_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg) {
+        throw_exception(std::runtime_error(msg));
+    }
+
+} // namespace Catch;
+// end catch_enforce.cpp
+// start catch_enum_values_registry.cpp
+// start catch_enum_values_registry.h
+
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    namespace Detail {
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
+
+        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
+
+            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
+
+            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
+        };
+
+        std::vector<StringRef> parseEnums( StringRef enums );
+
+    } // Detail
+
+} // Catch
+
+// end catch_enum_values_registry.h
+
+#include <map>
+#include <cassert>
+
+namespace Catch {
+
+    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
+
+    namespace Detail {
+
+        namespace {
+            // Extracts the actual name part of an enum instance
+            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
+            StringRef extractInstanceName(StringRef enumInstance) {
+                // Find last occurence of ":"
+                size_t name_start = enumInstance.size();
+                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
+                    --name_start;
+                }
+                return enumInstance.substr(name_start, enumInstance.size() - name_start);
+            }
+        }
+
+        std::vector<StringRef> parseEnums( StringRef enums ) {
+            auto enumValues = splitStringRef( enums, ',' );
+            std::vector<StringRef> parsed;
+            parsed.reserve( enumValues.size() );
+            for( auto const& enumValue : enumValues ) {
+                parsed.push_back(trim(extractInstanceName(enumValue)));
+            }
+            return parsed;
+        }
+
+        EnumInfo::~EnumInfo() {}
+
+        StringRef EnumInfo::lookup( int value ) const {
+            for( auto const& valueToName : m_values ) {
+                if( valueToName.first == value )
+                    return valueToName.second;
+            }
+            return "{** unexpected enum value **}"_sr;
+        }
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
+            enumInfo->m_name = enumName;
+            enumInfo->m_values.reserve( values.size() );
+
+            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
+            assert( valueNames.size() == values.size() );
+            std::size_t i = 0;
+            for( auto value : values )
+                enumInfo->m_values.push_back({ value, valueNames[i++] });
+
+            return enumInfo;
+        }
+
+        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
+            return *m_enumInfos.back();
+        }
+
+    } // Detail
+} // Catch
+
+// end catch_enum_values_registry.cpp
+// start catch_errno_guard.cpp
+
+#include <cerrno>
+
+namespace Catch {
+        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+// end catch_errno_guard.cpp
+// start catch_exception_translator_registry.cpp
+
+// start catch_exception_translator_registry.h
+
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry();
+        virtual void registerTranslator( const IExceptionTranslator* translator );
+        std::string translateActiveException() const override;
+        std::string tryTranslators() const;
+
+    private:
+        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
+    };
+}
+
+// end catch_exception_translator_registry.h
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+    }
+
+    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
+        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        try {
+#ifdef __OBJC__
+            // In Objective-C try objective-c exceptions first
+            @try {
+                return tryTranslators();
+            }
+            @catch (NSException *exception) {
+                return Catch::Detail::stringify( [exception description] );
+            }
+#else
+            // Compiling a mixed mode project with MSVC means that CLR
+            // exceptions will be caught in (...) as well. However, these
+            // do not fill-in std::current_exception and thus lead to crash
+            // when attempting rethrow.
+            // /EHa switch also causes structured exceptions to be caught
+            // here, but they fill-in current_exception properly, so
+            // at worst the output should be a little weird, instead of
+            // causing a crash.
+            if (std::current_exception() == nullptr) {
+                return "Non C++ exception. Possibly a CLR exception.";
+            }
+            return tryTranslators();
+#endif
+        }
+        catch( TestFailureException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( std::exception& ex ) {
+            return ex.what();
+        }
+        catch( std::string& msg ) {
+            return msg;
+        }
+        catch( const char* msg ) {
+            return msg;
+        }
+        catch(...) {
+            return "Unknown exception";
+        }
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        if (m_translators.empty()) {
+            std::rethrow_exception(std::current_exception());
+        } else {
+            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
+        }
+    }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+#endif
+
+}
+// end catch_exception_translator_registry.cpp
+// start catch_fatal_condition.cpp
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+    // Report the error condition
+    void reportFatal( char const * const message ) {
+        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+    }
+}
+
+#endif // signals/SEH handling
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+    struct SignalDefs { DWORD id; const char* name; };
+
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    static SignalDefs signalDefs[] = {
+        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
+        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
+        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
+        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
+    };
+
+    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+        for (auto const& def : signalDefs) {
+            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+                reportFatal(def.name);
+            }
+        }
+        // If its not an exception we care about, pass it along.
+        // This stops us from eating debugger breaks etc.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        // 32k seems enough for Catch to handle stack overflow,
+        // but the value was found experimentally, so there is no strong guarantee
+        guaranteeSize = 32 * 1024;
+        exceptionHandlerHandle = nullptr;
+        // Register as first handler in current chain
+        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+        // Pass in guarantee size to be filled
+        SetThreadStackGuarantee(&guaranteeSize);
+    }
+
+    void FatalConditionHandler::reset() {
+        if (isSet) {
+            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
+            SetThreadStackGuarantee(&guaranteeSize);
+            exceptionHandlerHandle = nullptr;
+            isSet = false;
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+bool FatalConditionHandler::isSet = false;
+ULONG FatalConditionHandler::guaranteeSize = 0;
+PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
+
+} // namespace Catch
+
+#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+
+    // 32kb for the alternate stack seems to be sufficient. However, this value
+    // is experimentally determined, so that's not guaranteed.
+    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
+
+    static SignalDefs signalDefs[] = {
+        { SIGINT,  "SIGINT - Terminal interrupt signal" },
+        { SIGILL,  "SIGILL - Illegal instruction signal" },
+        { SIGFPE,  "SIGFPE - Floating point error signal" },
+        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+        { SIGTERM, "SIGTERM - Termination request signal" },
+        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+    void FatalConditionHandler::handleSignal( int sig ) {
+        char const * name = "<unknown signal>";
+        for (auto const& def : signalDefs) {
+            if (sig == def.id) {
+                name = def.name;
+                break;
+            }
+        }
+        reset();
+        reportFatal(name);
+        raise( sig );
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        stack_t sigStack;
+        sigStack.ss_sp = altStackMem;
+        sigStack.ss_size = sigStackSize;
+        sigStack.ss_flags = 0;
+        sigaltstack(&sigStack, &oldSigStack);
+        struct sigaction sa = { };
+
+        sa.sa_handler = handleSignal;
+        sa.sa_flags = SA_ONSTACK;
+        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+    void FatalConditionHandler::reset() {
+        if( isSet ) {
+            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
+                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+            }
+            // Return the old stack
+            sigaltstack(&oldSigStack, nullptr);
+            isSet = false;
+        }
+    }
+
+    bool FatalConditionHandler::isSet = false;
+    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+    stack_t FatalConditionHandler::oldSigStack = {};
+    char FatalConditionHandler::altStackMem[sigStackSize] = {};
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    void FatalConditionHandler::reset() {}
+}
+
+#endif // signals/SEH handling
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
+// end catch_fatal_condition.cpp
+// start catch_generators.cpp
+
+#include <limits>
+#include <set>
+
+namespace Catch {
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+const char* GeneratorException::what() const noexcept {
+    return m_msg;
+}
+
+namespace Generators {
+
+    GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+    auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        return getResultCapture().acquireGeneratorTracker( lineInfo );
+    }
+
+} // namespace Generators
+} // namespace Catch
+// end catch_generators.cpp
+// start catch_interfaces_capture.cpp
+
+namespace Catch {
+    IResultCapture::~IResultCapture() = default;
+}
+// end catch_interfaces_capture.cpp
+// start catch_interfaces_config.cpp
+
+namespace Catch {
+    IConfig::~IConfig() = default;
+}
+// end catch_interfaces_config.cpp
+// start catch_interfaces_exception.cpp
+
+namespace Catch {
+    IExceptionTranslator::~IExceptionTranslator() = default;
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+// end catch_interfaces_exception.cpp
+// start catch_interfaces_registry_hub.cpp
+
+namespace Catch {
+    IRegistryHub::~IRegistryHub() = default;
+    IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+// end catch_interfaces_registry_hub.cpp
+// start catch_interfaces_reporter.cpp
+
+// start catch_reporter_listening.h
+
+namespace Catch {
+
+    class ListeningReporter : public IStreamingReporter {
+        using Reporters = std::vector<IStreamingReporterPtr>;
+        Reporters m_listeners;
+        IStreamingReporterPtr m_reporter = nullptr;
+        ReporterPreferences m_preferences;
+
+    public:
+        ListeningReporter();
+
+        void addListener( IStreamingReporterPtr&& listener );
+        void addReporter( IStreamingReporterPtr&& reporter );
+
+    public: // IStreamingReporter
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases( std::string const& spec ) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testGroupStarting( GroupInfo const& groupInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+        // The return value indicates if the messages buffer should be cleared:
+        bool assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+
+        void skipTest( TestCaseInfo const& testInfo ) override;
+        bool isMulti() const override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_listening.h
+namespace Catch {
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
+    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
+    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+    std::ostream& ReporterConfig::stream() const { return *m_stream; }
+    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
+
+    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
+
+    GroupInfo::GroupInfo(  std::string const& _name,
+                           std::size_t _groupIndex,
+                           std::size_t _groupsCount )
+    :   name( _name ),
+        groupIndex( _groupIndex ),
+        groupsCounts( _groupsCount )
+    {}
+
+     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+                                     std::vector<MessageInfo> const& _infoMessages,
+                                     Totals const& _totals )
+    :   assertionResult( _assertionResult ),
+        infoMessages( _infoMessages ),
+        totals( _totals )
+    {
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
+
+        if( assertionResult.hasMessage() ) {
+            // Copy message into messages list.
+            // !TBD This should have been done earlier, somewhere
+            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+            builder << assertionResult.getMessage();
+            builder.m_info.message = builder.m_stream.str();
+
+            infoMessages.push_back( builder.m_info );
+        }
+    }
+
+     AssertionStats::~AssertionStats() = default;
+
+    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
+                                 Counts const& _assertions,
+                                 double _durationInSeconds,
+                                 bool _missingAssertions )
+    :   sectionInfo( _sectionInfo ),
+        assertions( _assertions ),
+        durationInSeconds( _durationInSeconds ),
+        missingAssertions( _missingAssertions )
+    {}
+
+    SectionStats::~SectionStats() = default;
+
+    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
+                                   Totals const& _totals,
+                                   std::string const& _stdOut,
+                                   std::string const& _stdErr,
+                                   bool _aborting )
+    : testInfo( _testInfo ),
+        totals( _totals ),
+        stdOut( _stdOut ),
+        stdErr( _stdErr ),
+        aborting( _aborting )
+    {}
+
+    TestCaseStats::~TestCaseStats() = default;
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
+                                    Totals const& _totals,
+                                    bool _aborting )
+    :   groupInfo( _groupInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
+    :   groupInfo( _groupInfo ),
+        aborting( false )
+    {}
+
+    TestGroupStats::~TestGroupStats() = default;
+
+    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
+                    Totals const& _totals,
+                    bool _aborting )
+    :   runInfo( _runInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestRunStats::~TestRunStats() = default;
+
+    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
+    bool IStreamingReporter::isMulti() const { return false; }
+
+    IReporterFactory::~IReporterFactory() = default;
+    IReporterRegistry::~IReporterRegistry() = default;
+
+} // end namespace Catch
+// end catch_interfaces_reporter.cpp
+// start catch_interfaces_runner.cpp
+
+namespace Catch {
+    IRunner::~IRunner() = default;
+}
+// end catch_interfaces_runner.cpp
+// start catch_interfaces_testcase.cpp
+
+namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
+    ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+// end catch_interfaces_testcase.cpp
+// start catch_leak_detector.cpp
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+    LeakDetector::LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
+}
+
+#else
+
+    Catch::LeakDetector::LeakDetector() {}
+
+#endif
+
+Catch::LeakDetector::~LeakDetector() {
+    Catch::cleanUp();
+}
+// end catch_leak_detector.cpp
+// start catch_list.cpp
+
+// start catch_list.h
+
+#include <set>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config );
+
+    std::size_t listTestsNamesOnly( Config const& config );
+
+    struct TagInfo {
+        void add( std::string const& spelling );
+        std::string all() const;
+
+        std::set<std::string> spellings;
+        std::size_t count = 0;
+    };
+
+    std::size_t listTags( Config const& config );
+
+    std::size_t listReporters();
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config );
+
+} // end namespace Catch
+
+// end catch_list.h
+// start catch_text.h
+
+namespace Catch {
+    using namespace clara::TextFlow;
+}
+
+// end catch_text.h
+#include <limits>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Matching test cases:\n";
+        else {
+            Catch::cout() << "All available test cases:\n";
+        }
+
+        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            Colour colourGuard( colour );
+
+            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
+            if( config.verbosity() >= Verbosity::High ) {
+                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
+                std::string description = testCaseInfo.description;
+                if( description.empty() )
+                    description = "(NO DESCRIPTION)";
+                Catch::cout() << Column( description ).indent(4) << std::endl;
+            }
+            if( !testCaseInfo.tags.empty() )
+                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
+        }
+
+        if( !config.hasTestFilters() )
+            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
+        else
+            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
+        return matchedTestCases.size();
+    }
+
+    std::size_t listTestsNamesOnly( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        std::size_t matchedTests = 0;
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            matchedTests++;
+            if( startsWith( testCaseInfo.name, '#' ) )
+               Catch::cout() << '"' << testCaseInfo.name << '"';
+            else
+               Catch::cout() << testCaseInfo.name;
+            if ( config.verbosity() >= Verbosity::High )
+                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+            Catch::cout() << std::endl;
+        }
+        return matchedTests;
+    }
+
+    void TagInfo::add( std::string const& spelling ) {
+        ++count;
+        spellings.insert( spelling );
+    }
+
+    std::string TagInfo::all() const {
+        size_t size = 0;
+        for (auto const& spelling : spellings) {
+            // Add 2 for the brackes
+            size += spelling.size() + 2;
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
+        return out;
+    }
+
+    std::size_t listTags( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Tags for matching test cases:\n";
+        else {
+            Catch::cout() << "All available tags:\n";
+        }
+
+        std::map<std::string, TagInfo> tagCounts;
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCase : matchedTestCases ) {
+            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
+                std::string lcaseTagName = toLower( tagName );
+                auto countIt = tagCounts.find( lcaseTagName );
+                if( countIt == tagCounts.end() )
+                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+                countIt->second.add( tagName );
+            }
+        }
+
+        for( auto const& tagCount : tagCounts ) {
+            ReusableStringStream rss;
+            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
+            auto str = rss.str();
+            auto wrapper = Column( tagCount.second.all() )
+                                                    .initialIndent( 0 )
+                                                    .indent( str.size() )
+                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
+            Catch::cout() << str << wrapper << '\n';
+        }
+        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+        return tagCounts.size();
+    }
+
+    std::size_t listReporters() {
+        Catch::cout() << "Available reporters:\n";
+        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+        std::size_t maxNameLen = 0;
+        for( auto const& factoryKvp : factories )
+            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
+
+        for( auto const& factoryKvp : factories ) {
+            Catch::cout()
+                    << Column( factoryKvp.first + ":" )
+                            .indent(2)
+                            .width( 5+maxNameLen )
+                    +  Column( factoryKvp.second->getDescription() )
+                            .initialIndent(0)
+                            .indent(2)
+                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
+                    << "\n";
+        }
+        Catch::cout() << std::endl;
+        return factories.size();
+    }
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
+        Option<std::size_t> listedCount;
+        getCurrentMutableContext().setConfig( config );
+        if( config->listTests() )
+            listedCount = listedCount.valueOr(0) + listTests( *config );
+        if( config->listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
+        if( config->listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( *config );
+        if( config->listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters();
+        return listedCount;
+    }
+
+} // end namespace Catch
+// end catch_list.cpp
+// start catch_matchers.cpp
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        std::string MatcherUntypedBase::toString() const {
+            if( m_cachedToString.empty() )
+                m_cachedToString = describe();
+            return m_cachedToString;
+        }
+
+        MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+    } // namespace Impl
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+// end catch_matchers.cpp
+// start catch_matchers_exception.cpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+bool ExceptionMessageMatcher::match(std::exception const& ex) const {
+    return ex.what() == m_message;
+}
+
+std::string ExceptionMessageMatcher::describe() const {
+    return "exception message matches \"" + m_message + "\"";
+}
+
+}
+Exception::ExceptionMessageMatcher Message(std::string const& message) {
+    return Exception::ExceptionMessageMatcher(message);
+}
+
+// namespace Exception
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_exception.cpp
+// start catch_matchers_floating.cpp
+
+// start catch_polyfills.hpp
+
+namespace Catch {
+    bool isnan(float f);
+    bool isnan(double d);
+}
+
+// end catch_polyfills.hpp
+// start catch_to_string.hpp
+
+#include <string>
+
+namespace Catch {
+    template <typename T>
+    std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+        return std::to_string(t);
+#else
+        ReusableStringStream rss;
+        rss << t;
+        return rss.str();
+#endif
+    }
+} // end namespace Catch
+
+// end catch_to_string.hpp
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <sstream>
+#include <type_traits>
+#include <iomanip>
+#include <limits>
+
+namespace Catch {
+namespace {
+
+    int32_t convert(float f) {
+        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+        int32_t i;
+        std::memcpy(&i, &f, sizeof(f));
+        return i;
+    }
+
+    int64_t convert(double d) {
+        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+        int64_t i;
+        std::memcpy(&i, &d, sizeof(d));
+        return i;
+    }
+
+    template <typename FP>
+    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
+        // Comparison with NaN should always be false.
+        // This way we can rule it out before getting into the ugly details
+        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+            return false;
+        }
+
+        auto lc = convert(lhs);
+        auto rc = convert(rhs);
+
+        if ((lc < 0) != (rc < 0)) {
+            // Potentially we can have +0 and -0
+            return lhs == rhs;
+        }
+
+        auto ulpDiff = std::abs(lc - rc);
+        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
+    }
+
+} //end anonymous namespace
+
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// The long double overload is currently unused
+#pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+    float nextafter(float x, float y) {
+        return ::nextafterf(x, y);
+    }
+
+    double nextafter(double x, double y) {
+        return ::nextafter(x, y);
+    }
+
+    long double nextafter(long double x, long double y) {
+        return ::nextafterl(x, y);
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
+
+namespace {
+
+template <typename FP>
+FP step(FP start, FP direction, uint64_t steps) {
+    for (uint64_t i = 0; i < steps; ++i) {
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+        start = Catch::nextafter(start, direction);
+#else
+        start = std::nextafter(start, direction);
+#endif
+    }
+    return start;
+}
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+template <typename FloatingPoint>
+void write(std::ostream& out, FloatingPoint num) {
+    out << std::scientific
+        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
+        << num;
+}
+
+} // end anonymous namespace
+
+namespace Matchers {
+namespace Floating {
+
+    enum class FloatingPointKind : uint8_t {
+        Float,
+        Double
+    };
+
+    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+        :m_target{ target }, m_margin{ margin } {
+        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+            << " Margin has to be non-negative.");
+    }
+
+    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+    // But without the subtraction to allow for INFINITY in comparison
+    bool WithinAbsMatcher::match(double const& matchee) const {
+        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+    }
+
+    std::string WithinAbsMatcher::describe() const {
+        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+    }
+
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
+        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+        CATCH_ENFORCE(m_type == FloatingPointKind::Double
+                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
+            "Provided ULP is impossibly large for a float comparison.");
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+    bool WithinUlpsMatcher::match(double const& matchee) const {
+        switch (m_type) {
+        case FloatingPointKind::Float:
+            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+        case FloatingPointKind::Double:
+            return almostEqualUlps<double>(matchee, m_target, m_ulps);
+        default:
+            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
+        }
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+    std::string WithinUlpsMatcher::describe() const {
+        std::stringstream ret;
+
+        ret << "is within " << m_ulps << " ULPs of ";
+
+        if (m_type == FloatingPointKind::Float) {
+            write(ret, static_cast<float>(m_target));
+            ret << 'f';
+        } else {
+            write(ret, m_target);
+        }
+
+        ret << " ([";
+        if (m_type == FloatingPointKind::Double) {
+            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
+        } else {
+            // We have to cast INFINITY to float because of MinGW, see #1782
+            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
+        }
+        ret << "])";
+
+        return ret.str();
+    }
+
+    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
+        m_target(target),
+        m_epsilon(epsilon){
+        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
+        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
+    }
+
+    bool WithinRelMatcher::match(double const& matchee) const {
+        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
+        return marginComparison(matchee, m_target,
+                                std::isinf(relMargin)? 0 : relMargin);
+    }
+
+    std::string WithinRelMatcher::describe() const {
+        Catch::ReusableStringStream sstr;
+        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
+        return sstr.str();
+    }
+
+}// namespace Floating
+
+Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
+}
+
+Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
+}
+
+Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
+    return Floating::WithinAbsMatcher(target, margin);
+}
+
+Floating::WithinRelMatcher WithinRel(double target, double eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(double target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
+}
+
+Floating::WithinRelMatcher WithinRel(float target, float eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(float target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.cpp
+// start catch_matchers_generic.cpp
+
+std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
+    if (desc.empty()) {
+        return "matches undescribed predicate";
+    } else {
+        return "matches predicate: \"" + desc + '"';
+    }
+}
+// end catch_matchers_generic.cpp
+// start catch_matchers_string.cpp
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_str( adjustString( str ) )
+        {}
+        std::string CasedString::adjustString( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? toLower( str )
+                   : str;
+        }
+        std::string CasedString::caseSensitivitySuffix() const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? " (case insensitive)"
+                   : std::string();
+        }
+
+        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+        : m_comparator( comparator ),
+          m_operation( operation ) {
+        }
+
+        std::string StringMatcherBase::describe() const {
+            std::string description;
+            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                        m_comparator.caseSensitivitySuffix().size());
+            description += m_operation;
+            description += ": \"";
+            description += m_comparator.m_str;
+            description += "\"";
+            description += m_comparator.caseSensitivitySuffix();
+            return description;
+        }
+
+        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+        bool EqualsMatcher::match( std::string const& source ) const {
+            return m_comparator.adjustString( source ) == m_comparator.m_str;
+        }
+
+        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+        bool ContainsMatcher::match( std::string const& source ) const {
+            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+        bool StartsWithMatcher::match( std::string const& source ) const {
+            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+        bool EndsWithMatcher::match( std::string const& source ) const {
+            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+
+        bool RegexMatcher::match(std::string const& matchee) const {
+            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+            if (m_caseSensitivity == CaseSensitive::Choice::No) {
+                flags |= std::regex::icase;
+            }
+            auto reg = std::regex(m_regex, flags);
+            return std::regex_match(matchee, reg);
+        }
+
+        std::string RegexMatcher::describe() const {
+            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+        }
+
+    } // namespace StdString
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+
+    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+        return StdString::RegexMatcher(regex, caseSensitivity);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_string.cpp
+// start catch_message.cpp
+
+// start catch_uncaught_exceptions.h
+
+namespace Catch {
+    bool uncaught_exceptions();
+} // end namespace Catch
+
+// end catch_uncaught_exceptions.h
+#include <cassert>
+#include <stack>
+
+namespace Catch {
+
+    MessageInfo::MessageInfo(   StringRef const& _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    bool MessageInfo::operator==( MessageInfo const& other ) const {
+        return sequence == other.sequence;
+    }
+
+    bool MessageInfo::operator<( MessageInfo const& other ) const {
+        return sequence < other.sequence;
+    }
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
+                                           SourceLineInfo const& lineInfo,
+                                           ResultWas::OfType type )
+        :m_info(macroName, lineInfo, type) {}
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+    : m_info( builder.m_info ), m_moved()
+    {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+
+    ScopedMessage::ScopedMessage( ScopedMessage&& old )
+    : m_info( old.m_info ), m_moved()
+    {
+        old.m_moved = true;
+    }
+
+    ScopedMessage::~ScopedMessage() {
+        if ( !uncaught_exceptions() && !m_moved ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+
+    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+        auto trimmed = [&] (size_t start, size_t end) {
+            while (names[start] == ',' || isspace(names[start])) {
+                ++start;
+            }
+            while (names[end] == ',' || isspace(names[end])) {
+                --end;
+            }
+            return names.substr(start, end - start + 1);
+        };
+        auto skipq = [&] (size_t start, char quote) {
+            for (auto i = start + 1; i < names.size() ; ++i) {
+                if (names[i] == quote)
+                    return i;
+                if (names[i] == '\\')
+                    ++i;
+            }
+            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
+        };
+
+        size_t start = 0;
+        std::stack<char> openings;
+        for (size_t pos = 0; pos < names.size(); ++pos) {
+            char c = names[pos];
+            switch (c) {
+            case '[':
+            case '{':
+            case '(':
+            // It is basically impossible to disambiguate between
+            // comparison and start of template args in this context
+//            case '<':
+                openings.push(c);
+                break;
+            case ']':
+            case '}':
+            case ')':
+//           case '>':
+                openings.pop();
+                break;
+            case '"':
+            case '\'':
+                pos = skipq(pos, c);
+                break;
+            case ',':
+                if (start != pos && openings.size() == 0) {
+                    m_messages.emplace_back(macroName, lineInfo, resultType);
+                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
+                    m_messages.back().message += " := ";
+                    start = pos;
+                }
+            }
+        }
+        assert(openings.size() == 0 && "Mismatched openings");
+        m_messages.emplace_back(macroName, lineInfo, resultType);
+        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
+        m_messages.back().message += " := ";
+    }
+    Capturer::~Capturer() {
+        if ( !uncaught_exceptions() ){
+            assert( m_captured == m_messages.size() );
+            for( size_t i = 0; i < m_captured; ++i  )
+                m_resultCapture.popScopedMessage( m_messages[i] );
+        }
+    }
+
+    void Capturer::captureValue( size_t index, std::string const& value ) {
+        assert( index < m_messages.size() );
+        m_messages[index].message += value;
+        m_resultCapture.pushScopedMessage( m_messages[index] );
+        m_captured++;
+    }
+
+} // end namespace Catch
+// end catch_message.cpp
+// start catch_output_redirect.cpp
+
+// start catch_output_redirect.h
+#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+    class RedirectedStream {
+        std::ostream& m_originalStream;
+        std::ostream& m_redirectionStream;
+        std::streambuf* m_prevBuf;
+
+    public:
+        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+        ~RedirectedStream();
+    };
+
+    class RedirectedStdOut {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cout;
+    public:
+        RedirectedStdOut();
+        auto str() const -> std::string;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes
+    class RedirectedStdErr {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cerr;
+        RedirectedStream m_clog;
+    public:
+        RedirectedStdErr();
+        auto str() const -> std::string;
+    };
+
+    class RedirectedStreams {
+    public:
+        RedirectedStreams(RedirectedStreams const&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
+        RedirectedStreams(RedirectedStreams&&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
+
+        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
+        ~RedirectedStreams();
+    private:
+        std::string& m_redirectedCout;
+        std::string& m_redirectedCerr;
+        RedirectedStdOut m_redirectedStdOut;
+        RedirectedStdErr m_redirectedStdErr;
+    };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+    // Windows's implementation of std::tmpfile is terrible (it tries
+    // to create a file inside system folder, thus requiring elevated
+    // privileges for the binary), so we have to use tmpnam(_s) and
+    // create the file ourselves there.
+    class TempFile {
+    public:
+        TempFile(TempFile const&) = delete;
+        TempFile& operator=(TempFile const&) = delete;
+        TempFile(TempFile&&) = delete;
+        TempFile& operator=(TempFile&&) = delete;
+
+        TempFile();
+        ~TempFile();
+
+        std::FILE* getFile();
+        std::string getContents();
+
+    private:
+        std::FILE* m_file = nullptr;
+    #if defined(_MSC_VER)
+        char m_buffer[L_tmpnam] = { 0 };
+    #endif
+    };
+
+    class OutputRedirect {
+    public:
+        OutputRedirect(OutputRedirect const&) = delete;
+        OutputRedirect& operator=(OutputRedirect const&) = delete;
+        OutputRedirect(OutputRedirect&&) = delete;
+        OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+        ~OutputRedirect();
+
+    private:
+        int m_originalStdout = -1;
+        int m_originalStderr = -1;
+        TempFile m_stdoutFile;
+        TempFile m_stderrFile;
+        std::string& m_stdoutDest;
+        std::string& m_stderrDest;
+    };
+
+#endif
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+// end catch_output_redirect.h
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #include <io.h>      //_dup and _dup2
+    #define dup _dup
+    #define dup2 _dup2
+    #define fileno _fileno
+    #else
+    #include <unistd.h>  // dup and dup2
+    #endif
+#endif
+
+namespace Catch {
+
+    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+    :   m_originalStream( originalStream ),
+        m_redirectionStream( redirectionStream ),
+        m_prevBuf( m_originalStream.rdbuf() )
+    {
+        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+    }
+
+    RedirectedStream::~RedirectedStream() {
+        m_originalStream.rdbuf( m_prevBuf );
+    }
+
+    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStdErr::RedirectedStdErr()
+    :   m_cerr( Catch::cerr(), m_rss.get() ),
+        m_clog( Catch::clog(), m_rss.get() )
+    {}
+    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
+    :   m_redirectedCout(redirectedCout),
+        m_redirectedCerr(redirectedCerr)
+    {}
+
+    RedirectedStreams::~RedirectedStreams() {
+        m_redirectedCout += m_redirectedStdOut.str();
+        m_redirectedCerr += m_redirectedStdErr.str();
+    }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+    TempFile::TempFile() {
+        if (tmpnam_s(m_buffer)) {
+            CATCH_RUNTIME_ERROR("Could not get a temp filename");
+        }
+        if (fopen_s(&m_file, m_buffer, "w")) {
+            char buffer[100];
+            if (strerror_s(buffer, errno)) {
+                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
+            }
+            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
+        }
+    }
+#else
+    TempFile::TempFile() {
+        m_file = std::tmpfile();
+        if (!m_file) {
+            CATCH_RUNTIME_ERROR("Could not create a temp file.");
+        }
+    }
+
+#endif
+
+    TempFile::~TempFile() {
+         // TBD: What to do about errors here?
+         std::fclose(m_file);
+         // We manually create the file on Windows only, on Linux
+         // it will be autodeleted
+#if defined(_MSC_VER)
+         std::remove(m_buffer);
+#endif
+    }
+
+    FILE* TempFile::getFile() {
+        return m_file;
+    }
+
+    std::string TempFile::getContents() {
+        std::stringstream sstr;
+        char buffer[100] = {};
+        std::rewind(m_file);
+        while (std::fgets(buffer, sizeof(buffer), m_file)) {
+            sstr << buffer;
+        }
+        return sstr.str();
+    }
+
+    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+        m_originalStdout(dup(1)),
+        m_originalStderr(dup(2)),
+        m_stdoutDest(stdout_dest),
+        m_stderrDest(stderr_dest) {
+        dup2(fileno(m_stdoutFile.getFile()), 1);
+        dup2(fileno(m_stderrFile.getFile()), 2);
+    }
+
+    OutputRedirect::~OutputRedirect() {
+        Catch::cout() << std::flush;
+        fflush(stdout);
+        // Since we support overriding these streams, we flush cerr
+        // even though std::cerr is unbuffered
+        Catch::cerr() << std::flush;
+        Catch::clog() << std::flush;
+        fflush(stderr);
+
+        dup2(m_originalStdout, 1);
+        dup2(m_originalStderr, 2);
+
+        m_stdoutDest += m_stdoutFile.getContents();
+        m_stderrDest += m_stderrFile.getContents();
+    }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #undef dup
+    #undef dup2
+    #undef fileno
+    #endif
+#endif
+// end catch_output_redirect.cpp
+// start catch_polyfills.cpp
+
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+    bool isnan(float f) {
+        return std::isnan(f);
+    }
+    bool isnan(double d) {
+        return std::isnan(d);
+    }
+#else
+    // For now we only use this for embarcadero
+    bool isnan(float f) {
+        return std::_isnan(f);
+    }
+    bool isnan(double d) {
+        return std::_isnan(d);
+    }
+#endif
+
+} // end namespace Catch
+// end catch_polyfills.cpp
+// start catch_random_number_generator.cpp
+
+namespace Catch {
+
+namespace {
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4146) // we negate uint32 during the rotate
+#endif
+        // Safe rotr implementation thanks to John Regehr
+        uint32_t rotate_right(uint32_t val, uint32_t count) {
+            const uint32_t mask = 31;
+            count &= mask;
+            return (val >> count) | (val << (-count & mask));
+        }
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+}
+
+    SimplePcg32::SimplePcg32(result_type seed_) {
+        seed(seed_);
+    }
+
+    void SimplePcg32::seed(result_type seed_) {
+        m_state = 0;
+        (*this)();
+        m_state += seed_;
+        (*this)();
+    }
+
+    void SimplePcg32::discard(uint64_t skip) {
+        // We could implement this to run in O(log n) steps, but this
+        // should suffice for our use case.
+        for (uint64_t s = 0; s < skip; ++s) {
+            static_cast<void>((*this)());
+        }
+    }
+
+    SimplePcg32::result_type SimplePcg32::operator()() {
+        // prepare the output value
+        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
+        const auto output = rotate_right(xorshifted, m_state >> 59u);
+
+        // advance state
+        m_state = m_state * 6364136223846793005ULL + s_inc;
+
+        return output;
+    }
+
+    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state == rhs.m_state;
+    }
+
+    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state != rhs.m_state;
+    }
+}
+// end catch_random_number_generator.cpp
+// start catch_registry_hub.cpp
+
+// start catch_test_case_registry_impl.h
+
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <ios>
+
+namespace Catch {
+
+    class TestCase;
+    struct IConfig;
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        virtual ~TestRegistry() = default;
+
+        virtual void registerTest( TestCase const& testCase );
+
+        std::vector<TestCase> const& getAllTests() const override;
+        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
+
+    private:
+        std::vector<TestCase> m_functions;
+        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+        mutable std::vector<TestCase> m_sortedFunctions;
+        std::size_t m_unnamedCount = 0;
+        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class TestInvokerAsFunction : public ITestInvoker {
+        void(*m_testAsFunction)();
+    public:
+        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
+
+        void invoke() const override;
+    };
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
+
+    ///////////////////////////////////////////////////////////////////////////
+
+} // end namespace Catch
+
+// end catch_test_case_registry_impl.h
+// start catch_reporter_registry.h
+
+#include <map>
+
+namespace Catch {
+
+    class ReporterRegistry : public IReporterRegistry {
+
+    public:
+
+        ~ReporterRegistry() override;
+
+        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
+
+        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
+        void registerListener( IReporterFactoryPtr const& factory );
+
+        FactoryMap const& getFactories() const override;
+        Listeners const& getListeners() const override;
+
+    private:
+        FactoryMap m_factories;
+        Listeners m_listeners;
+    };
+}
+
+// end catch_reporter_registry.h
+// start catch_tag_alias_registry.h
+
+// start catch_tag_alias.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias.h
+#include <map>
+
+namespace Catch {
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        ~TagAliasRegistry() override;
+        TagAlias const* find( std::string const& alias ) const override;
+        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias_registry.h
+// start catch_startup_exception_registry.h
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+    class StartupExceptionRegistry {
+    public:
+        void add(std::exception_ptr const& exception) noexcept;
+        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+    private:
+        std::vector<std::exception_ptr> m_exceptions;
+    };
+
+} // end namespace Catch
+
+// end catch_startup_exception_registry.h
+// start catch_singletons.hpp
+
+namespace Catch {
+
+    struct ISingleton {
+        virtual ~ISingleton();
+    };
+
+    void addSingleton( ISingleton* singleton );
+    void cleanupSingletons();
+
+    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+    class Singleton : SingletonImplT, public ISingleton {
+
+        static auto getInternal() -> Singleton* {
+            static Singleton* s_instance = nullptr;
+            if( !s_instance ) {
+                s_instance = new Singleton;
+                addSingleton( s_instance );
+            }
+            return s_instance;
+        }
+
+    public:
+        static auto get() -> InterfaceT const& {
+            return *getInternal();
+        }
+        static auto getMutable() -> MutableInterfaceT& {
+            return *getInternal();
+        }
+    };
+
+} // namespace Catch
+
+// end catch_singletons.hpp
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+                            private NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            IReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerReporter( name, factory );
+            }
+            void registerListener( IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerListener( factory );
+            }
+            void registerTest( TestCase const& testInfo ) override {
+                m_testCaseRegistry.registerTest( testInfo );
+            }
+            void registerTranslator( const IExceptionTranslator* translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( translator );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+                m_exceptionRegistry.add(std::current_exception());
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
+        };
+    }
+
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return RegistryHubSingleton::getMutable();
+    }
+    void cleanUp() {
+        cleanupSingletons();
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+} // end namespace Catch
+// end catch_registry_hub.cpp
+// start catch_reporter_registry.cpp
+
+namespace Catch {
+
+    ReporterRegistry::~ReporterRegistry() = default;
+
+    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
+        auto it =  m_factories.find( name );
+        if( it == m_factories.end() )
+            return nullptr;
+        return it->second->create( ReporterConfig( config ) );
+    }
+
+    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
+        m_factories.emplace(name, factory);
+    }
+    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
+        m_listeners.push_back( factory );
+    }
+
+    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
+        return m_factories;
+    }
+    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
+        return m_listeners;
+    }
+
+}
+// end catch_reporter_registry.cpp
+// start catch_result_type.cpp
+
+namespace Catch {
+
+    bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+// end catch_result_type.cpp
+// start catch_run_context.cpp
+
+#include <cassert>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace Generators {
+        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
+            GeneratorBasePtr m_generator;
+
+            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+            :   TrackerBase( nameAndLocation, ctx, parent )
+            {}
+            ~GeneratorTracker();
+
+            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
+                std::shared_ptr<GeneratorTracker> tracker;
+
+                ITracker& currentTracker = ctx.currentTracker();
+                if( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                    assert( childTracker );
+                    assert( childTracker->isGeneratorTracker() );
+                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+                }
+                else {
+                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
+                    currentTracker.addChild( tracker );
+                }
+
+                if( !ctx.completedCycle() && !tracker->isComplete() ) {
+                    tracker->open();
+                }
+
+                return *tracker;
+            }
+
+            // TrackerBase interface
+            bool isGeneratorTracker() const override { return true; }
+            auto hasGenerator() const -> bool override {
+                return !!m_generator;
+            }
+            void close() override {
+                TrackerBase::close();
+                // Generator interface only finds out if it has another item on atual move
+                if (m_runState == CompletedSuccessfully && m_generator->next()) {
+                    m_children.clear();
+                    m_runState = Executing;
+                }
+            }
+
+            // IGeneratorTracker interface
+            auto getGenerator() const -> GeneratorBasePtr const& override {
+                return m_generator;
+            }
+            void setGenerator( GeneratorBasePtr&& generator ) override {
+                m_generator = std::move( generator );
+            }
+        };
+        GeneratorTracker::~GeneratorTracker() {}
+    }
+
+    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
+    :   m_runInfo(_config->name()),
+        m_context(getCurrentMutableContext()),
+        m_config(_config),
+        m_reporter(std::move(reporter)),
+        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+    {
+        m_context.setRunner(this);
+        m_context.setConfig(m_config);
+        m_context.setResultCapture(this);
+        m_reporter->testRunStarting(m_runInfo);
+    }
+
+    RunContext::~RunContext() {
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+    }
+
+    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
+    }
+
+    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
+    }
+
+    Totals RunContext::runTest(TestCase const& testCase) {
+        Totals prevTotals = m_totals;
+
+        std::string redirectedCout;
+        std::string redirectedCerr;
+
+        auto const& testInfo = testCase.getTestCaseInfo();
+
+        m_reporter->testCaseStarting(testInfo);
+
+        m_activeTestCase = &testCase;
+
+        ITracker& rootTracker = m_trackerContext.startRun();
+        assert(rootTracker.isSectionTracker());
+        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+        do {
+            m_trackerContext.startCycle();
+            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
+            runCurrentTest(redirectedCout, redirectedCerr);
+        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+        Totals deltaTotals = m_totals.delta(prevTotals);
+        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+            deltaTotals.assertions.failed++;
+            deltaTotals.testCases.passed--;
+            deltaTotals.testCases.failed++;
+        }
+        m_totals.testCases += deltaTotals.testCases;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  redirectedCout,
+                                  redirectedCerr,
+                                  aborting()));
+
+        m_activeTestCase = nullptr;
+        m_testCaseTracker = nullptr;
+
+        return deltaTotals;
+    }
+
+    IConfigPtr RunContext::config() const {
+        return m_config;
+    }
+
+    IStreamingReporter& RunContext::reporter() const {
+        return *m_reporter;
+    }
+
+    void RunContext::assertionEnded(AssertionResult const & result) {
+        if (result.getResultType() == ResultWas::Ok) {
+            m_totals.assertions.passed++;
+            m_lastAssertionPassed = true;
+        } else if (!result.isOk()) {
+            m_lastAssertionPassed = false;
+            if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                m_totals.assertions.failedButOk++;
+            else
+                m_totals.assertions.failed++;
+        }
+        else {
+            m_lastAssertionPassed = true;
+        }
+
+        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+        // and should be let to clear themselves out.
+        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+        if (result.getResultType() != ResultWas::Warning)
+            m_messageScopes.clear();
+
+        // Reset working state
+        resetAssertionInfo();
+        m_lastResult = result;
+    }
+    void RunContext::resetAssertionInfo() {
+        m_lastAssertionInfo.macroName = StringRef();
+        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+    }
+
+    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
+        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
+        if (!sectionTracker.isOpen())
+            return false;
+        m_activeSections.push_back(&sectionTracker);
+
+        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+        m_reporter->sectionStarting(sectionInfo);
+
+        assertions = m_totals.assertions;
+
+        return true;
+    }
+    auto RunContext::acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        using namespace Generators;
+        GeneratorTracker& tracker = GeneratorTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( "generator", lineInfo ) );
+        assert( tracker.isOpen() );
+        m_lastAssertionInfo.lineInfo = lineInfo;
+        return tracker;
+    }
+
+    bool RunContext::testForMissingAssertions(Counts& assertions) {
+        if (assertions.total() != 0)
+            return false;
+        if (!m_config->warnAboutMissingAssertions())
+            return false;
+        if (m_trackerContext.currentTracker().hasChildren())
+            return false;
+        m_totals.assertions.failed++;
+        assertions.failed++;
+        return true;
+    }
+
+    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
+        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        if (!m_activeSections.empty()) {
+            m_activeSections.back()->close();
+            m_activeSections.pop_back();
+        }
+
+        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
+        m_messages.clear();
+        m_messageScopes.clear();
+    }
+
+    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
+        if (m_unfinishedSections.empty())
+            m_activeSections.back()->fail();
+        else
+            m_activeSections.back()->close();
+        m_activeSections.pop_back();
+
+        m_unfinishedSections.push_back(endInfo);
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void RunContext::benchmarkPreparing(std::string const& name) {
+		m_reporter->benchmarkPreparing(name);
+	}
+    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+        m_reporter->benchmarkStarting( info );
+    }
+    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
+        m_reporter->benchmarkEnded( stats );
+    }
+	void RunContext::benchmarkFailed(std::string const & error) {
+		m_reporter->benchmarkFailed(error);
+	}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void RunContext::pushScopedMessage(MessageInfo const & message) {
+        m_messages.push_back(message);
+    }
+
+    void RunContext::popScopedMessage(MessageInfo const & message) {
+        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+    }
+
+    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
+        m_messageScopes.emplace_back( builder );
+    }
+
+    std::string RunContext::getCurrentTestName() const {
+        return m_activeTestCase
+            ? m_activeTestCase->getTestCaseInfo().name
+            : std::string();
+    }
+
+    const AssertionResult * RunContext::getLastResult() const {
+        return &(*m_lastResult);
+    }
+
+    void RunContext::exceptionEarlyReported() {
+        m_shouldReportUnexpected = false;
+    }
+
+    void RunContext::handleFatalErrorCondition( StringRef message ) {
+        // First notify reporter that bad things happened
+        m_reporter->fatalErrorEncountered(message);
+
+        // Don't rebuild the result -- the stringification itself can cause more fatal errors
+        // Instead, fake a result data.
+        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+        tempResult.message = static_cast<std::string>(message);
+        AssertionResult result(m_lastAssertionInfo, tempResult);
+
+        assertionEnded(result);
+
+        handleUnfinishedSections();
+
+        // Recreate section for test case (as we will lose the one that was in scope)
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+        Counts assertions;
+        assertions.failed = 1;
+        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
+        m_reporter->sectionEnded(testCaseSectionStats);
+
+        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+        Totals deltaTotals;
+        deltaTotals.testCases.failed = 1;
+        deltaTotals.assertions.failed = 1;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  std::string(),
+                                  std::string(),
+                                  false));
+        m_totals.testCases.failed++;
+        testGroupEnded(std::string(), m_totals, 1, 1);
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+    }
+
+    bool RunContext::lastAssertionPassed() {
+         return m_lastAssertionPassed;
+    }
+
+    void RunContext::assertionPassed() {
+        m_lastAssertionPassed = true;
+        ++m_totals.assertions.passed;
+        resetAssertionInfo();
+        m_messageScopes.clear();
+    }
+
+    bool RunContext::aborting() const {
+        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
+    }
+
+    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+        m_reporter->sectionStarting(testCaseSection);
+        Counts prevAssertions = m_totals.assertions;
+        double duration = 0;
+        m_shouldReportUnexpected = true;
+        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+        seedRng(*m_config);
+
+        Timer timer;
+        CATCH_TRY {
+            if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
+
+                timer.start();
+                invokeActiveTestCase();
+#else
+                OutputRedirect r(redirectedCout, redirectedCerr);
+                timer.start();
+                invokeActiveTestCase();
+#endif
+            } else {
+                timer.start();
+                invokeActiveTestCase();
+            }
+            duration = timer.getElapsedSeconds();
+        } CATCH_CATCH_ANON (TestFailureException&) {
+            // This just means the test was aborted due to failure
+        } CATCH_CATCH_ALL {
+            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+            // are reported without translation at the point of origin.
+            if( m_shouldReportUnexpected ) {
+                AssertionReaction dummyReaction;
+                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+            }
+        }
+        Counts assertions = m_totals.assertions - prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        m_testCaseTracker->close();
+        handleUnfinishedSections();
+        m_messages.clear();
+        m_messageScopes.clear();
+
+        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
+        m_reporter->sectionEnded(testCaseSectionStats);
+    }
+
+    void RunContext::invokeActiveTestCase() {
+        FatalConditionHandler fatalConditionHandler; // Handle signals
+        m_activeTestCase->invoke();
+        fatalConditionHandler.reset();
+    }
+
+    void RunContext::handleUnfinishedSections() {
+        // If sections ended prematurely due to an exception we stored their
+        // infos here so we can tear them down outside the unwind process.
+        for (auto it = m_unfinishedSections.rbegin(),
+             itEnd = m_unfinishedSections.rend();
+             it != itEnd;
+             ++it)
+            sectionEnded(*it);
+        m_unfinishedSections.clear();
+    }
+
+    void RunContext::handleExpr(
+        AssertionInfo const& info,
+        ITransientExpression const& expr,
+        AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        bool negated = isFalseTest( info.resultDisposition );
+        bool result = expr.getResult() != negated;
+
+        if( result ) {
+            if (!m_includeSuccessfulResults) {
+                assertionPassed();
+            }
+            else {
+                reportExpr(info, ResultWas::Ok, &expr, negated);
+            }
+        }
+        else {
+            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+            populateReaction( reaction );
+        }
+    }
+    void RunContext::reportExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            ITransientExpression const *expr,
+            bool negated ) {
+
+        m_lastAssertionInfo = info;
+        AssertionResultData data( resultType, LazyExpression( negated ) );
+
+        AssertionResult assertionResult{ info, data };
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+        assertionEnded( assertionResult );
+    }
+
+    void RunContext::handleMessage(
+            AssertionInfo const& info,
+            ResultWas::OfType resultType,
+            StringRef const& message,
+            AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        data.message = static_cast<std::string>(message);
+        AssertionResult assertionResult{ m_lastAssertionInfo, data };
+        assertionEnded( assertionResult );
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+    void RunContext::handleUnexpectedExceptionNotThrown(
+            AssertionInfo const& info,
+            AssertionReaction& reaction
+    ) {
+        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+    }
+
+    void RunContext::handleUnexpectedInflightException(
+            AssertionInfo const& info,
+            std::string const& message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = message;
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+        populateReaction( reaction );
+    }
+
+    void RunContext::populateReaction( AssertionReaction& reaction ) {
+        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+    }
+
+    void RunContext::handleIncomplete(
+            AssertionInfo const& info
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+    }
+    void RunContext::handleNonExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            AssertionReaction &reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+
+    IResultCapture& getResultCapture() {
+        if (auto* capture = getCurrentContext().getResultCapture())
+            return *capture;
+        else
+            CATCH_INTERNAL_ERROR("No result capture instance");
+    }
+
+    void seedRng(IConfig const& config) {
+        if (config.rngSeed() != 0) {
+            std::srand(config.rngSeed());
+            rng().seed(config.rngSeed());
+        }
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
+}
+// end catch_run_context.cpp
+// start catch_section.cpp
+
+namespace Catch {
+
+    Section::Section( SectionInfo const& info )
+    :   m_info( info ),
+        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+    {
+        m_timer.start();
+    }
+
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
+            if( uncaught_exceptions() )
+                getResultCapture().sectionEndedEarly( endInfo );
+            else
+                getResultCapture().sectionEnded( endInfo );
+        }
+    }
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+} // end namespace Catch
+// end catch_section.cpp
+// start catch_section_info.cpp
+
+namespace Catch {
+
+    SectionInfo::SectionInfo
+        (   SourceLineInfo const& _lineInfo,
+            std::string const& _name )
+    :   name( _name ),
+        lineInfo( _lineInfo )
+    {}
+
+} // end namespace Catch
+// end catch_section_info.cpp
+// start catch_session.cpp
+
+// start catch_session.h
+
+#include <memory>
+
+namespace Catch {
+
+    class Session : NonCopyable {
+    public:
+
+        Session();
+        ~Session() override;
+
+        void showHelp() const;
+        void libIdentify();
+
+        int applyCommandLine( int argc, char const * const * argv );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+        int applyCommandLine( int argc, wchar_t const * const * argv );
+    #endif
+
+        void useConfigData( ConfigData const& configData );
+
+        template<typename CharT>
+        int run(int argc, CharT const * const argv[]) {
+            if (m_startupExceptions)
+                return 1;
+            int returnCode = applyCommandLine(argc, argv);
+            if (returnCode == 0)
+                returnCode = run();
+            return returnCode;
+        }
+
+        int run();
+
+        clara::Parser const& cli() const;
+        void cli( clara::Parser const& newParser );
+        ConfigData& configData();
+        Config& config();
+    private:
+        int runInternal();
+
+        clara::Parser m_cli;
+        ConfigData m_configData;
+        std::shared_ptr<Config> m_config;
+        bool m_startupExceptions = false;
+    };
+
+} // end namespace Catch
+
+// end catch_session.h
+// start catch_version.h
+
+#include <iosfwd>
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version( Version const& ) = delete;
+        Version& operator=( Version const& ) = delete;
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+    };
+
+    Version const& libraryVersion();
+}
+
+// end catch_version.h
+#include <cstdlib>
+#include <iomanip>
+#include <set>
+#include <iterator>
+
+namespace Catch {
+
+    namespace {
+        const int MaxExitCode = 255;
+
+        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
+            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
+
+            return reporter;
+        }
+
+        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
+            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
+                return createReporter(config->getReporterName(), config);
+            }
+
+            // On older platforms, returning std::unique_ptr<ListeningReporter>
+            // when the return type is std::unique_ptr<IStreamingReporter>
+            // doesn't compile without a std::move call. However, this causes
+            // a warning on newer platforms. Thus, we have to work around
+            // it a bit and downcast the pointer manually.
+            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
+            auto& multi = static_cast<ListeningReporter&>(*ret);
+            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+            for (auto const& listener : listeners) {
+                multi.addListener(listener->create(Catch::ReporterConfig(config)));
+            }
+            multi.addReporter(createReporter(config->getReporterName(), config));
+            return ret;
+        }
+
+        class TestGroup {
+        public:
+            explicit TestGroup(std::shared_ptr<Config> const& config)
+            : m_config{config}
+            , m_context{config, makeReporter(config)}
+            {
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+
+                if (m_matches.empty() && invalidArgs.empty()) {
+                    for (auto const& test : allTestCases)
+                        if (!test.isHidden())
+                            m_tests.emplace(&test);
+                } else {
+                    for (auto const& match : m_matches)
+                        m_tests.insert(match.tests.begin(), match.tests.end());
+                }
+            }
+
+            Totals execute() {
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+                Totals totals;
+                m_context.testGroupStarting(m_config->name(), 1, 1);
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_context.reporter().skipTest(*testCase);
+                }
+
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_context.reporter().noMatchingTestCases(match.name);
+                        totals.error = -1;
+                    }
+                }
+
+                if (!invalidArgs.empty()) {
+                    for (auto const& invalidArg: invalidArgs)
+                         m_context.reporter().reportInvalidArguments(invalidArg);
+                }
+
+                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
+                return totals;
+            }
+
+        private:
+            using Tests = std::set<TestCase const*>;
+
+            std::shared_ptr<Config> m_config;
+            RunContext m_context;
+            Tests m_tests;
+            TestSpec::Matches m_matches;
+        };
+
+        void applyFilenamesAsTags(Catch::IConfig const& config) {
+            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
+            for (auto& testCase : tests) {
+                auto tags = testCase.tags;
+
+                std::string filename = testCase.lineInfo.file;
+                auto lastSlash = filename.find_last_of("\\/");
+                if (lastSlash != std::string::npos) {
+                    filename.erase(0, lastSlash);
+                    filename[0] = '#';
+                }
+
+                auto lastDot = filename.find_last_of('.');
+                if (lastDot != std::string::npos) {
+                    filename.erase(lastDot);
+                }
+
+                tags.push_back(std::move(filename));
+                setTags(testCase, tags);
+            }
+        }
+
+    } // anon namespace
+
+    Session::Session() {
+        static bool alreadyInstantiated = false;
+        if( alreadyInstantiated ) {
+            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
+        }
+
+        // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+        if ( !exceptions.empty() ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+
+            m_startupExceptions = true;
+            Colour colourGuard( Colour::Red );
+            Catch::cerr() << "Errors occurred during startup!" << '\n';
+            // iterate over all exceptions and notify user
+            for ( const auto& ex_ptr : exceptions ) {
+                try {
+                    std::rethrow_exception(ex_ptr);
+                } catch ( std::exception const& ex ) {
+                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
+                }
+            }
+        }
+#endif
+
+        alreadyInstantiated = true;
+        m_cli = makeCommandLineParser( m_configData );
+    }
+    Session::~Session() {
+        Catch::cleanUp();
+    }
+
+    void Session::showHelp() const {
+        Catch::cout()
+                << "\nCatch v" << libraryVersion() << "\n"
+                << m_cli << std::endl
+                << "For more detailed usage please see the project docs\n" << std::endl;
+    }
+    void Session::libIdentify() {
+        Catch::cout()
+                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
+                << std::left << std::setw(16) << "category: " << "testframework\n"
+                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+    }
+
+    int Session::applyCommandLine( int argc, char const * const * argv ) {
+        if( m_startupExceptions )
+            return 1;
+
+        auto result = m_cli.parse( clara::Args( argc, argv ) );
+        if( !result ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+            Catch::cerr()
+                << Colour( Colour::Red )
+                << "\nError(s) in input:\n"
+                << Column( result.errorMessage() ).indent( 2 )
+                << "\n\n";
+            Catch::cerr() << "Run with -? for usage\n" << std::endl;
+            return MaxExitCode;
+        }
+
+        if( m_configData.showHelp )
+            showHelp();
+        if( m_configData.libIdentify )
+            libIdentify();
+        m_config.reset();
+        return 0;
+    }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
+
+        char **utf8Argv = new char *[ argc ];
+
+        for ( int i = 0; i < argc; ++i ) {
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL );
+
+            utf8Argv[ i ] = new char[ bufSize ];
+
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL );
+        }
+
+        int returnCode = applyCommandLine( argc, utf8Argv );
+
+        for ( int i = 0; i < argc; ++i )
+            delete [] utf8Argv[ i ];
+
+        delete [] utf8Argv;
+
+        return returnCode;
+    }
+#endif
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
+    int Session::run() {
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        int exitCode = runInternal();
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        return exitCode;
+    }
+
+    clara::Parser const& Session::cli() const {
+        return m_cli;
+    }
+    void Session::cli( clara::Parser const& newParser ) {
+        m_cli = newParser;
+    }
+    ConfigData& Session::configData() {
+        return m_configData;
+    }
+    Config& Session::config() {
+        if( !m_config )
+            m_config = std::make_shared<Config>( m_configData );
+        return *m_config;
+    }
+
+    int Session::runInternal() {
+        if( m_startupExceptions )
+            return 1;
+
+        if (m_configData.showHelp || m_configData.libIdentify) {
+            return 0;
+        }
+
+        CATCH_TRY {
+            config(); // Force config to be constructed
+
+            seedRng( *m_config );
+
+            if( m_configData.filenamesAsTags )
+                applyFilenamesAsTags( *m_config );
+
+            // Handle list request
+            if( Option<std::size_t> listed = list( m_config ) )
+                return static_cast<int>( *listed );
+
+            TestGroup tests { m_config };
+            auto const totals = tests.execute();
+
+            if( m_config->warnAboutNoTests() && totals.error == -1 )
+                return 2;
+
+            // Note that on unices only the lower 8 bits are usually used, clamping
+            // the return value to 255 prevents false negative when some multiple
+            // of 256 tests has failed
+            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
+        }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        catch( std::exception& ex ) {
+            Catch::cerr() << ex.what() << std::endl;
+            return MaxExitCode;
+        }
+#endif
+    }
+
+} // end namespace Catch
+// end catch_session.cpp
+// start catch_singletons.cpp
+
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        static auto getSingletons() -> std::vector<ISingleton*>*& {
+            static std::vector<ISingleton*>* g_singletons = nullptr;
+            if( !g_singletons )
+                g_singletons = new std::vector<ISingleton*>();
+            return g_singletons;
+        }
+    }
+
+    ISingleton::~ISingleton() {}
+
+    void addSingleton(ISingleton* singleton ) {
+        getSingletons()->push_back( singleton );
+    }
+    void cleanupSingletons() {
+        auto& singletons = getSingletons();
+        for( auto singleton : *singletons )
+            delete singleton;
+        delete singletons;
+        singletons = nullptr;
+    }
+
+} // namespace Catch
+// end catch_singletons.cpp
+// start catch_startup_exception_registry.cpp
+
+namespace Catch {
+void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        CATCH_TRY {
+            m_exceptions.push_back(exception);
+        } CATCH_CATCH_ALL {
+            // If we run out of memory during start-up there's really not a lot more we can do about it
+            std::terminate();
+        }
+    }
+
+    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+        return m_exceptions;
+    }
+
+} // end namespace Catch
+// end catch_startup_exception_registry.cpp
+// start catch_stream.cpp
+
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    Catch::IStream::~IStream() = default;
+
+    namespace Detail { namespace {
+        template<typename WriterF, std::size_t bufferSize=256>
+        class StreamBufImpl : public std::streambuf {
+            char data[bufferSize];
+            WriterF m_writer;
+
+        public:
+            StreamBufImpl() {
+                setp( data, data + sizeof(data) );
+            }
+
+            ~StreamBufImpl() noexcept {
+                StreamBufImpl::sync();
+            }
+
+        private:
+            int overflow( int c ) override {
+                sync();
+
+                if( c != EOF ) {
+                    if( pbase() == epptr() )
+                        m_writer( std::string( 1, static_cast<char>( c ) ) );
+                    else
+                        sputc( static_cast<char>( c ) );
+                }
+                return 0;
+            }
+
+            int sync() override {
+                if( pbase() != pptr() ) {
+                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                    setp( pbase(), epptr() );
+                }
+                return 0;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        struct OutputDebugWriter {
+
+            void operator()( std::string const&str ) {
+                writeToDebugConsole( str );
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class FileStream : public IStream {
+            mutable std::ofstream m_ofs;
+        public:
+            FileStream( StringRef filename ) {
+                m_ofs.open( filename.c_str() );
+                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
+            }
+            ~FileStream() override = default;
+        public: // IStream
+            std::ostream& stream() const override {
+                return m_ofs;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class CoutStream : public IStream {
+            mutable std::ostream m_os;
+        public:
+            // Store the streambuf from cout up-front because
+            // cout may get redirected when running tests
+            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+            ~CoutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class DebugOutStream : public IStream {
+            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+            mutable std::ostream m_os;
+        public:
+            DebugOutStream()
+            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+                m_os( m_streamBuf.get() )
+            {}
+
+            ~DebugOutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+    }} // namespace anon::detail
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    auto makeStream( StringRef const &filename ) -> IStream const* {
+        if( filename.empty() )
+            return new Detail::CoutStream();
+        else if( filename[0] == '%' ) {
+            if( filename == "%debug" )
+                return new Detail::DebugOutStream();
+            else
+                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
+        }
+        else
+            return new Detail::FileStream( filename );
+    }
+
+    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+    struct StringStreams {
+        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
+        std::vector<std::size_t> m_unused;
+        std::ostringstream m_referenceStream; // Used for copy state/ flags from
+
+        auto add() -> std::size_t {
+            if( m_unused.empty() ) {
+                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
+                return m_streams.size()-1;
+            }
+            else {
+                auto index = m_unused.back();
+                m_unused.pop_back();
+                return index;
+            }
+        }
+
+        void release( std::size_t index ) {
+            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+            m_unused.push_back(index);
+        }
+    };
+
+    ReusableStringStream::ReusableStringStream()
+    :   m_index( Singleton<StringStreams>::getMutable().add() ),
+        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
+    {}
+
+    ReusableStringStream::~ReusableStringStream() {
+        static_cast<std::ostringstream*>( m_oss )->str("");
+        m_oss->clear();
+        Singleton<StringStreams>::getMutable().release( m_index );
+    }
+
+    auto ReusableStringStream::str() const -> std::string {
+        return static_cast<std::ostringstream*>( m_oss )->str();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+    std::ostream& cout() { return std::cout; }
+    std::ostream& cerr() { return std::cerr; }
+    std::ostream& clog() { return std::clog; }
+#endif
+}
+// end catch_stream.cpp
+// start catch_string_manip.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cctype>
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        char toLowerCh(char c) {
+            return static_cast<char>( std::tolower( c ) );
+        }
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( std::string const& s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    void toLowerInPlace( std::string& s ) {
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    StringRef trim(StringRef ref) {
+        const auto is_ws = [](char c) {
+            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+        };
+        size_t real_begin = 0;
+        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
+        size_t real_end = ref.size();
+        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
+
+        return ref.substr(real_begin, real_end - real_begin);
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        bool replaced = false;
+        std::size_t i = str.find( replaceThis );
+        while( i != std::string::npos ) {
+            replaced = true;
+            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+            if( i < str.size()-withThis.size() )
+                i = str.find( replaceThis, i+withThis.size() );
+            else
+                i = std::string::npos;
+        }
+        return replaced;
+    }
+
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
+        std::vector<StringRef> subStrings;
+        std::size_t start = 0;
+        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
+            if( str[pos] == delimiter ) {
+                if( pos - start > 1 )
+                    subStrings.push_back( str.substr( start, pos-start ) );
+                start = pos+1;
+            }
+        }
+        if( start < str.size() )
+            subStrings.push_back( str.substr( start, str.size()-start ) );
+        return subStrings;
+    }
+
+    pluralise::pluralise( std::size_t count, std::string const& label )
+    :   m_count( count ),
+        m_label( label )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+}
+// end catch_string_manip.cpp
+// start catch_stringref.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace Catch {
+    StringRef::StringRef( char const* rawChars ) noexcept
+    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
+    {}
+
+    auto StringRef::c_str() const -> char const* {
+        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
+        return m_start;
+    }
+    auto StringRef::data() const noexcept -> char const* {
+        return m_start;
+    }
+
+    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
+        if (start < m_size) {
+            return StringRef(m_start + start, (std::min)(m_size - start, size));
+        } else {
+            return StringRef();
+        }
+    }
+    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+        return m_size == other.m_size
+            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
+    }
+
+    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
+        return os.write(str.data(), str.size());
+    }
+
+    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+        lhs.append(rhs.data(), rhs.size());
+        return lhs;
+    }
+
+} // namespace Catch
+// end catch_stringref.cpp
+// start catch_tag_alias.cpp
+
+namespace Catch {
+    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
+}
+// end catch_tag_alias.cpp
+// start catch_tag_alias_autoregistrar.cpp
+
+namespace Catch {
+
+    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+        CATCH_TRY {
+            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+}
+// end catch_tag_alias_autoregistrar.cpp
+// start catch_tag_alias_registry.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() {}
+
+    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+        auto it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return &(it->second);
+        else
+            return nullptr;
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( auto const& registryKvp : m_registry ) {
+            std::size_t pos = expandedTestSpec.find( registryKvp.first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    registryKvp.second.tag +
+                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+                      "error: tag alias, '" << alias << "' already registered.\n"
+                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+                      << "\tRedefined at: " << lineInfo );
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() {}
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+} // end namespace Catch
+// end catch_tag_alias_registry.cpp
+// start catch_test_case_info.cpp
+
+#include <cctype>
+#include <exception>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+            if( startsWith( tag, '.' ) ||
+                tag == "!hide" )
+                return TestCaseInfo::IsHidden;
+            else if( tag == "!throws" )
+                return TestCaseInfo::Throws;
+            else if( tag == "!shouldfail" )
+                return TestCaseInfo::ShouldFail;
+            else if( tag == "!mayfail" )
+                return TestCaseInfo::MayFail;
+            else if( tag == "!nonportable" )
+                return TestCaseInfo::NonPortable;
+            else if( tag == "!benchmark" )
+                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
+            else
+                return TestCaseInfo::None;
+        }
+        bool isReservedTag( std::string const& tag ) {
+            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+        }
+        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+            CATCH_ENFORCE( !isReservedTag(tag),
+                          "Tag name: [" << tag << "] is not allowed.\n"
+                          << "Tag names starting with non alphanumeric characters are reserved\n"
+                          << _lineInfo );
+        }
+    }
+
+    TestCase makeTestCase(  ITestInvoker* _testCase,
+                            std::string const& _className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& _lineInfo )
+    {
+        bool isHidden = false;
+
+        // Parse out tags
+        std::vector<std::string> tags;
+        std::string desc, tag;
+        bool inTag = false;
+        for (char c : nameAndTags.tags) {
+            if( !inTag ) {
+                if( c == '[' )
+                    inTag = true;
+                else
+                    desc += c;
+            }
+            else {
+                if( c == ']' ) {
+                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
+                        isHidden = true;
+                    else if( prop == TestCaseInfo::None )
+                        enforceNotReservedTag( tag, _lineInfo );
+
+                    // Merged hide tags like `[.approvals]` should be added as
+                    // `[.][approvals]`. The `[.]` is added at later point, so
+                    // we only strip the prefix
+                    if (startsWith(tag, '.') && tag.size() > 1) {
+                        tag.erase(0, 1);
+                    }
+                    tags.push_back( tag );
+                    tag.clear();
+                    inTag = false;
+                }
+                else
+                    tag += c;
+            }
+        }
+        if( isHidden ) {
+            tags.push_back( "." );
+        }
+
+        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
+        return TestCase( _testCase, std::move(info) );
+    }
+
+    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
+        std::sort(begin(tags), end(tags));
+        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
+        testCaseInfo.lcaseTags.clear();
+
+        for( auto const& tag : tags ) {
+            std::string lcaseTag = toLower( tag );
+            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+            testCaseInfo.lcaseTags.push_back( lcaseTag );
+        }
+        testCaseInfo.tags = std::move(tags);
+    }
+
+    TestCaseInfo::TestCaseInfo( std::string const& _name,
+                                std::string const& _className,
+                                std::string const& _description,
+                                std::vector<std::string> const& _tags,
+                                SourceLineInfo const& _lineInfo )
+    :   name( _name ),
+        className( _className ),
+        description( _description ),
+        lineInfo( _lineInfo ),
+        properties( None )
+    {
+        setTags( *this, _tags );
+    }
+
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+    std::string TestCaseInfo::tagsAsString() const {
+        std::string ret;
+        // '[' and ']' per tag
+        std::size_t full_size = 2 * tags.size();
+        for (const auto& tag : tags) {
+            full_size += tag.size();
+        }
+        ret.reserve(full_size);
+        for (const auto& tag : tags) {
+            ret.push_back('[');
+            ret.append(tag);
+            ret.push_back(']');
+        }
+
+        return ret;
+    }
+
+    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
+
+    TestCase TestCase::withName( std::string const& _newName ) const {
+        TestCase other( *this );
+        other.name = _newName;
+        return other;
+    }
+
+    void TestCase::invoke() const {
+        test->invoke();
+    }
+
+    bool TestCase::operator == ( TestCase const& other ) const {
+        return  test.get() == other.test.get() &&
+                name == other.name &&
+                className == other.className;
+    }
+
+    bool TestCase::operator < ( TestCase const& other ) const {
+        return name < other.name;
+    }
+
+    TestCaseInfo const& TestCase::getTestCaseInfo() const
+    {
+        return *this;
+    }
+
+} // end namespace Catch
+// end catch_test_case_info.cpp
+// start catch_test_case_registry_impl.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+
+        std::vector<TestCase> sorted = unsortedTestCases;
+
+        switch( config.runOrder() ) {
+            case RunTests::InLexicographicalOrder:
+                std::sort( sorted.begin(), sorted.end() );
+                break;
+            case RunTests::InRandomOrder:
+                seedRng( config );
+                std::shuffle( sorted.begin(), sorted.end(), rng() );
+                break;
+            case RunTests::InDeclarationOrder:
+                // already in declaration order
+                break;
+        }
+        return sorted;
+    }
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
+        return !testCase.throws() || config.allowThrows();
+    }
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
+    }
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+        std::set<TestCase> seenFunctions;
+        for( auto const& function : functions ) {
+            auto prev = seenFunctions.insert( function );
+            CATCH_ENFORCE( prev.second,
+                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
+        }
+    }
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCase> filtered;
+        filtered.reserve( testCases.size() );
+        for (auto const& testCase : testCases) {
+            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
+                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
+                filtered.push_back(testCase);
+            }
+        }
+        return filtered;
+    }
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    void TestRegistry::registerTest( TestCase const& testCase ) {
+        std::string name = testCase.getTestCaseInfo().name;
+        if( name.empty() ) {
+            ReusableStringStream rss;
+            rss << "Anonymous test case " << ++m_unnamedCount;
+            return registerTest( testCase.withName( rss.str() ) );
+        }
+        m_functions.push_back( testCase );
+    }
+
+    std::vector<TestCase> const& TestRegistry::getAllTests() const {
+        return m_functions;
+    }
+    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+        if( m_sortedFunctions.empty() )
+            enforceNoDuplicateTestCases( m_functions );
+
+        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+            m_sortedFunctions = sortTests( config, m_functions );
+            m_currentSortOrder = config.runOrder();
+        }
+        return m_sortedFunctions;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
+
+    void TestInvokerAsFunction::invoke() const {
+        m_testAsFunction();
+    }
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
+        std::string className(classOrQualifiedMethodName);
+        if( startsWith( className, '&' ) )
+        {
+            std::size_t lastColons = className.rfind( "::" );
+            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+            if( penultimateColons == std::string::npos )
+                penultimateColons = 1;
+            className = className.substr( penultimateColons, lastColons-penultimateColons );
+        }
+        return className;
+    }
+
+} // end namespace Catch
+// end catch_test_case_registry_impl.cpp
+// start catch_test_case_tracker.cpp
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <memory>
+#include <sstream>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+    :   name( _name ),
+        location( _location )
+    {}
+
+    ITracker::~ITracker() = default;
+
+    ITracker& TrackerContext::startRun() {
+        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+        m_currentTracker = nullptr;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+    void TrackerContext::endRun() {
+        m_rootTracker.reset();
+        m_currentTracker = nullptr;
+        m_runState = NotStarted;
+    }
+
+    void TrackerContext::startCycle() {
+        m_currentTracker = m_rootTracker.get();
+        m_runState = Executing;
+    }
+    void TrackerContext::completeCycle() {
+        m_runState = CompletedCycle;
+    }
+
+    bool TrackerContext::completedCycle() const {
+        return m_runState == CompletedCycle;
+    }
+    ITracker& TrackerContext::currentTracker() {
+        return *m_currentTracker;
+    }
+    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+        m_currentTracker = tracker;
+    }
+
+    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   m_nameAndLocation( nameAndLocation ),
+        m_ctx( ctx ),
+        m_parent( parent )
+    {}
+
+    NameAndLocation const& TrackerBase::nameAndLocation() const {
+        return m_nameAndLocation;
+    }
+    bool TrackerBase::isComplete() const {
+        return m_runState == CompletedSuccessfully || m_runState == Failed;
+    }
+    bool TrackerBase::isSuccessfullyCompleted() const {
+        return m_runState == CompletedSuccessfully;
+    }
+    bool TrackerBase::isOpen() const {
+        return m_runState != NotStarted && !isComplete();
+    }
+    bool TrackerBase::hasChildren() const {
+        return !m_children.empty();
+    }
+
+    void TrackerBase::addChild( ITrackerPtr const& child ) {
+        m_children.push_back( child );
+    }
+
+    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
+        auto it = std::find_if( m_children.begin(), m_children.end(),
+            [&nameAndLocation]( ITrackerPtr const& tracker ){
+                return
+                    tracker->nameAndLocation().location == nameAndLocation.location &&
+                    tracker->nameAndLocation().name == nameAndLocation.name;
+            } );
+        return( it != m_children.end() )
+            ? *it
+            : nullptr;
+    }
+    ITracker& TrackerBase::parent() {
+        assert( m_parent ); // Should always be non-null except for root
+        return *m_parent;
+    }
+
+    void TrackerBase::openChild() {
+        if( m_runState != ExecutingChildren ) {
+            m_runState = ExecutingChildren;
+            if( m_parent )
+                m_parent->openChild();
+        }
+    }
+
+    bool TrackerBase::isSectionTracker() const { return false; }
+    bool TrackerBase::isGeneratorTracker() const { return false; }
+
+    void TrackerBase::open() {
+        m_runState = Executing;
+        moveToThis();
+        if( m_parent )
+            m_parent->openChild();
+    }
+
+    void TrackerBase::close() {
+
+        // Close any still open children (e.g. generators)
+        while( &m_ctx.currentTracker() != this )
+            m_ctx.currentTracker().close();
+
+        switch( m_runState ) {
+            case NeedsAnotherRun:
+                break;
+
+            case Executing:
+                m_runState = CompletedSuccessfully;
+                break;
+            case ExecutingChildren:
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
+                    m_runState = CompletedSuccessfully;
+                break;
+
+            case NotStarted:
+            case CompletedSuccessfully:
+            case Failed:
+                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+        }
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::fail() {
+        m_runState = Failed;
+        if( m_parent )
+            m_parent->markAsNeedingAnotherRun();
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::markAsNeedingAnotherRun() {
+        m_runState = NeedsAnotherRun;
+    }
+
+    void TrackerBase::moveToParent() {
+        assert( m_parent );
+        m_ctx.setCurrentTracker( m_parent );
+    }
+    void TrackerBase::moveToThis() {
+        m_ctx.setCurrentTracker( this );
+    }
+
+    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   TrackerBase( nameAndLocation, ctx, parent ),
+        m_trimmed_name(trim(nameAndLocation.name))
+    {
+        if( parent ) {
+            while( !parent->isSectionTracker() )
+                parent = &parent->parent();
+
+            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+            addNextFilters( parentSection.m_filters );
+        }
+    }
+
+    bool SectionTracker::isComplete() const {
+        bool complete = true;
+
+        if ((m_filters.empty() || m_filters[0] == "")
+            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
+            complete = TrackerBase::isComplete();
+        }
+        return complete;
+    }
+
+    bool SectionTracker::isSectionTracker() const { return true; }
+
+    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+        std::shared_ptr<SectionTracker> section;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isSectionTracker() );
+            section = std::static_pointer_cast<SectionTracker>( childTracker );
+        }
+        else {
+            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
+            currentTracker.addChild( section );
+        }
+        if( !ctx.completedCycle() )
+            section->tryOpen();
+        return *section;
+    }
+
+    void SectionTracker::tryOpen() {
+        if( !isComplete() )
+            open();
+    }
+
+    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+        if( !filters.empty() ) {
+            m_filters.reserve( m_filters.size() + filters.size() + 2 );
+            m_filters.push_back(""); // Root - should never be consulted
+            m_filters.push_back(""); // Test Case - not a section filter
+            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+        }
+    }
+    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
+        if( filters.size() > 1 )
+            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
+    }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_test_case_tracker.cpp
+// start catch_test_registry.cpp
+
+namespace Catch {
+
+    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
+        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
+    }
+
+    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
+
+    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+        CATCH_TRY {
+            getMutableRegistryHub()
+                    .registerTest(
+                        makeTestCase(
+                            invoker,
+                            extractClassName( classOrMethod ),
+                            nameAndTags,
+                            lineInfo));
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+    AutoReg::~AutoReg() = default;
+}
+// end catch_test_registry.cpp
+// start catch_test_spec.cpp
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
+    {}
+
+    TestSpec::Pattern::~Pattern() = default;
+
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+
+    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+        return m_wildcardPattern.matches( testCase.name );
+    }
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( toLower( tag ) )
+    {}
+
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find(begin(testCase.lcaseTags),
+                         end(testCase.lcaseTags),
+                         m_tag) != end(testCase.lcaseTags);
+    }
+
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
+    : Pattern( underlyingPattern->name() )
+    , m_underlyingPattern( underlyingPattern )
+    {}
+
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
+        return !m_underlyingPattern->matches( testCase );
+    }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
+    }
+
+    std::string TestSpec::Filter::name() const {
+        std::string name;
+        for( auto const& p : m_patterns )
+            name += p->name();
+        return name;
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
+    }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+            std::vector<TestCase const*> currentMatches;
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test ) )
+                    currentMatches.emplace_back( &test );
+            return FilterMatch{ filter.name(), currentMatches };
+        } );
+        return matches;
+    }
+
+    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
+        return  (m_invalidArgs);
+    }
+
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
+        m_realPatternPos = 0;
+
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+          //if visitChar fails
+           if( !visitChar( m_arg[m_pos] ) ){
+               m_testSpec.m_invalidArgs.push_back(arg);
+               break;
+           }
+        endMode();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return m_testSpec;
+    }
+    bool TestSpecParser::visitChar( char c ) {
+        if( (m_mode != EscapedName) && (c == '\\') ) {
+            escape();
+            addCharToPattern(c);
+            return true;
+        }else if((m_mode != EscapedName) && (c == ',') )  {
+            return separate();
+        }
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return true;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            addCharToPattern(c);
+            return true;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return true;
+            break;
+        }
+
+        m_substring += c;
+        if( !isControlChar( c ) ) {
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+        return true;
+    }
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
+        m_mode = mode;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addNamePattern();
+        case Tag:
+            return addTagPattern();
+        case EscapedName:
+            revertBackToLastMode();
+            return;
+        case None:
+        default:
+            return startNewMode( None );
+        }
+    }
+    void TestSpecParser::escape() {
+        saveLastMode();
+        m_mode = EscapedName;
+        m_escapeChars.push_back(m_realPatternPos);
+    }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_patterns.empty() ) {
+            m_testSpec.m_filters.push_back( m_currentFilter );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    void TestSpecParser::saveLastMode() {
+      lastMode = m_mode;
+    }
+
+    void TestSpecParser::revertBackToLastMode() {
+      m_mode = lastMode;
+    }
+
+    bool TestSpecParser::separate() {
+      if( (m_mode==QuotedName) || (m_mode==Tag) ){
+         //invalid argument, signal failure to previous scope.
+         m_mode = None;
+         m_pos = m_arg.size();
+         m_substring.clear();
+         m_patternName.clear();
+         return false;
+      }
+      endMode();
+      addFilter();
+      return true; //success
+    }
+
+    std::string TestSpecParser::preprocessPattern() {
+        std::string token = m_patternName;
+        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
+            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
+        m_escapeChars.clear();
+        if (startsWith(token, "exclude:")) {
+            m_exclusion = true;
+            token = token.substr(8);
+        }
+
+        m_patternName.clear();
+
+        return token;
+    }
+
+    void TestSpecParser::addNamePattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
+            if (m_exclusion)
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    void TestSpecParser::addTagPattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
+            // we have to create a separate hide tag and shorten the real one
+            if (token.size() > 1 && token[0] == '.') {
+                token.erase(token.begin());
+                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
+                if (m_exclusion) {
+                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+                }
+                m_currentFilter.m_patterns.push_back(pattern);
+            }
+
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
+
+            if (m_exclusion) {
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            }
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    TestSpec parseTestSpec( std::string const& arg ) {
+        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+    }
+
+} // namespace Catch
+// end catch_test_spec_parser.cpp
+// start catch_timer.cpp
+
+#include <chrono>
+
+static const uint64_t nanosecondsInSecond = 1000000000;
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+    }
+
+    namespace {
+        auto estimateClockResolution() -> uint64_t {
+            uint64_t sum = 0;
+            static const uint64_t iterations = 1000000;
+
+            auto startTime = getCurrentNanosecondsSinceEpoch();
+
+            for( std::size_t i = 0; i < iterations; ++i ) {
+
+                uint64_t ticks;
+                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
+                do {
+                    ticks = getCurrentNanosecondsSinceEpoch();
+                } while( ticks == baseTicks );
+
+                auto delta = ticks - baseTicks;
+                sum += delta;
+
+                // If we have been calibrating for over 3 seconds -- the clock
+                // is terrible and we should move on.
+                // TBD: How to signal that the measured resolution is probably wrong?
+                if (ticks > startTime + 3 * nanosecondsInSecond) {
+                    return sum / ( i + 1u );
+                }
+            }
+
+            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
+            // - and potentially do more iterations if there's a high variance.
+            return sum/iterations;
+        }
+    }
+    auto getEstimatedClockResolution() -> uint64_t {
+        static auto s_resolution = estimateClockResolution();
+        return s_resolution;
+    }
+
+    void Timer::start() {
+       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+    }
+    auto Timer::getElapsedNanoseconds() const -> uint64_t {
+        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+    }
+    auto Timer::getElapsedMicroseconds() const -> uint64_t {
+        return getElapsedNanoseconds()/1000;
+    }
+    auto Timer::getElapsedMilliseconds() const -> unsigned int {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    auto Timer::getElapsedSeconds() const -> double {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch
+// end catch_timer.cpp
+// start catch_tostring.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#    pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+// Enable specific decls locally
+#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+    const std::string unprintableString = "{?}";
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                int one = 1;
+                // If the lowest byte we read is non-zero, we can assume
+                // that little endian format is used.
+                auto value = *reinterpret_cast<char*>(&one);
+                return value ? Little : Big;
+            }
+        };
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size ) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        ReusableStringStream rss;
+        rss << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return rss.str();
+    }
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+    if (Catch::isnan(value)) {
+        return "nan";
+    }
+
+    ReusableStringStream rss;
+    rss << std::setprecision( precision )
+        << std::fixed
+        << value;
+    std::string d = rss.str();
+    std::size_t i = d.find_last_not_of( '0' );
+    if( i != std::string::npos && i != d.size()-1 ) {
+        if( d[i] == '.' )
+            i++;
+        d = d.substr( 0, i+1 );
+    }
+    return d;
+}
+
+//// ======================================================= ////
+//
+//   Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+    if (!getCurrentContext().getConfig()->showInvisibles()) {
+        return '"' + str + '"';
+    }
+
+    std::string s("\"");
+    for (char c : str) {
+        switch (c) {
+        case '\n':
+            s.append("\\n");
+            break;
+        case '\t':
+            s.append("\\t");
+            break;
+        default:
+            s.push_back(c);
+            break;
+        }
+    }
+    s.append("\"");
+    return s;
+}
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+    return ::Catch::Detail::stringify(std::string{ str });
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<char*>::convert(char* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+    return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#endif
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
+std::string StringMaker<int>::convert(int value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<bool>::convert(bool b) {
+    return b ? "true" : "false";
+}
+
+std::string StringMaker<signed char>::convert(signed char value) {
+    if (value == '\r') {
+        return "'\\r'";
+    } else if (value == '\f') {
+        return "'\\f'";
+    } else if (value == '\n') {
+        return "'\\n'";
+    } else if (value == '\t') {
+        return "'\\t'";
+    } else if ('\0' <= value && value < ' ') {
+        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+    } else {
+        char chstr[] = "' '";
+        chstr[1] = value;
+        return chstr;
+    }
+}
+std::string StringMaker<char>::convert(char c) {
+    return ::Catch::Detail::stringify(static_cast<signed char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char c) {
+    return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+
+std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
+    return "nullptr";
+}
+
+int StringMaker<float>::precision = 5;
+
+std::string StringMaker<float>::convert(float value) {
+    return fpToString(value, precision) + 'f';
+}
+
+int StringMaker<double>::precision = 10;
+
+std::string StringMaker<double>::convert(double value) {
+    return fpToString(value, precision);
+}
+
+std::string ratio_string<std::atto>::symbol() { return "a"; }
+std::string ratio_string<std::femto>::symbol() { return "f"; }
+std::string ratio_string<std::pico>::symbol() { return "p"; }
+std::string ratio_string<std::nano>::symbol() { return "n"; }
+std::string ratio_string<std::micro>::symbol() { return "u"; }
+std::string ratio_string<std::milli>::symbol() { return "m"; }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_tostring.cpp
+// start catch_totals.cpp
+
+namespace Catch {
+
+    Counts Counts::operator - ( Counts const& other ) const {
+        Counts diff;
+        diff.passed = passed - other.passed;
+        diff.failed = failed - other.failed;
+        diff.failedButOk = failedButOk - other.failedButOk;
+        return diff;
+    }
+
+    Counts& Counts::operator += ( Counts const& other ) {
+        passed += other.passed;
+        failed += other.failed;
+        failedButOk += other.failedButOk;
+        return *this;
+    }
+
+    std::size_t Counts::total() const {
+        return passed + failed + failedButOk;
+    }
+    bool Counts::allPassed() const {
+        return failed == 0 && failedButOk == 0;
+    }
+    bool Counts::allOk() const {
+        return failed == 0;
+    }
+
+    Totals Totals::operator - ( Totals const& other ) const {
+        Totals diff;
+        diff.assertions = assertions - other.assertions;
+        diff.testCases = testCases - other.testCases;
+        return diff;
+    }
+
+    Totals& Totals::operator += ( Totals const& other ) {
+        assertions += other.assertions;
+        testCases += other.testCases;
+        return *this;
+    }
+
+    Totals Totals::delta( Totals const& prevTotals ) const {
+        Totals diff = *this - prevTotals;
+        if( diff.assertions.failed > 0 )
+            ++diff.testCases.failed;
+        else if( diff.assertions.failedButOk > 0 )
+            ++diff.testCases.failedButOk;
+        else
+            ++diff.testCases.passed;
+        return diff;
+    }
+
+}
+// end catch_totals.cpp
+// start catch_uncaught_exceptions.cpp
+
+#include <exception>
+
+namespace Catch {
+    bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+  }
+} // end namespace Catch
+// end catch_uncaught_exceptions.cpp
+// start catch_version.cpp
+
+#include <ostream>
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    Version const& libraryVersion() {
+        static Version version( 2, 11, 0, "", 0 );
+        return version;
+    }
+
+}
+// end catch_version.cpp
+// start catch_wildcard_pattern.cpp
+
+namespace Catch {
+
+    WildcardPattern::WildcardPattern( std::string const& pattern,
+                                      CaseSensitive::Choice caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_pattern( normaliseString( pattern ) )
+    {
+        if( startsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 1 );
+            m_wildcard = WildcardAtStart;
+        }
+        if( endsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+        }
+    }
+
+    bool WildcardPattern::matches( std::string const& str ) const {
+        switch( m_wildcard ) {
+            case NoWildcard:
+                return m_pattern == normaliseString( str );
+            case WildcardAtStart:
+                return endsWith( normaliseString( str ), m_pattern );
+            case WildcardAtEnd:
+                return startsWith( normaliseString( str ), m_pattern );
+            case WildcardAtBothEnds:
+                return contains( normaliseString( str ), m_pattern );
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown enum" );
+        }
+    }
+
+    std::string WildcardPattern::normaliseString( std::string const& str ) const {
+        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
+    }
+}
+// end catch_wildcard_pattern.cpp
+// start catch_xmlwriter.cpp
+
+#include <iomanip>
+#include <type_traits>
+
+using uchar = unsigned char;
+
+namespace Catch {
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+        os.flags(f);
+    }
+
+    bool shouldNewline(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
+    }
+
+    bool shouldIndent(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
+    }
+
+} // anonymous namespace
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: http://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            uchar c = m_str[idx];
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: http://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    uchar nc = m_str[idx + n];
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
+    :   m_writer( writer ),
+        m_fmt(fmt)
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+    :   m_writer( other.m_writer ),
+        m_fmt(other.m_fmt)
+    {
+        other.m_writer = nullptr;
+        other.m_fmt = XmlFormatting::None;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        m_fmt = other.m_fmt;
+        other.m_fmt = XmlFormatting::None;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if (m_writer) {
+            m_writer->endElement(m_fmt);
+        }
+    }
+
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
+        m_writer->writeText( text, fmt );
+        return *this;
+    }
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        writeDeclaration();
+    }
+
+    XmlWriter::~XmlWriter() {
+        while (!m_tags.empty()) {
+            endElement();
+        }
+        newlineIfNecessary();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+            m_indent += "  ";
+        }
+        m_os << '<' << name;
+        m_tags.push_back( name );
+        m_tagIsOpen = true;
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
+        ScopedElement scoped( this, fmt );
+        startElement( name, fmt );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
+        m_indent = m_indent.substr(0, m_indent.size() - 2);
+
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        } else {
+            newlineIfNecessary();
+            if (shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << "</" << m_tags.back() << ">";
+        }
+        m_os << std::flush;
+        applyFormatting(fmt);
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if (tagWasOpen && shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << XmlEncode( text );
+            applyFormatting(fmt);
+        }
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
+        ensureTagClosed();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+        }
+        m_os << "<!--" << text << "-->";
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    void XmlWriter::writeStylesheetRef( std::string const& url ) {
+        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+    }
+
+    XmlWriter& XmlWriter::writeBlankLine() {
+        ensureTagClosed();
+        m_os << '\n';
+        return *this;
+    }
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << '>' << std::flush;
+            newlineIfNecessary();
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::applyFormatting(XmlFormatting fmt) {
+        m_needsNewline = shouldNewline(fmt);
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << std::endl;
+            m_needsNewline = false;
+        }
+    }
+}
+// end catch_xmlwriter.cpp
+// start catch_reporter_bases.cpp
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result) {
+        result.getExpandedExpression();
+    }
+
+    // Because formatting using c++ streams is stateful, drop down to C is required
+    // Alternatively we could use stringstream, but its performance is... not good.
+    std::string getFormattedDuration( double duration ) {
+        // Max exponent + 1 is required to represent the whole part
+        // + 1 for decimal point
+        // + 3 for the 3 decimal places
+        // + 1 for null terminator
+        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+        char buffer[maxDoubleSize];
+
+        // Save previous errno, to prevent sprintf from overwriting it
+        ErrnoGuard guard;
+#ifdef _MSC_VER
+        sprintf_s(buffer, "%.3f", duration);
+#else
+        std::sprintf(buffer, "%.3f", duration);
+#endif
+        return std::string(buffer);
+    }
+
+    std::string serializeFilters( std::vector<std::string> const& container ) {
+        ReusableStringStream oss;
+        bool first = true;
+        for (auto&& filter : container)
+        {
+            if (!first)
+                oss << ' ';
+            else
+                first = false;
+
+            oss << filter;
+        }
+        return oss.str();
+    }
+
+    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
+        :StreamingReporterBase(_config) {}
+
+    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
+        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
+    }
+
+    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
+
+    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
+        return false;
+    }
+
+} // end namespace Catch
+// end catch_reporter_bases.cpp
+// start catch_reporter_compact.cpp
+
+namespace {
+
+#ifdef CATCH_PLATFORM_MAC
+    const char* failedString() { return "FAILED"; }
+    const char* passedString() { return "PASSED"; }
+#else
+    const char* failedString() { return "failed"; }
+    const char* passedString() { return "passed"; }
+#endif
+
+    // Colour::LightGrey
+    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
+
+    std::string bothOrAll( std::size_t count ) {
+        return count == 1 ? std::string() :
+               count == 2 ? "both " : "all " ;
+    }
+
+} // anon namespace
+
+namespace Catch {
+namespace {
+// Colour, message variants:
+// - white: No tests ran.
+// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// -   red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+void printTotals(std::ostream& out, const Totals& totals) {
+    if (totals.testCases.total() == 0) {
+        out << "No tests ran.";
+    } else if (totals.testCases.failed == totals.testCases.total()) {
+        Colour colour(Colour::ResultError);
+        const std::string qualify_assertions_failed =
+            totals.assertions.failed == totals.assertions.total() ?
+            bothOrAll(totals.assertions.failed) : std::string();
+        out <<
+            "Failed " << bothOrAll(totals.testCases.failed)
+            << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << qualify_assertions_failed <<
+            pluralise(totals.assertions.failed, "assertion") << '.';
+    } else if (totals.assertions.total() == 0) {
+        out <<
+            "Passed " << bothOrAll(totals.testCases.total())
+            << pluralise(totals.testCases.total(), "test case")
+            << " (no assertions).";
+    } else if (totals.assertions.failed) {
+        Colour colour(Colour::ResultError);
+        out <<
+            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
+    } else {
+        Colour colour(Colour::ResultSuccess);
+        out <<
+            "Passed " << bothOrAll(totals.testCases.passed)
+            << pluralise(totals.testCases.passed, "test case") <<
+            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
+    }
+}
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+    AssertionPrinter(AssertionPrinter const&) = delete;
+    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream)
+        , result(_stats.assertionResult)
+        , messages(_stats.infoMessages)
+        , itMessage(_stats.infoMessages.begin())
+        , printInfoMessages(_printInfoMessages) {}
+
+    void print() {
+        printSourceInfo();
+
+        itMessage = messages.begin();
+
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            printResultType(Colour::ResultSuccess, passedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            if (!result.hasExpression())
+                printRemainingMessages(Colour::None);
+            else
+                printRemainingMessages();
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk())
+                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
+            else
+                printResultType(Colour::Error, failedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            printRemainingMessages();
+            break;
+        case ResultWas::ThrewException:
+            printResultType(Colour::Error, failedString());
+            printIssue("unexpected exception with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::FatalErrorCondition:
+            printResultType(Colour::Error, failedString());
+            printIssue("fatal error condition with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::DidntThrowException:
+            printResultType(Colour::Error, failedString());
+            printIssue("expected exception, got none");
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::Info:
+            printResultType(Colour::None, "info");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::Warning:
+            printResultType(Colour::None, "warning");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::ExplicitFailure:
+            printResultType(Colour::Error, failedString());
+            printIssue("explicitly");
+            printRemainingMessages(Colour::None);
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            printResultType(Colour::Error, "** internal error **");
+            break;
+        }
+    }
+
+private:
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ':';
+    }
+
+    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
+        if (!passOrFail.empty()) {
+            {
+                Colour colourGuard(colour);
+                stream << ' ' << passOrFail;
+            }
+            stream << ':';
+        }
+    }
+
+    void printIssue(std::string const& issue) const {
+        stream << ' ' << issue;
+    }
+
+    void printExpressionWas() {
+        if (result.hasExpression()) {
+            stream << ';';
+            {
+                Colour colour(dimColour());
+                stream << " expression was:";
+            }
+            printOriginalExpression();
+        }
+    }
+
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << ' ' << result.getExpression();
+        }
+    }
+
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            {
+                Colour colour(dimColour());
+                stream << " for: ";
+            }
+            stream << result.getExpandedExpression();
+        }
+    }
+
+    void printMessage() {
+        if (itMessage != messages.end()) {
+            stream << " '" << itMessage->message << '\'';
+            ++itMessage;
+        }
+    }
+
+    void printRemainingMessages(Colour::Code colour = dimColour()) {
+        if (itMessage == messages.end())
+            return;
+
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+
+        {
+            Colour colourGuard(colour);
+            stream << " with " << pluralise(N, "message") << ':';
+        }
+
+        while (itMessage != itEnd) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                printMessage();
+                if (itMessage != itEnd) {
+                    Colour colourGuard(dimColour());
+                    stream << " and";
+                }
+                continue;
+            }
+            ++itMessage;
+        }
+    }
+
+private:
+    std::ostream& stream;
+    AssertionResult const& result;
+    std::vector<MessageInfo> messages;
+    std::vector<MessageInfo>::const_iterator itMessage;
+    bool printInfoMessages;
+};
+
+} // anon namespace
+
+        std::string CompactReporter::getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        ReporterPreferences CompactReporter::getPreferences() const {
+            return m_reporterPrefs;
+        }
+
+        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
+
+        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning )
+                    return false;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+            printer.print();
+
+            stream << std::endl;
+            return true;
+        }
+
+        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+            if (m_config->showDurations() == ShowDurations::Always) {
+                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+        }
+
+        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+            printTotals( stream, _testRunStats.totals );
+            stream << '\n' << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+        CompactReporter::~CompactReporter() {}
+
+    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+// end catch_reporter_compact.cpp
+// start catch_reporter_console.cpp
+
+#include <cfloat>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled and default is missing) is enabled
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+// For simplicity, benchmarking-only helpers are always enabled
+#  pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream),
+        stats(_stats),
+        result(_stats.assertionResult),
+        colour(Colour::None),
+        message(result.getMessage()),
+        messages(_stats.infoMessages),
+        printInfoMessages(_printInfoMessages) {
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            colour = Colour::Success;
+            passOrFail = "PASSED";
+            //if( result.hasMessage() )
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk()) {
+                colour = Colour::Success;
+                passOrFail = "FAILED - but was ok";
+            } else {
+                colour = Colour::Error;
+                passOrFail = "FAILED";
+            }
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ThrewException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to unexpected exception with ";
+            if (_stats.infoMessages.size() == 1)
+                messageLabel += "message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel += "messages";
+            break;
+        case ResultWas::FatalErrorCondition:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to a fatal error condition";
+            break;
+        case ResultWas::DidntThrowException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "because no exception was thrown where one was expected";
+            break;
+        case ResultWas::Info:
+            messageLabel = "info";
+            break;
+        case ResultWas::Warning:
+            messageLabel = "warning";
+            break;
+        case ResultWas::ExplicitFailure:
+            passOrFail = "FAILED";
+            colour = Colour::Error;
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "explicitly with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "explicitly with messages";
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            passOrFail = "** internal error **";
+            colour = Colour::Error;
+            break;
+        }
+    }
+
+    void print() const {
+        printSourceInfo();
+        if (stats.totals.assertions.total() > 0) {
+            printResultType();
+            printOriginalExpression();
+            printReconstructedExpression();
+        } else {
+            stream << '\n';
+        }
+        printMessage();
+    }
+
+private:
+    void printResultType() const {
+        if (!passOrFail.empty()) {
+            Colour colourGuard(colour);
+            stream << passOrFail << ":\n";
+        }
+    }
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            Colour colourGuard(Colour::OriginalExpression);
+            stream << "  ";
+            stream << result.getExpressionInMacro();
+            stream << '\n';
+        }
+    }
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << "with expansion:\n";
+            Colour colourGuard(Colour::ReconstructedExpression);
+            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
+        }
+    }
+    void printMessage() const {
+        if (!messageLabel.empty())
+            stream << messageLabel << ':' << '\n';
+        for (auto const& msg : messages) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || msg.type != ResultWas::Info)
+                stream << Column(msg.message).indent(2) << '\n';
+        }
+    }
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ": ";
+    }
+
+    std::ostream& stream;
+    AssertionStats const& stats;
+    AssertionResult const& result;
+    Colour::Code colour;
+    std::string passOrFail;
+    std::string messageLabel;
+    std::string message;
+    std::vector<MessageInfo> messages;
+    bool printInfoMessages;
+};
+
+std::size_t makeRatio(std::size_t number, std::size_t total) {
+    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+    return (ratio == 0 && number > 0) ? 1 : ratio;
+}
+
+std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
+    if (i > j && i > k)
+        return i;
+    else if (j > k)
+        return j;
+    else
+        return k;
+}
+
+struct ColumnInfo {
+    enum Justification { Left, Right };
+    std::string name;
+    int width;
+    Justification justification;
+};
+struct ColumnBreak {};
+struct RowBreak {};
+
+class Duration {
+    enum class Unit {
+        Auto,
+        Nanoseconds,
+        Microseconds,
+        Milliseconds,
+        Seconds,
+        Minutes
+    };
+    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+    uint64_t m_inNanoseconds;
+    Unit m_units;
+
+public:
+	explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
+        : Duration(static_cast<uint64_t>(inNanoseconds), units) {
+    }
+
+    explicit Duration(uint64_t inNanoseconds, Unit units = Unit::Auto)
+        : m_inNanoseconds(inNanoseconds),
+        m_units(units) {
+        if (m_units == Unit::Auto) {
+            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+                m_units = Unit::Nanoseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+                m_units = Unit::Microseconds;
+            else if (m_inNanoseconds < s_nanosecondsInASecond)
+                m_units = Unit::Milliseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMinute)
+                m_units = Unit::Seconds;
+            else
+                m_units = Unit::Minutes;
+        }
+
+    }
+
+    auto value() const -> double {
+        switch (m_units) {
+        case Unit::Microseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+        case Unit::Milliseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+        case Unit::Seconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+        case Unit::Minutes:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+        default:
+            return static_cast<double>(m_inNanoseconds);
+        }
+    }
+    auto unitsAsString() const -> std::string {
+        switch (m_units) {
+        case Unit::Nanoseconds:
+            return "ns";
+        case Unit::Microseconds:
+            return "us";
+        case Unit::Milliseconds:
+            return "ms";
+        case Unit::Seconds:
+            return "s";
+        case Unit::Minutes:
+            return "m";
+        default:
+            return "** internal error **";
+        }
+
+    }
+    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+        return os << duration.value() << ' ' << duration.unitsAsString();
+    }
+};
+} // end anon namespace
+
+class TablePrinter {
+    std::ostream& m_os;
+    std::vector<ColumnInfo> m_columnInfos;
+    std::ostringstream m_oss;
+    int m_currentColumn = -1;
+    bool m_isOpen = false;
+
+public:
+    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+    :   m_os( os ),
+        m_columnInfos( std::move( columnInfos ) ) {}
+
+    auto columnInfos() const -> std::vector<ColumnInfo> const& {
+        return m_columnInfos;
+    }
+
+    void open() {
+        if (!m_isOpen) {
+            m_isOpen = true;
+            *this << RowBreak();
+
+			Columns headerCols;
+			Spacer spacer(2);
+			for (auto const& info : m_columnInfos) {
+				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
+				headerCols += spacer;
+			}
+			m_os << headerCols << '\n';
+
+            m_os << Catch::getLineOfChars<'-'>() << '\n';
+        }
+    }
+    void close() {
+        if (m_isOpen) {
+            *this << RowBreak();
+            m_os << std::endl;
+            m_isOpen = false;
+        }
+    }
+
+    template<typename T>
+    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+        tp.m_oss << value;
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+        auto colStr = tp.m_oss.str();
+        const auto strSize = colStr.size();
+        tp.m_oss.str("");
+        tp.open();
+        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+            tp.m_currentColumn = -1;
+            tp.m_os << '\n';
+        }
+        tp.m_currentColumn++;
+
+        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
+            ? std::string(colInfo.width - (strSize + 1), ' ')
+            : std::string();
+        if (colInfo.justification == ColumnInfo::Left)
+            tp.m_os << colStr << padding << ' ';
+        else
+            tp.m_os << padding << colStr << ' ';
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+        if (tp.m_currentColumn > 0) {
+            tp.m_os << '\n';
+            tp.m_currentColumn = -1;
+        }
+        return tp;
+    }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
+    : StreamingReporterBase(config),
+    m_tablePrinter(new TablePrinter(config.stream(),
+        [&config]() -> std::vector<ColumnInfo> {
+        if (config.fullConfig()->benchmarkNoAnalysis())
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "     samples", 14, ColumnInfo::Right },
+                { "  iterations", 14, ColumnInfo::Right },
+                { "        mean", 14, ColumnInfo::Right }
+            };
+        }
+        else
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 32, ColumnInfo::Left },
+                { "samples      mean       std dev", 14, ColumnInfo::Right },
+                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
+                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
+            };
+        }
+    }())) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+    return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
+    stream << "No test cases matched '" << spec << '\'' << std::endl;
+}
+
+void ConsoleReporter::reportInvalidArguments(std::string const&arg){
+    stream << "Invalid Filter: " << arg << std::endl;
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+    AssertionResult const& result = _assertionStats.assertionResult;
+
+    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+    // Drop out if result was successful but we're not printing them.
+    if (!includeResults && result.getResultType() != ResultWas::Warning)
+        return false;
+
+    lazyPrint();
+
+    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
+    printer.print();
+    stream << std::endl;
+    return true;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_tablePrinter->close();
+    m_headerPrinted = false;
+    StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+    m_tablePrinter->close();
+    if (_sectionStats.missingAssertions) {
+        lazyPrint();
+        Colour colour(Colour::ResultError);
+        if (m_sectionStack.size() > 1)
+            stream << "\nNo assertions in section";
+        else
+            stream << "\nNo assertions in test case";
+        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+    }
+    if (m_config->showDurations() == ShowDurations::Always) {
+        stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+    }
+    if (m_headerPrinted) {
+        m_headerPrinted = false;
+    }
+    StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+void ConsoleReporter::benchmarkPreparing(std::string const& name) {
+	lazyPrintWithoutClosingBenchmarkTable();
+
+	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
+
+	bool firstLine = true;
+	for (auto line : nameCol) {
+		if (!firstLine)
+			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+		else
+			firstLine = false;
+
+		(*m_tablePrinter) << line << ColumnBreak();
+	}
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    (*m_tablePrinter) << info.samples << ColumnBreak()
+        << info.iterations << ColumnBreak();
+    if (!m_config->benchmarkNoAnalysis())
+        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
+    if (m_config->benchmarkNoAnalysis())
+    {
+        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
+    }
+    else
+    {
+        (*m_tablePrinter) << ColumnBreak()
+            << Duration(stats.mean.point.count()) << ColumnBreak()
+            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
+            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
+    }
+}
+
+void ConsoleReporter::benchmarkFailed(std::string const& error) {
+	Colour colour(Colour::Red);
+    (*m_tablePrinter)
+        << "Benchmark failed (" << error << ')'
+        << ColumnBreak() << RowBreak();
+}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+    m_tablePrinter->close();
+    StreamingReporterBase::testCaseEnded(_testCaseStats);
+    m_headerPrinted = false;
+}
+void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
+    if (currentGroupInfo.used) {
+        printSummaryDivider();
+        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+        printTotals(_testGroupStats.totals);
+        stream << '\n' << std::endl;
+    }
+    StreamingReporterBase::testGroupEnded(_testGroupStats);
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+    printTotalsDivider(_testRunStats.totals);
+    printTotals(_testRunStats.totals);
+    stream << std::endl;
+    StreamingReporterBase::testRunEnded(_testRunStats);
+}
+void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
+    StreamingReporterBase::testRunStarting(_testInfo);
+    printTestFilters();
+}
+
+void ConsoleReporter::lazyPrint() {
+
+    m_tablePrinter->close();
+    lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+    if (!currentTestRunInfo.used)
+        lazyPrintRunInfo();
+    if (!currentGroupInfo.used)
+        lazyPrintGroupInfo();
+
+    if (!m_headerPrinted) {
+        printTestCaseAndSectionHeader();
+        m_headerPrinted = true;
+    }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+    stream << '\n' << getLineOfChars<'~'>() << '\n';
+    Colour colour(Colour::SecondaryText);
+    stream << currentTestRunInfo->name
+        << " is a Catch v" << libraryVersion() << " host application.\n"
+        << "Run with -? for options\n\n";
+
+    if (m_config->rngSeed() != 0)
+        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+    currentTestRunInfo.used = true;
+}
+void ConsoleReporter::lazyPrintGroupInfo() {
+    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
+        printClosedHeader("Group: " + currentGroupInfo->name);
+        currentGroupInfo.used = true;
+    }
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+    assert(!m_sectionStack.empty());
+    printOpenHeader(currentTestCaseInfo->name);
+
+    if (m_sectionStack.size() > 1) {
+        Colour colourGuard(Colour::Headers);
+
+        auto
+            it = m_sectionStack.begin() + 1, // Skip first section (test case)
+            itEnd = m_sectionStack.end();
+        for (; it != itEnd; ++it)
+            printHeaderString(it->name, 2);
+    }
+
+    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+    stream << getLineOfChars<'-'>() << '\n';
+    Colour colourGuard(Colour::FileName);
+    stream << lineInfo << '\n';
+    stream << getLineOfChars<'.'>() << '\n' << std::endl;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+    printOpenHeader(_name);
+    stream << getLineOfChars<'.'>() << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+    stream << getLineOfChars<'-'>() << '\n';
+    {
+        Colour colourGuard(Colour::Headers);
+        printHeaderString(_name);
+    }
+}
+
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+    std::size_t i = _string.find(": ");
+    if (i != std::string::npos)
+        i += 2;
+    else
+        i = 0;
+    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
+}
+
+struct SummaryColumn {
+
+    SummaryColumn( std::string _label, Colour::Code _colour )
+    :   label( std::move( _label ) ),
+        colour( _colour ) {}
+    SummaryColumn addRow( std::size_t count ) {
+        ReusableStringStream rss;
+        rss << count;
+        std::string row = rss.str();
+        for (auto& oldRow : rows) {
+            while (oldRow.size() < row.size())
+                oldRow = ' ' + oldRow;
+            while (oldRow.size() > row.size())
+                row = ' ' + row;
+        }
+        rows.push_back(row);
+        return *this;
+    }
+
+    std::string label;
+    Colour::Code colour;
+    std::vector<std::string> rows;
+
+};
+
+void ConsoleReporter::printTotals( Totals const& totals ) {
+    if (totals.testCases.total() == 0) {
+        stream << Colour(Colour::Warning) << "No tests ran\n";
+    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
+        stream << Colour(Colour::ResultSuccess) << "All tests passed";
+        stream << " ("
+            << pluralise(totals.assertions.passed, "assertion") << " in "
+            << pluralise(totals.testCases.passed, "test case") << ')'
+            << '\n';
+    } else {
+
+        std::vector<SummaryColumn> columns;
+        columns.push_back(SummaryColumn("", Colour::None)
+                          .addRow(totals.testCases.total())
+                          .addRow(totals.assertions.total()));
+        columns.push_back(SummaryColumn("passed", Colour::Success)
+                          .addRow(totals.testCases.passed)
+                          .addRow(totals.assertions.passed));
+        columns.push_back(SummaryColumn("failed", Colour::ResultError)
+                          .addRow(totals.testCases.failed)
+                          .addRow(totals.assertions.failed));
+        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
+                          .addRow(totals.testCases.failedButOk)
+                          .addRow(totals.assertions.failedButOk));
+
+        printSummaryRow("test cases", columns, 0);
+        printSummaryRow("assertions", columns, 1);
+    }
+}
+void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
+    for (auto col : cols) {
+        std::string value = col.rows[row];
+        if (col.label.empty()) {
+            stream << label << ": ";
+            if (value != "0")
+                stream << value;
+            else
+                stream << Colour(Colour::Warning) << "- none -";
+        } else if (value != "0") {
+            stream << Colour(Colour::LightGrey) << " | ";
+            stream << Colour(col.colour)
+                << value << ' ' << col.label;
+        }
+    }
+    stream << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+    if (totals.testCases.total() > 0) {
+        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)++;
+        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)--;
+
+        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
+        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
+        if (totals.testCases.allPassed())
+            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
+        else
+            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
+    } else {
+        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
+    }
+    stream << '\n';
+}
+void ConsoleReporter::printSummaryDivider() {
+    stream << getLineOfChars<'-'>() << '\n';
+}
+
+void ConsoleReporter::printTestFilters() {
+    if (m_config->testSpec().hasFilters())
+        stream << Colour(Colour::BrightYellow) << "Filters: " << serializeFilters( m_config->getTestsOrTags() ) << '\n';
+}
+
+CATCH_REGISTER_REPORTER("console", ConsoleReporter)
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+// end catch_reporter_console.cpp
+// start catch_reporter_junit.cpp
+
+#include <cassert>
+#include <sstream>
+#include <ctime>
+#include <algorithm>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            // Beware, this is not reentrant because of backward compatibility issues
+            // Also, UTC only, again because of backward compatibility (%z is C++11)
+            time_t rawtime;
+            std::time(&rawtime);
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &rawtime);
+#else
+            std::tm* timeInfo;
+            timeInfo = std::gmtime(&rawtime);
+#endif
+
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+
+        std::string fileNameTag(const std::vector<std::string> &tags) {
+            auto it = std::find_if(begin(tags),
+                                   end(tags),
+                                   [] (std::string const& tag) {return tag.front() == '#'; });
+            if (it != tags.end())
+                return it->substr(1);
+            return std::string();
+        }
+    } // anonymous namespace
+
+    JunitReporter::JunitReporter( ReporterConfig const& _config )
+        :   CumulativeReporterBase( _config ),
+            xml( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+            m_reporterPrefs.shouldReportAllAssertions = true;
+        }
+
+    JunitReporter::~JunitReporter() {}
+
+    std::string JunitReporter::getDescription() {
+        return "Reports test results in an XML format that looks like Ant's junitreport target";
+    }
+
+    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
+
+    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
+        CumulativeReporterBase::testRunStarting( runInfo );
+        xml.startElement( "testsuites" );
+    }
+
+    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        suiteTimer.start();
+        stdOutForSuite.clear();
+        stdErrForSuite.clear();
+        unexpectedExceptions = 0;
+        CumulativeReporterBase::testGroupStarting( groupInfo );
+    }
+
+    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+        m_okToFail = testCaseInfo.okToFail();
+    }
+
+    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+            unexpectedExceptions++;
+        return CumulativeReporterBase::assertionEnded( assertionStats );
+    }
+
+    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        stdOutForSuite += testCaseStats.stdOut;
+        stdErrForSuite += testCaseStats.stdErr;
+        CumulativeReporterBase::testCaseEnded( testCaseStats );
+    }
+
+    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        double suiteTime = suiteTimer.getElapsedSeconds();
+        CumulativeReporterBase::testGroupEnded( testGroupStats );
+        writeGroup( *m_testGroups.back(), suiteTime );
+    }
+
+    void JunitReporter::testRunEndedCumulative() {
+        xml.endElement();
+    }
+
+    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+
+        TestGroupStats const& stats = groupNode.value;
+        xml.writeAttribute( "name", stats.groupInfo.name );
+        xml.writeAttribute( "errors", unexpectedExceptions );
+        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+        xml.writeAttribute( "tests", stats.totals.assertions.total() );
+        xml.writeAttribute( "hostname", "tbd" ); // !TBD
+        if( m_config->showDurations() == ShowDurations::Never )
+            xml.writeAttribute( "time", "" );
+        else
+            xml.writeAttribute( "time", suiteTime );
+        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+        // Write properties if there are any
+        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
+            auto properties = xml.scopedElement("properties");
+            if (m_config->hasTestFilters()) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "filters")
+                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
+            }
+            if (m_config->rngSeed() != 0) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "random-seed")
+                    .writeAttribute("value", m_config->rngSeed());
+            }
+        }
+
+        // Write test cases
+        for( auto const& child : groupNode.children )
+            writeTestCase( *child );
+
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
+    }
+
+    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+        TestCaseStats const& stats = testCaseNode.value;
+
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert( testCaseNode.children.size() == 1 );
+        SectionNode const& rootSection = *testCaseNode.children.front();
+
+        std::string className = stats.testInfo.className;
+
+        if( className.empty() ) {
+            className = fileNameTag(stats.testInfo.tags);
+            if ( className.empty() )
+                className = "global";
+        }
+
+        if ( !m_config->name().empty() )
+            className = m_config->name() + "." + className;
+
+        writeSection( className, "", rootSection );
+    }
+
+    void JunitReporter::writeSection(  std::string const& className,
+                        std::string const& rootName,
+                        SectionNode const& sectionNode ) {
+        std::string name = trim( sectionNode.stats.sectionInfo.name );
+        if( !rootName.empty() )
+            name = rootName + '/' + name;
+
+        if( !sectionNode.assertions.empty() ||
+            !sectionNode.stdOut.empty() ||
+            !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+            if( className.empty() ) {
+                xml.writeAttribute( "classname", name );
+                xml.writeAttribute( "name", "root" );
+            }
+            else {
+                xml.writeAttribute( "classname", className );
+                xml.writeAttribute( "name", name );
+            }
+            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
+
+            writeAssertions( sectionNode );
+
+            if( !sectionNode.stdOut.empty() )
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
+            if( !sectionNode.stdErr.empty() )
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
+        }
+        for( auto const& childNode : sectionNode.childSections )
+            if( className.empty() )
+                writeSection( name, "", *childNode );
+            else
+                writeSection( className, name, *childNode );
+    }
+
+    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+        for( auto const& assertion : sectionNode.assertions )
+            writeAssertion( assertion );
+    }
+
+    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+        AssertionResult const& result = stats.assertionResult;
+        if( !result.isOk() ) {
+            std::string elementName;
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                    elementName = "failure";
+                    break;
+                case ResultWas::ExpressionFailed:
+                    elementName = "failure";
+                    break;
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+
+                // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+            xml.writeAttribute( "message", result.getExpression() );
+            xml.writeAttribute( "type", result.getTestMacroName() );
+
+            ReusableStringStream rss;
+            if (stats.totals.assertions.total() > 0) {
+                rss << "FAILED" << ":\n";
+                if (result.hasExpression()) {
+                    rss << "  ";
+                    rss << result.getExpressionInMacro();
+                    rss << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    rss << "with expansion:\n";
+                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
+                }
+            } else {
+                rss << '\n';
+            }
+
+            if( !result.getMessage().empty() )
+                rss << result.getMessage() << '\n';
+            for( auto const& msg : stats.infoMessages )
+                if( msg.type == ResultWas::Info )
+                    rss << msg.message << '\n';
+
+            rss << "at " << result.getSourceInfo();
+            xml.writeText( rss.str(), XmlFormatting::Newline );
+        }
+    }
+
+    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+// end catch_reporter_junit.cpp
+// start catch_reporter_listening.cpp
+
+#include <cassert>
+
+namespace Catch {
+
+    ListeningReporter::ListeningReporter() {
+        // We will assume that listeners will always want all assertions
+        m_preferences.shouldReportAllAssertions = true;
+    }
+
+    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+        m_listeners.push_back( std::move( listener ) );
+    }
+
+    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
+        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
+        m_reporter = std::move( reporter );
+        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
+    }
+
+    ReporterPreferences ListeningReporter::getPreferences() const {
+        return m_preferences;
+    }
+
+    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
+        return std::set<Verbosity>{ };
+    }
+
+    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->noMatchingTestCases( spec );
+        }
+        m_reporter->noMatchingTestCases( spec );
+    }
+
+    void ListeningReporter::reportInvalidArguments(std::string const&arg){
+        for ( auto const& listener : m_listeners ) {
+            listener->reportInvalidArguments( arg );
+        }
+        m_reporter->reportInvalidArguments( arg );
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkPreparing(name);
+		}
+		m_reporter->benchmarkPreparing(name);
+	}
+    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkStarting( benchmarkInfo );
+        }
+        m_reporter->benchmarkStarting( benchmarkInfo );
+    }
+    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkEnded( benchmarkStats );
+        }
+        m_reporter->benchmarkEnded( benchmarkStats );
+    }
+
+	void ListeningReporter::benchmarkFailed( std::string const& error ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkFailed(error);
+		}
+		m_reporter->benchmarkFailed(error);
+	}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunStarting( testRunInfo );
+        }
+        m_reporter->testRunStarting( testRunInfo );
+    }
+
+    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupStarting( groupInfo );
+        }
+        m_reporter->testGroupStarting( groupInfo );
+    }
+
+    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseStarting( testInfo );
+        }
+        m_reporter->testCaseStarting( testInfo );
+    }
+
+    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionStarting( sectionInfo );
+        }
+        m_reporter->sectionStarting( sectionInfo );
+    }
+
+    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->assertionStarting( assertionInfo );
+        }
+        m_reporter->assertionStarting( assertionInfo );
+    }
+
+    // The return value indicates if the messages buffer should be cleared:
+    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        for( auto const& listener : m_listeners ) {
+            static_cast<void>( listener->assertionEnded( assertionStats ) );
+        }
+        return m_reporter->assertionEnded( assertionStats );
+    }
+
+    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionEnded( sectionStats );
+        }
+        m_reporter->sectionEnded( sectionStats );
+    }
+
+    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseEnded( testCaseStats );
+        }
+        m_reporter->testCaseEnded( testCaseStats );
+    }
+
+    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupEnded( testGroupStats );
+        }
+        m_reporter->testGroupEnded( testGroupStats );
+    }
+
+    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunEnded( testRunStats );
+        }
+        m_reporter->testRunEnded( testRunStats );
+    }
+
+    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->skipTest( testInfo );
+        }
+        m_reporter->skipTest( testInfo );
+    }
+
+    bool ListeningReporter::isMulti() const {
+        return true;
+    }
+
+} // end namespace Catch
+// end catch_reporter_listening.cpp
+// start catch_reporter_xml.cpp
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    XmlReporter::XmlReporter( ReporterConfig const& _config )
+    :   StreamingReporterBase( _config ),
+        m_xml(_config.stream())
+    {
+        m_reporterPrefs.shouldRedirectStdOut = true;
+        m_reporterPrefs.shouldReportAllAssertions = true;
+    }
+
+    XmlReporter::~XmlReporter() = default;
+
+    std::string XmlReporter::getDescription() {
+        return "Reports test results as an XML document";
+    }
+
+    std::string XmlReporter::getStylesheetRef() const {
+        return std::string();
+    }
+
+    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+        m_xml
+            .writeAttribute( "filename", sourceInfo.file )
+            .writeAttribute( "line", sourceInfo.line );
+    }
+
+    void XmlReporter::noMatchingTestCases( std::string const& s ) {
+        StreamingReporterBase::noMatchingTestCases( s );
+    }
+
+    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        std::string stylesheetRef = getStylesheetRef();
+        if( !stylesheetRef.empty() )
+            m_xml.writeStylesheetRef( stylesheetRef );
+        m_xml.startElement( "Catch" );
+        if( !m_config->name().empty() )
+            m_xml.writeAttribute( "name", m_config->name() );
+        if (m_config->testSpec().hasFilters())
+            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
+        if( m_config->rngSeed() != 0 )
+            m_xml.scopedElement( "Randomness" )
+                .writeAttribute( "seed", m_config->rngSeed() );
+    }
+
+    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        StreamingReporterBase::testGroupStarting( groupInfo );
+        m_xml.startElement( "Group" )
+            .writeAttribute( "name", groupInfo.name );
+    }
+
+    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_xml.startElement( "TestCase" )
+            .writeAttribute( "name", trim( testInfo.name ) )
+            .writeAttribute( "description", testInfo.description )
+            .writeAttribute( "tags", testInfo.tagsAsString() );
+
+        writeSourceInfo( testInfo.lineInfo );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            m_testCaseTimer.start();
+        m_xml.ensureTagClosed();
+    }
+
+    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        StreamingReporterBase::sectionStarting( sectionInfo );
+        if( m_sectionDepth++ > 0 ) {
+            m_xml.startElement( "Section" )
+                .writeAttribute( "name", trim( sectionInfo.name ) );
+            writeSourceInfo( sectionInfo.lineInfo );
+            m_xml.ensureTagClosed();
+        }
+    }
+
+    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+        AssertionResult const& result = assertionStats.assertionResult;
+
+        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+        if( includeResults || result.getResultType() == ResultWas::Warning ) {
+            // Print any info messages in <Info> tags.
+            for( auto const& msg : assertionStats.infoMessages ) {
+                if( msg.type == ResultWas::Info && includeResults ) {
+                    m_xml.scopedElement( "Info" )
+                            .writeText( msg.message );
+                } else if ( msg.type == ResultWas::Warning ) {
+                    m_xml.scopedElement( "Warning" )
+                            .writeText( msg.message );
+                }
+            }
+        }
+
+        // Drop out if result was successful but we're not printing them.
+        if( !includeResults && result.getResultType() != ResultWas::Warning )
+            return true;
+
+        // Print the expression if there is one.
+        if( result.hasExpression() ) {
+            m_xml.startElement( "Expression" )
+                .writeAttribute( "success", result.succeeded() )
+                .writeAttribute( "type", result.getTestMacroName() );
+
+            writeSourceInfo( result.getSourceInfo() );
+
+            m_xml.scopedElement( "Original" )
+                .writeText( result.getExpression() );
+            m_xml.scopedElement( "Expanded" )
+                .writeText( result.getExpandedExpression() );
+        }
+
+        // And... Print a result applicable to each result type.
+        switch( result.getResultType() ) {
+            case ResultWas::ThrewException:
+                m_xml.startElement( "Exception" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::FatalErrorCondition:
+                m_xml.startElement( "FatalErrorCondition" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::Info:
+                m_xml.scopedElement( "Info" )
+                    .writeText( result.getMessage() );
+                break;
+            case ResultWas::Warning:
+                // Warning will already have been written
+                break;
+            case ResultWas::ExplicitFailure:
+                m_xml.startElement( "Failure" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            default:
+                break;
+        }
+
+        if( result.hasExpression() )
+            m_xml.endElement();
+
+        return true;
+    }
+
+    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+        StreamingReporterBase::sectionEnded( sectionStats );
+        if( --m_sectionDepth > 0 ) {
+            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+            e.writeAttribute( "successes", sectionStats.assertions.passed );
+            e.writeAttribute( "failures", sectionStats.assertions.failed );
+            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+            m_xml.endElement();
+        }
+    }
+
+    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        StreamingReporterBase::testCaseEnded( testCaseStats );
+        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+        if( !testCaseStats.stdOut.empty() )
+            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
+        if( !testCaseStats.stdErr.empty() )
+            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
+
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        StreamingReporterBase::testGroupEnded( testGroupStats );
+        // TODO: Check testGroupStats.aborting and act accordingly.
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        StreamingReporterBase::testRunEnded( testRunStats );
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+        m_xml.endElement();
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void XmlReporter::benchmarkPreparing(std::string const& name) {
+        m_xml.startElement("BenchmarkResults")
+            .writeAttribute("name", name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples", info.samples)
+            .writeAttribute("resamples", info.resamples)
+            .writeAttribute("iterations", info.iterations)
+            .writeAttribute("clockResolution", static_cast<uint64_t>(info.clockResolution))
+            .writeAttribute("estimatedDuration", static_cast<uint64_t>(info.estimatedDuration))
+            .writeComment("All values in nano seconds");
+    }
+
+    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_xml.startElement("mean")
+            .writeAttribute("value", static_cast<uint64_t>(benchmarkStats.mean.point.count()))
+            .writeAttribute("lowerBound", static_cast<uint64_t>(benchmarkStats.mean.lower_bound.count()))
+            .writeAttribute("upperBound", static_cast<uint64_t>(benchmarkStats.mean.upper_bound.count()))
+            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("standardDeviation")
+            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("outliers")
+            .writeAttribute("variance", benchmarkStats.outlierVariance)
+            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
+            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
+            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
+            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
+        m_xml.endElement();
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkFailed(std::string const &error) {
+        m_xml.scopedElement("failed").
+            writeAttribute("message", error);
+        m_xml.endElement();
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_xml.cpp
+
+namespace Catch {
+    LeakDetector leakDetector;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_impl.hpp
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// start catch_default_main.hpp
+
+#ifndef __OBJC__
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    return Catch::Session().run( argc, argv );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+    Catch::registerTestMethods();
+    int result = Catch::Session().run( argc, (char**)argv );
+
+#if !CATCH_ARC_ENABLED
+    [pool drain];
+#endif
+
+    return result;
+}
+
+#endif // __OBJC__
+
+// end catch_default_main.hpp
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+#else
+#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define CATCH_BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define CATCH_BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
+#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+#else
+#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+
+#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+using Catch::Detail::Approx;
+
+#else // CATCH_CONFIG_DISABLE
+
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... )        (void)(0)
+#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
+
+#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CATCH_CHECK( ... )         (void)(0)
+#define CATCH_CHECK_FALSE( ... )   (void)(0)
+#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
+#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
+#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
+
+#define CATCH_CHECK_THROWS( ... )  (void)(0)
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg )          (void)(0)
+#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
+#define CATCH_WARN( msg )          (void)(0)
+#define CATCH_CAPTURE( msg )       (void)(0)
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_METHOD_AS_TEST_CASE( method, ... )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define CATCH_SECTION( ... )
+#define CATCH_DYNAMIC_SECTION( ... )
+#define CATCH_FAIL( ... ) (void)(0)
+#define CATCH_FAIL_CHECK( ... ) (void)(0)
+#define CATCH_SUCCEED( ... ) (void)(0)
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_GIVEN( desc )
+#define CATCH_AND_GIVEN( desc )
+#define CATCH_WHEN( desc )
+#define CATCH_AND_WHEN( desc )
+#define CATCH_THEN( desc )
+#define CATCH_AND_THEN( desc )
+
+#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... )       (void)(0)
+#define REQUIRE_FALSE( ... ) (void)(0)
+
+#define REQUIRE_THROWS( ... ) (void)(0)
+#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CHECK( ... ) (void)(0)
+#define CHECK_FALSE( ... ) (void)(0)
+#define CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CHECK_NOFAIL( ... ) (void)(0)
+
+#define CHECK_THROWS( ... )  (void)(0)
+#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) (void)(0)
+
+#define REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) (void)(0)
+#define UNSCOPED_INFO( msg ) (void)(0)
+#define WARN( msg ) (void)(0)
+#define CAPTURE( msg ) (void)(0)
+
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define METHOD_AS_TEST_CASE( method, ... )
+#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define SECTION( ... )
+#define DYNAMIC_SECTION( ... )
+#define FAIL( ... ) (void)(0)
+#define FAIL_CHECK( ... ) (void)(0)
+#define SUCCEED( ... ) (void)(0)
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+#define STATIC_REQUIRE( ... )       (void)(0)
+#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+
+#define GIVEN( desc )
+#define AND_GIVEN( desc )
+#define WHEN( desc )
+#define AND_WHEN( desc )
+#define THEN( desc )
+#define AND_THEN( desc )
+
+using Catch::Detail::Approx;
+
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+// start catch_reenable_warnings.h
+
+
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+// end catch_reenable_warnings.h
+// end catch.hpp
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/catch.runsettings b/vnext/Microsoft.ReactNative.Cxx.UnitTests/catch.runsettings
new file mode 100644
index 00000000000..7e11e2b4540
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/catch.runsettings
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+	<Catch2Adapter disabled="false">
+		<FilenameFilter>^Microsoft.ReactNative.Cxx.UnitTests</FilenameFilter>
+	</Catch2Adapter>
+</RunSettings>
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/main.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/main.cpp
new file mode 100644
index 00000000000..be8bd27ca5a
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/main.cpp
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+
+#define CATCH_CONFIG_RUNNER
+#include "catch.hpp"
+
+int main(int argc, char *argv[]) {
+  winrt::init_apartment();
+  return Catch::Session().run(argc, argv);
+}
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/packages.config b/vnext/Microsoft.ReactNative.Cxx.UnitTests/packages.config
new file mode 100644
index 00000000000..790637cec08
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190730.2" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/pch.cpp b/vnext/Microsoft.ReactNative.Cxx.UnitTests/pch.cpp
new file mode 100644
index 00000000000..b175e3fd200
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/pch.cpp
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/pch.h b/vnext/Microsoft.ReactNative.Cxx.UnitTests/pch.h
new file mode 100644
index 00000000000..72e7480e50d
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/pch.h
@@ -0,0 +1,7 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.Foundation.h>
+#include "winrt/Microsoft.ReactNative.Bridge.h"
diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/readme.txt b/vnext/Microsoft.ReactNative.Cxx.UnitTests/readme.txt
new file mode 100644
index 00000000000..f993c1d9989
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/readme.txt
@@ -0,0 +1,30 @@
+========================================================================
+    C++/WinRT Microsoft.ReactNative.Cxx.UnitTests Project Overview
+========================================================================
+
+This project demonstrates how to get started consuming Windows Runtime 
+classes directly from standard C++, using platform projection headers
+generated from Windows SDK metadata files.
+
+Steps to generate and consume SDK platform projection:
+1. Build project initally to generate platform projection headers into
+    your Generated Files folder.
+2. Include a projection namespace header in your pch.h, such as 
+    <winrt/Windows.Foundation.h>.
+3. Consume winrt namespace and any Windows Runtime namespaces, such as 
+    winrt::Windows::Foundation, from source code.
+4. Initialize apartment via init_apartment() and consume winrt classes.
+
+Steps to generate and consume a projection from third party metadata:
+1. Add a WinMD reference by right-clicking the References project node
+    and selecting "Add Reference...".  In the Add References dialog, 
+    browse to the component WinMD you want to consume and add it.
+2. Build the project once to generate projection headers for the 
+    referenced WinMD file under the "Generated Files" subfolder.
+3. As above, include projection headers in pch or source code 
+    to consume projected Windows Runtime classes.
+
+========================================================================
+Learn more about C++/WinRT here:
+http://aka.ms/cppwinrt/
+========================================================================
diff --git a/vnext/Microsoft.ReactNative.Cxx/Crash.h b/vnext/Microsoft.ReactNative.Cxx/Crash.h
new file mode 100644
index 00000000000..f2fca000b28
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/Crash.h
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#define VerifyElseCrash(condition) \
+  do {                             \
+    if (!(condition)) {            \
+      assert(false && #condition); \
+      std::terminate();            \
+    }                              \
+  } while (false)
+
+#define VerifyElseCrashSz(condition, message) \
+  do {                                        \
+    if (!(condition)) {                       \
+      assert(false && (message));             \
+      std::terminate();                       \
+    }                                         \
+  } while (false)
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValue.cpp b/vnext/Microsoft.ReactNative.Cxx/JSValue.cpp
new file mode 100644
index 00000000000..fbe43775462
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValue.cpp
@@ -0,0 +1,324 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "JSValue.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+//===========================================================================
+// JSValue implementation
+//===========================================================================
+
+/*static*/ const JSValue JSValue::Null;
+/*static*/ const JSValueObject JSValue::EmptyObject;
+/*static*/ const JSValueArray JSValue::EmptyArray;
+/*static*/ const std::string JSValue::EmptyString;
+
+JSValue::JSValue(JSValue &&other) noexcept : m_type{other.m_type} {
+  switch (m_type) {
+    case JSValueType::Object:
+      new (&m_object) JSValueObject(std::move(other.m_object));
+      break;
+    case JSValueType::Array:
+      new (&m_array) JSValueArray(std::move(other.m_array));
+      break;
+    case JSValueType::String:
+      new (&m_string) std::string(std::move(other.m_string));
+      break;
+    case JSValueType::Boolean:
+      m_bool = other.m_bool;
+      break;
+    case JSValueType::Int64:
+      m_int64 = other.m_int64;
+      break;
+    case JSValueType::Double:
+      m_double = other.m_double;
+      break;
+  }
+
+  other.m_type = JSValueType::Null;
+  other.m_int64 = 0;
+}
+
+JSValue &JSValue::operator=(JSValue &&other) noexcept {
+  if (this != &other) {
+    this->~JSValue();
+    new (this) JSValue(std::move(other));
+  }
+
+  return *this;
+}
+
+JSValue::~JSValue() noexcept {
+  switch (m_type) {
+    case JSValueType::Object:
+      m_object.~map();
+      break;
+    case JSValueType::Array:
+      m_array.~vector();
+      break;
+    case JSValueType::String:
+      m_string.~basic_string();
+      break;
+  }
+
+  m_int64 = 0;
+  m_type = JSValueType::Null;
+}
+
+JSValue JSValue::Copy() const noexcept {
+  switch (m_type) {
+    case JSValueType::Object:
+      return JSValue{CopyObject(m_object)};
+    case JSValueType::Array:
+      return JSValue{CopyArray(m_array)};
+    case JSValueType::String:
+      return JSValue{std::string(m_string)};
+    case JSValueType::Boolean:
+      return JSValue{m_bool};
+    case JSValueType::Int64:
+      return JSValue{m_int64};
+    case JSValueType::Double:
+      return JSValue{m_double};
+    default:
+      return JSValue{};
+  }
+}
+
+/*static*/ JSValueObject JSValue::CopyObject(const JSValueObject &other) noexcept {
+  JSValueObject result;
+  for (const auto &property : other) {
+    result.emplace(property.first, property.second.Copy());
+  }
+
+  return result;
+}
+
+/*static*/ JSValueArray JSValue::CopyArray(const JSValueArray &other) noexcept {
+  JSValueArray result(other.size());
+  for (const auto &item : other) {
+    result.push_back(item.Copy());
+  }
+
+  return result;
+}
+
+JSValueObject JSValue::TakeObject() noexcept {
+  JSValueObject result;
+  if (m_type == JSValueType::Object) {
+    result = std::move(m_object);
+    m_int64 = 0;
+    m_type = JSValueType::Null;
+  }
+  return result;
+}
+
+JSValueArray JSValue::TakeArray() noexcept {
+  JSValueArray result;
+  if (m_type == JSValueType::Array) {
+    result = std::move(m_array);
+    m_int64 = 0;
+    m_type = JSValueType::Null;
+  }
+  return result;
+}
+
+size_t JSValue::PropertyCount() const noexcept {
+  return (m_type == JSValueType::Object) ? m_object.size() : 0;
+}
+
+size_t JSValue::ItemCount() const noexcept {
+  return (m_type == JSValueType::Array) ? m_array.size() : 0;
+}
+
+const JSValue &JSValue::GetObjectProperty(std::string_view propertyName) const noexcept {
+  if (m_type == JSValueType::Object) {
+    auto it = m_object.find(propertyName);
+    if (it != m_object.end()) {
+      return it->second;
+    }
+  }
+
+  return Null;
+}
+
+const JSValue &JSValue::GetArrayItem(JSValueArray::size_type index) const noexcept {
+  if (m_type == JSValueType::Array && index < m_array.size()) {
+    return m_array[index];
+  }
+
+  return Null;
+}
+
+bool JSValue::Equals(const JSValue &other) const noexcept {
+  if (m_type == other.m_type) {
+    switch (m_type) {
+      case JSValueType::Null:
+        return true;
+      case JSValueType::Object:
+        return ObjectEquals(other.m_object);
+      case JSValueType::Array:
+        return ArrayEquals(other.m_array);
+      case JSValueType::String:
+        return m_string == other.m_string;
+      case JSValueType::Boolean:
+        return m_bool == other.m_bool;
+      case JSValueType::Int64:
+        return m_int64 == other.m_int64;
+      case JSValueType::Double:
+        return m_double == other.m_double;
+      default:
+        return false;
+    }
+  }
+
+  return false;
+}
+
+/*static*/ JSValue JSValue::ReadFrom(IJSValueReader const &reader) noexcept {
+  switch (reader.ValueType()) {
+    case JSValueType::Null:
+      return JSValue();
+    case JSValueType::Object:
+      return JSValue(ReadObjectProperties(reader));
+    case JSValueType::Array:
+      return JSValue(ReadArrayItems(reader));
+    case JSValueType::String:
+      return JSValue(to_string(reader.GetString()));
+    case JSValueType::Boolean:
+      return JSValue(reader.GetBoolean());
+    case JSValueType::Int64:
+      return JSValue(reader.GetInt64());
+    case JSValueType::Double:
+      return JSValue(reader.GetDouble());
+    default:
+      VerifyElseCrashSz(false, "Unexpected JSValueType");
+  }
+}
+
+/*static*/ JSValueObject JSValue::ReadObjectFrom(IJSValueReader const &reader) noexcept {
+  if (reader.ValueType() == JSValueType::Object) {
+    return ReadObjectProperties(reader);
+  }
+
+  return JSValueObject{};
+}
+
+/*static*/ JSValueArray JSValue::ReadArrayFrom(IJSValueReader const &reader) noexcept {
+  if (reader.ValueType() == JSValueType::Array) {
+    return ReadArrayItems(reader);
+  }
+
+  return JSValueArray{};
+}
+
+void JSValue::WriteTo(IJSValueWriter const &writer) const noexcept {
+  switch (m_type) {
+    case JSValueType::Null:
+      writer.WriteNull();
+      break;
+    case JSValueType::Object:
+      WriteObjectTo(writer, m_object);
+      break;
+    case JSValueType::Array:
+      WriteArrayTo(writer, m_array);
+      break;
+    case JSValueType::String:
+      writer.WriteString(to_hstring(m_string));
+      break;
+    case JSValueType::Boolean:
+      writer.WriteBoolean(m_bool);
+      break;
+    case JSValueType::Int64:
+      writer.WriteInt64(m_int64);
+      break;
+    case JSValueType::Double:
+      writer.WriteDouble(m_double);
+      break;
+  }
+}
+
+/*static*/ void JSValue::WriteObjectTo(IJSValueWriter const &writer, JSValueObjectView object) noexcept {
+  writer.WriteObjectBegin();
+  for (const auto &property : object) {
+    writer.WritePropertyName(to_hstring(property.first));
+    property.second.WriteTo(writer);
+  }
+  writer.WriteObjectEnd();
+}
+
+/*static*/ void JSValue::WriteArrayTo(IJSValueWriter const &writer, JSValueArrayView value) noexcept {
+  writer.WriteArrayBegin();
+  for (const JSValue &item : value) {
+    item.WriteTo(writer);
+  }
+  writer.WriteArrayEnd();
+}
+
+bool JSValue::ObjectEquals(const JSValueObject &other) const noexcept {
+  if (m_object.size() != other.size()) {
+    return false;
+  }
+
+  for (const auto &entry : m_object) {
+    auto it = other.find(entry.first);
+    if (it == other.end()) {
+      return false;
+    }
+
+    if (!entry.second.Equals(it->second)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool JSValue::ArrayEquals(const JSValueArray &other) const noexcept {
+  if (m_array.size() != other.size()) {
+    return false;
+  }
+
+  auto otherIt = other.begin();
+  for (const JSValue &item : m_array) {
+    if (!item.Equals(*(otherIt++))) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+// Read object properties without checking value type.
+/*static*/ JSValueObject JSValue::ReadObjectProperties(IJSValueReader const &reader) noexcept {
+  JSValueObject properties;
+  hstring propertyName;
+  while (reader.GetNextObjectProperty(/*ref*/ propertyName)) {
+    properties.emplace(to_string(propertyName), ReadFrom(reader));
+  }
+
+  return properties;
+}
+
+// Read array items without checking value type.
+/*static*/ JSValueArray JSValue::ReadArrayItems(IJSValueReader const &reader) noexcept {
+  JSValueArray items;
+  while (reader.GetNextArrayItem()) {
+    items.push_back(ReadFrom(reader));
+  }
+
+  return items;
+}
+
+//===========================================================================
+// Standalone inline functions implementation
+//===========================================================================
+
+void swap(JSValue &left, JSValue &right) noexcept {
+  JSValue temp{std::move(right)};
+  right = std::move(left);
+  left = std::move(temp);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValue.h b/vnext/Microsoft.ReactNative.Cxx/JSValue.h
new file mode 100644
index 00000000000..bf369ce59ba
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValue.h
@@ -0,0 +1,252 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#ifndef MICROSOFT_REACTNATIVE_JSVALUE
+#define MICROSOFT_REACTNATIVE_JSVALUE
+
+#include "Crash.h"
+#include "winrt/Microsoft.ReactNative.Bridge.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+// Forward declarations
+struct JSValue;
+IJSValueReader MakeJSValueTreeReader(const JSValue &root) noexcept;
+IJSValueReader MakeJSValueTreeReader(JSValue &&root) noexcept;
+IJSValueWriter MakeJSValueTreeWriter(JSValue &resultValue) noexcept;
+
+// Type alias for JSValue object type
+using JSValueObject = std::map<std::string, JSValue, std::less<>>;
+
+// Type alias for JSValue array type
+using JSValueArray = std::vector<JSValue>;
+
+// A view for JSValueObject
+struct JSValueObjectView {
+  JSValueObjectView(const JSValueObject &object) noexcept;
+  auto begin() const noexcept;
+  auto end() const noexcept;
+
+ private:
+  const JSValueObject &m_object;
+};
+
+// A view for JSObjectArray
+struct JSValueArrayView {
+  JSValueArrayView(const JSValueArray &array) noexcept;
+  auto begin() const noexcept;
+  auto end() const noexcept;
+
+ private:
+  const JSValueArray &m_array;
+};
+
+// JSValue represents an immutable JavaScript value that can be passed as a parameter.
+// It is created to simplify working with IJSValueReader in some complex cases.
+// It takes more resources than direct use of IJSValueReader, but provides more flexibility.
+// The JSValue is an immutable and is safe to be used from multiple threads.
+// It is move-only to avoid unnecessary or unexpected copying of values.
+struct JSValue {
+  static const JSValue Null;
+  static const JSValueObject EmptyObject;
+  static const JSValueArray EmptyArray;
+  static const std::string EmptyString;
+
+  JSValue() noexcept;
+  JSValue(std::nullptr_t) noexcept;
+  JSValue(JSValueObject &&value) noexcept;
+  JSValue(JSValueArray &&value) noexcept;
+  JSValue(std::string &&value) noexcept;
+  template <class TStringView, std::enable_if_t<std::is_convertible_v<TStringView, std::string_view>, int> = 1>
+  JSValue(TStringView value) noexcept;
+  template <class TBool, std::enable_if_t<std::is_same_v<TBool, bool>, int> = 1>
+  JSValue(TBool value) noexcept;
+  template <class TInt, std::enable_if_t<std::is_integral_v<TInt> && !std::is_same_v<TInt, bool>, int> = 1>
+  JSValue(TInt value) noexcept;
+  JSValue(double value) noexcept;
+
+  JSValue(const JSValue &other) = delete;
+  JSValue &operator=(const JSValue &other) = delete;
+
+  JSValue(JSValue &&other) noexcept;
+  JSValue &operator=(JSValue &&other) noexcept;
+
+  ~JSValue() noexcept;
+
+  JSValue Copy() const noexcept;
+  static JSValueObject CopyObject(const JSValueObject &other) noexcept;
+  static JSValueArray CopyArray(const JSValueArray &other) noexcept;
+
+  JSValueType Type() const noexcept;
+  bool IsNull() const noexcept;
+  const JSValueObject &Object() const noexcept;
+  const JSValueArray &Array() const noexcept;
+  const std::string &String() const noexcept;
+  bool Boolean() const noexcept;
+  int64_t Int64() const noexcept;
+  double Double() const noexcept;
+
+  JSValueObject TakeObject() noexcept;
+  JSValueArray TakeArray() noexcept;
+
+  size_t PropertyCount() const noexcept;
+  size_t ItemCount() const noexcept;
+
+  template <typename T>
+  T To() const noexcept;
+  template <class T>
+  static JSValue From(const T &value) noexcept;
+
+  const JSValue &GetObjectProperty(std::string_view propertyName) const noexcept;
+  const JSValue &GetArrayItem(JSValueArray::size_type index) const noexcept;
+  const JSValue &operator[](std::string_view propertyName) const noexcept;
+  const JSValue &operator[](JSValueArray::size_type index) const noexcept;
+
+  bool Equals(const JSValue &other) const noexcept;
+
+  static JSValue ReadFrom(IJSValueReader const &reader) noexcept;
+  static JSValueObject ReadObjectFrom(IJSValueReader const &reader) noexcept;
+  static JSValueArray ReadArrayFrom(IJSValueReader const &reader) noexcept;
+
+  void WriteTo(IJSValueWriter const &writer) const noexcept;
+  static void WriteObjectTo(IJSValueWriter const &writer, JSValueObjectView object) noexcept;
+  static void WriteArrayTo(IJSValueWriter const &writer, JSValueArrayView value) noexcept;
+
+ private:
+  bool ObjectEquals(const JSValueObject &other) const noexcept;
+  bool ArrayEquals(const JSValueArray &other) const noexcept;
+  static JSValueObject ReadObjectProperties(IJSValueReader const &reader) noexcept;
+  static JSValueArray ReadArrayItems(IJSValueReader const &reader) noexcept;
+
+ private: // Instance fields
+  JSValueType m_type;
+  union {
+    JSValueObject m_object;
+    JSValueArray m_array;
+    std::string m_string;
+    bool m_bool;
+    int64_t m_int64;
+    double m_double;
+  };
+};
+
+bool operator==(const JSValue &left, const JSValue &right) noexcept;
+bool operator!=(const JSValue &left, const JSValue &right) noexcept;
+void swap(JSValue &left, JSValue &right) noexcept;
+
+//===========================================================================
+// JSValueObjectView inline implementation
+//===========================================================================
+
+inline JSValueObjectView::JSValueObjectView(const JSValueObject &object) noexcept : m_object{object} {}
+
+inline auto JSValueObjectView::begin() const noexcept {
+  return m_object.begin();
+}
+
+inline auto JSValueObjectView::end() const noexcept {
+  return m_object.end();
+}
+
+//===========================================================================
+// JSValueArrayView inline implementation
+//===========================================================================
+
+inline JSValueArrayView::JSValueArrayView(const JSValueArray &array) noexcept : m_array{array} {}
+
+inline auto JSValueArrayView::begin() const noexcept {
+  return m_array.begin();
+}
+
+inline auto JSValueArrayView::end() const noexcept {
+  return m_array.end();
+}
+
+//===========================================================================
+// JSValue inline implementation
+//===========================================================================
+
+inline JSValue::JSValue() noexcept : m_type{JSValueType::Null}, m_int64{0} {}
+inline JSValue::JSValue(std::nullptr_t) noexcept : m_type{JSValueType::Null}, m_int64{0} {}
+inline JSValue::JSValue(JSValueObject &&value) noexcept : m_type{JSValueType::Object}, m_object{std::move(value)} {}
+inline JSValue::JSValue(JSValueArray &&value) noexcept : m_type{JSValueType::Array}, m_array(std::move(value)) {}
+inline JSValue::JSValue(std::string &&value) noexcept : m_type{JSValueType::String}, m_string{std::move(value)} {}
+template <class TStringView, std::enable_if_t<std::is_convertible_v<TStringView, std::string_view>, int>>
+inline JSValue::JSValue(TStringView value) noexcept : m_type{JSValueType::String}, m_string{value} {}
+template <class TBool, std::enable_if_t<std::is_same_v<TBool, bool>, int>>
+inline JSValue::JSValue(TBool value) noexcept : m_type{JSValueType::Boolean}, m_bool{value} {}
+template <class TInt, std::enable_if_t<std::is_integral_v<TInt> && !std::is_same_v<TInt, bool>, int>>
+inline JSValue::JSValue(TInt value) noexcept : m_type{JSValueType::Int64}, m_int64{static_cast<int64_t>(value)} {}
+inline JSValue::JSValue(double value) noexcept : m_type{JSValueType::Double}, m_double{value} {}
+
+inline JSValueType JSValue::Type() const noexcept {
+  return m_type;
+}
+
+inline bool JSValue::IsNull() const noexcept {
+  return m_type == JSValueType::Null;
+}
+
+inline const JSValueObject &JSValue::Object() const noexcept {
+  return (m_type == JSValueType::Object) ? m_object : EmptyObject;
+}
+
+inline const JSValueArray &JSValue::Array() const noexcept {
+  return (m_type == JSValueType::Array) ? m_array : EmptyArray;
+}
+
+inline const std::string &JSValue::String() const noexcept {
+  return (m_type == JSValueType::String) ? m_string : EmptyString;
+}
+
+inline bool JSValue::Boolean() const noexcept {
+  return (m_type == JSValueType::Boolean) ? m_bool : false;
+}
+
+inline int64_t JSValue::Int64() const noexcept {
+  return (m_type == JSValueType::Int64) ? m_int64 : 0;
+}
+
+inline double JSValue::Double() const noexcept {
+  return (m_type == JSValueType::Double) ? m_double : 0;
+}
+
+template <typename T>
+inline T JSValue::To() const noexcept {
+  T result;
+  ReadValue(MakeJSValueTreeReader(*this), /*out*/ result);
+  return result;
+}
+
+template <class T>
+static JSValue From(const T &value) noexcept {
+  JSValue result;
+  auto writer = MakeJSValueTreeWriter(result);
+  WriteValue(writer, value);
+  return result;
+}
+
+inline const JSValue &JSValue::operator[](std::string_view propertyName) const noexcept {
+  return GetObjectProperty(propertyName);
+}
+
+inline const JSValue &JSValue::operator[](JSValueArray::size_type index) const noexcept {
+  return GetArrayItem(index);
+}
+
+//===========================================================================
+// Standalone inline functions implementation
+//===========================================================================
+
+inline bool operator==(const JSValue &left, const JSValue &right) noexcept {
+  return left.Equals(right);
+}
+
+inline bool operator!=(const JSValue &left, const JSValue &right) noexcept {
+  return !left.Equals(right);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
+
+#endif // MICROSOFT_REACTNATIVE_JSVALUE
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValueReader.h b/vnext/Microsoft.ReactNative.Cxx/JSValueReader.h
index 473a1c4b47f..be614ce41ce 100644
--- a/vnext/Microsoft.ReactNative.Cxx/JSValueReader.h
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValueReader.h
@@ -5,99 +5,416 @@
 #ifndef MICROSOFT_REACTNATIVE_JSVALUEREADER
 #define MICROSOFT_REACTNATIVE_JSVALUEREADER
 
+#include "JSValue.h"
+#include "JSValueTreeReader.h"
+#include "StructInfo.h"
 #include "winrt/Microsoft.ReactNative.Bridge.h"
-#include "winrt/Microsoft.ReactNative.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+// A value can be read from IJSValueReader in one of three ways:
+// 1. Using a ReadValue standalone function with IJSValueReader& as a first argument.
+// 2. Using a ReadValue standalone function with const JSValue& as a first argument.
+// 3. We can auto-generate the read method for the type in some cases.
+
+// A special type to prevent circular call between
+// ReadValue(IJSValueReader&, T&) and ReadValue(JSValue&, T&)
+template <class T>
+struct TypeWrapper {
+  T Value;
+  operator T &() noexcept {
+    return Value;
+  }
+};
 
 //==============================================================================
-// IJSValueReader helpers
+// IJSValueReader extensions
 //==============================================================================
-namespace Microsoft::ReactNative {
 
+// Forward declarations
+template <class T>
+T ReadValue(IJSValueReader const &reader) noexcept;
+template <class T>
+T ReadValue(const JSValue &jsValue) noexcept;
+
+template <class T, class TJSValueReader, std::enable_if_t<std::is_same_v<TJSValueReader, IJSValueReader>, int> = 1>
+void ReadValue(TJSValueReader const &reader, /*out*/ T &value) noexcept;
+
+template <class T, class TJSValue, std::enable_if_t<std::is_same_v<TJSValue, JSValue>, int> = 1>
+void ReadValue(TJSValue const &jsValue, /*out*/ T &value) noexcept;
+
+void ReadValue(IJSValueReader const &reader, /*out*/ std::string &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ std::wstring &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ bool &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ int8_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ int16_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ int32_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ int64_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ uint8_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ uint16_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ uint32_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ uint64_t &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ float &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ double &value) noexcept;
+template <class T, std::enable_if_t<std::is_enum_v<T>, int> = 1>
+void ReadValue(IJSValueReader const &reader, /*out*/ T &value) noexcept;
 template <class T>
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, T &value) noexcept {
-  static_assert(sizeof(std::decay_t<T>) == 0, "Implement ReadValue for the T type");
+void ReadValue(IJSValueReader const &reader, /*out*/ std::optional<T> &value) noexcept;
+template <class T, class TCompare = std::less<>, class TAlloc = std::allocator<pair<const std::string, T>>>
+void ReadValue(IJSValueReader const &reader, /*out*/ std::map<std::string, T, TCompare, TAlloc> &value) noexcept;
+template <class T, class TCompare = std::less<>, class TAlloc = std::allocator<pair<const std::string, T>>>
+void ReadValue(IJSValueReader const &reader, /*out*/ std::map<std::wstring, T, TCompare, TAlloc> &value) noexcept;
+template <class T, class TAlloc = allocator<T>>
+void ReadValue(IJSValueReader const &reader, /*out*/ std::vector<T, TAlloc> &value) noexcept;
+template <class... Ts>
+void ReadValue(IJSValueReader const &reader, /*out*/ std::tuple<Ts...> &value) noexcept;
+
+void ReadValue(IJSValueReader const &reader, /*out*/ JSValue &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ JSValueObject &value) noexcept;
+void ReadValue(IJSValueReader const &reader, /*out*/ JSValueArray &value) noexcept;
+
+template <class T, std::enable_if_t<!std::is_void_v<decltype(GetStructInfo(static_cast<T *>(nullptr)))>, int> = 1>
+void ReadValue(IJSValueReader const &reader, /*out*/ T &value) noexcept;
+
+bool SkipArrayToEnd(IJSValueReader const &reader) noexcept;
+template <class... TArgs>
+void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &... args) noexcept;
+
+//===========================================================================
+// IJSValueReader extensions implementation
+//===========================================================================
+
+// This is a convenience method to call ReadValue for IJSValueReader.
+template <class T>
+inline T ReadValue(IJSValueReader const &reader) noexcept {
+  T result;
+  ReadValue(reader, /*out*/ result);
+  return result;
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, bool &value) noexcept {
-  return reader.TryGetBoolean(value);
+// This is a convenience method to call ReadValue for JSValue.
+template <class T>
+inline T ReadValue(const JSValue &jsValue) noexcept {
+  T result;
+  ReadValue(jsValue, /*out*/ result);
+  return result;
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, int8_t &value) noexcept {
-  int64_t result{};
-  return reader.TryGetInt64(result) && (value = static_cast<int8_t>(result), true);
+// Try to call ReadValue for JSValue unless it is already called us with TypeWrapper parameter.
+template <class T, class TJSValueReader, std::enable_if_t<std::is_same_v<TJSValueReader, IJSValueReader>, int>>
+inline void ReadValue(TJSValueReader const &reader, /*out*/ T &value) noexcept {
+  TypeWrapper<JSValue> jsValue = {JSValue::ReadFrom(reader)};
+  ReadValue(jsValue, /*out*/ value);
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, int16_t &value) noexcept {
-  int64_t result{};
-  return reader.TryGetInt64(result) && (value = static_cast<int16_t>(result), true);
+// Try to call ReadValue for IJSValueReader unless it is already called us with TypeWrapper parameter.
+template <class T, class TJSValue, std::enable_if_t<std::is_same_v<TJSValue, JSValue>, int>>
+inline void ReadValue(TJSValue const &jsValue, /*out*/ T &value) noexcept {
+  TypeWrapper<IJSValueReader> reader = {MakeJSValueTreeReader(jsValue)};
+  ReadValue(reader, /*out*/ value);
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, int32_t &value) noexcept {
-  int64_t result{};
-  return reader.TryGetInt64(result) && (value = static_cast<int32_t>(result), true);
+template <typename TChar, typename TValue>
+inline std::basic_string<TChar> basic_string_convert(TValue value) {
+  static_assert(std::is_arithmetic_v<TValue>);
+  char temp[32];
+  std::to_chars_result result;
+  if constexpr (std::is_integral_v<TValue>) {
+    result = std::to_chars(std::begin(temp), std::end(temp), value);
+  } else {
+    // Floating point
+    result = std::to_chars(std::begin(temp), std::end(temp), value, std::chars_format::general);
+  }
+  WINRT_ASSERT(result.ec == std::errc{});
+  if constexpr (std::is_same_v<TChar, wchar_t>) {
+    wchar_t buffer[32];
+    auto end = std::copy(std::begin(temp), result.ptr, buffer);
+    return std::wstring{buffer, static_cast<std::size_t>(end - buffer)};
+  } else if constexpr (std::is_same_v<TChar, char>) {
+    return std::string{temp, static_cast<std::size_t>(result.ptr - temp)};
+  } else {
+    static_assert(false, "Unsupported char type");
+  }
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, int64_t &value) noexcept {
-  return reader.TryGetInt64(value);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ std::string &value) noexcept {
+  switch (reader.ValueType()) {
+    case JSValueType::String:
+      value = to_string(reader.GetString());
+      break;
+    case JSValueType::Boolean:
+      value = reader.GetBoolean() ? "true" : "false";
+      break;
+    case JSValueType::Int64:
+      value = basic_string_convert<char>(reader.GetInt64());
+      break;
+    case JSValueType::Double:
+      value = basic_string_convert<char>(reader.GetDouble());
+      break;
+    default:
+      value = "";
+      break;
+  }
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, uint8_t &value) noexcept {
-  int64_t result{};
-  return reader.TryGetInt64(result) && (value = static_cast<uint8_t>(result), true);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ std::wstring &value) noexcept {
+  switch (reader.ValueType()) {
+    case JSValueType::String:
+      value = reader.GetString();
+      break;
+    case JSValueType::Boolean:
+      value = reader.GetBoolean() ? L"true" : L"false";
+      break;
+    case JSValueType::Int64:
+      value = basic_string_convert<wchar_t>(reader.GetInt64());
+      break;
+    case JSValueType::Double:
+      value = basic_string_convert<wchar_t>(reader.GetDouble());
+      break;
+    default:
+      value = L"";
+      break;
+  }
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, uint16_t &value) noexcept {
-  int64_t result{};
-  return reader.TryGetInt64(result) && (value = static_cast<uint16_t>(result), true);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ bool &value) noexcept {
+  switch (reader.ValueType()) {
+    case JSValueType::String:
+      value = !to_string(reader.GetString()).empty();
+      break;
+    case JSValueType::Boolean:
+      value = reader.GetBoolean();
+      break;
+    case JSValueType::Int64:
+      value = reader.GetInt64() != 0;
+      break;
+    case JSValueType::Double:
+      value = reader.GetDouble() != 0;
+      break;
+    default:
+      value = false;
+      break;
+  }
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, uint32_t &value) noexcept {
-  int64_t result{};
-  return reader.TryGetInt64(result) && (value = static_cast<uint32_t>(result), true);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ int8_t &value) noexcept {
+  int64_t val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<int8_t>(val);
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, uint64_t &value) noexcept {
-  int64_t result{};
-  return reader.TryGetInt64(result) && (value = static_cast<uint64_t>(result), true);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ int16_t &value) noexcept {
+  int64_t val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<int16_t>(val);
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, double &value) noexcept {
-  return reader.TryGetDouble(value);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ int32_t &value) noexcept {
+  int64_t val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<int32_t>(val);
 }
 
-inline bool ReadValue(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, float &value) noexcept {
-  double result{};
-  return reader.TryGetDouble(result) && (value = static_cast<float>(result), true);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ int64_t &value) noexcept {
+  switch (reader.ValueType()) {
+    case JSValueType::String: {
+      hstring str = reader.GetString();
+      wchar_t *end = nullptr;
+      auto iValue = _wcstoi64(str.data(), &end, 10 /*base*/);
+      if (end == str.data() + str.size()) {
+        value = iValue;
+      } else {
+        value = 0;
+      }
+      break;
+    }
+    case JSValueType::Boolean:
+      value = reader.GetBoolean() ? 1 : 0;
+      break;
+    case JSValueType::Int64:
+      value = reader.GetInt64();
+      break;
+    case JSValueType::Double:
+      value = static_cast<int64_t>(reader.GetDouble());
+      break;
+    default:
+      value = 0;
+      break;
+  }
 }
 
-inline bool ReadValue(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader,
-    std::string &value) noexcept {
-  winrt::hstring str;
-  return reader.TryGetString(str) && (value = winrt::to_string(str), true);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ uint8_t &value) noexcept {
+  int64_t val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<uint8_t>(val);
 }
 
-inline bool ReadValue(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader,
-    std::wstring &value) noexcept {
-  winrt::hstring str;
-  return reader.TryGetString(str) && (value = std::wstring{str.data(), str.size()}, true);
+inline void ReadValue(IJSValueReader const &reader, /*out*/ uint16_t &value) noexcept {
+  int64_t val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<uint16_t>(val);
 }
 
-template <class... TArgs>
-inline void ReadArgs(winrt::Microsoft::ReactNative::Bridge::IJSValueReader const &reader, TArgs &... args) noexcept {
-  if constexpr (sizeof...(args) > 0) {
-    using winrt::Microsoft::ReactNative::Bridge::JSValueReaderState;
-    JSValueReaderState state = reader.ReadNext();
-    if (state == JSValueReaderState::ArrayBegin) {
-      // To read variadic template arguments in natural order we must use them
-      // in an initializer list.
-      [[maybe_unused]] int dummy[] = {
-          (state = reader.ReadNext(), state != JSValueReaderState::ArrayEnd && ReadValue(reader, args), 0)...};
+inline void ReadValue(IJSValueReader const &reader, /*out*/ uint32_t &value) noexcept {
+  int64_t val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<uint32_t>(val);
+}
+
+inline void ReadValue(IJSValueReader const &reader, /*out*/ uint64_t &value) noexcept {
+  int64_t val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<uint64_t>(val);
+}
+
+inline void ReadValue(IJSValueReader const &reader, /*out*/ float &value) noexcept {
+  double val;
+  ReadValue(reader, /*out*/ val);
+  value = static_cast<float>(val);
+}
+
+inline void ReadValue(IJSValueReader const &reader, /*out*/ double &value) noexcept {
+  switch (reader.ValueType()) {
+    case JSValueType::String: {
+      hstring str = reader.GetString();
+      wchar_t *end = nullptr;
+      auto dvalue = wcstod(str.data(), &end);
+      if (end == str.data() + str.size()) {
+        value = dvalue;
+      } else {
+        value = 0;
+      }
+      break;
+    }
+    case JSValueType::Boolean:
+      value = reader.GetBoolean() ? 1 : 0;
+      break;
+    case JSValueType::Int64:
+      value = static_cast<double>(reader.GetInt64());
+      break;
+    case JSValueType::Double:
+      value = reader.GetDouble();
+      break;
+    default:
+      value = 0;
+      break;
+  }
+}
+
+template <class T, std::enable_if_t<std::is_enum_v<T>, int>>
+inline void ReadValue(IJSValueReader const &reader, /*out*/ T &value) noexcept {
+  int32_t intValue;
+  ReadValue(reader, intValue);
+  value = static_cast<T>(intValue);
+}
+
+template <class T>
+inline void ReadValue(IJSValueReader const &reader, /*out*/ std::optional<T> &value) noexcept {
+  if (reader.ValueType() != JSValueType::Null) {
+    value = ReadValue<T>(reader);
+  } else {
+    value = std::nullopt;
+  }
+}
+
+// Note that we use std::less<> as a default comparer instead of standard std::less<Key>.
+// This is to enable use of string-like objects such as std::string_view as key to retrieve values.
+// While std::less<> is better, the standard cannot have a breaking change to switch to it.
+template <class T, class TCompare, class TAlloc>
+inline void ReadValue(
+    IJSValueReader const &reader,
+    /*out*/ std::map<std::string, T, TCompare, TAlloc> &value) noexcept {
+  if (reader.ValueType() == JSValueType::Object) {
+    hstring propertyName;
+    while (reader.GetNextObjectProperty(/*out*/ propertyName)) {
+      value.emplace(to_string(propertyName), ReadValue<T>(reader));
     }
   }
 }
 
-} // namespace Microsoft::ReactNative
+template <class T, class TCompare, class TAlloc>
+inline void ReadValue(
+    IJSValueReader const &reader,
+    /*out*/ std::map<std::wstring, T, TCompare, TAlloc> &value) noexcept {
+  if (reader.ValueType() == JSValueType::Object) {
+    hstring propertyName;
+    while (reader.GetNextObjectProperty(/*out*/ propertyName)) {
+      value.emplace(propertyName, ReadValue<T>(reader));
+    }
+  }
+}
+
+template <class T, class TAlloc>
+inline void ReadValue(IJSValueReader const &reader, /*out*/ std::vector<T, TAlloc> &value) noexcept {
+  if (reader.ValueType() == JSValueType::Array) {
+    while (reader.GetNextArrayItem()) {
+      value.push_back(ReadValue<T>(reader));
+    }
+  }
+}
+
+template <class T, size_t... I>
+inline void ReadTuple(IJSValueReader const &reader, /*out*/ T &tuple, std::index_sequence<I...>) noexcept {
+  ReadArgs(reader, std::get<I>(tuple)...);
+}
+
+template <class... Ts>
+inline void ReadValue(IJSValueReader const &reader, /*out*/ std::tuple<Ts...> &value) noexcept {
+  ReadTuple(reader, value, std::make_index_sequence<sizeof...(Ts)>{});
+}
+
+inline void ReadValue(IJSValueReader const &reader, /*out*/ JSValue &value) noexcept {
+  value = JSValue::ReadFrom(reader);
+}
+
+inline void ReadValue(IJSValueReader const &reader, /*out*/ JSValueObject &value) noexcept {
+  value = JSValue::ReadObjectFrom(reader);
+}
+
+inline void ReadValue(IJSValueReader const &reader, /*out*/ JSValueArray &value) noexcept {
+  value = JSValue::ReadArrayFrom(reader);
+}
+
+template <class T, std::enable_if_t<!std::is_void_v<decltype(GetStructInfo(static_cast<T *>(nullptr)))>, int>>
+inline void ReadValue(IJSValueReader const &reader, /*out*/ T &value) noexcept {
+  if (reader.ValueType() == JSValueType::Object) {
+    const auto &fieldMap = StructInfo<T>::FieldMap;
+    hstring propertyName;
+    while (reader.GetNextObjectProperty(/*out*/ propertyName)) {
+      auto it = fieldMap.find(std::wstring_view(propertyName));
+      if (it != fieldMap.end()) {
+        it->second.ReadField(reader, &value);
+      } else {
+        ReadValue<JSValue>(reader); // Skip this property
+      }
+    }
+  }
+}
+
+// It helps to read arguments from an array if there are more items than expected.
+inline bool SkipArrayToEnd(IJSValueReader const &reader) noexcept {
+  while (reader.GetNextArrayItem()) {
+    ReadValue<JSValue>(reader); // Read and ignore the value
+  }
+
+  return true;
+}
+
+template <class... TArgs>
+inline void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &... args) noexcept {
+  // Read as many arguments as we can or return default values.
+  bool success = reader.ValueType() == JSValueType::Array;
+
+  if constexpr (sizeof...(args) != 0) {
+    // To read variadic template arguments in natural order we must use them in an initializer list.
+    // TODO: can we fold expression instead?
+    [[maybe_unused]] int dummy[] = {
+        (success = success && reader.GetNextArrayItem(), args = success ? ReadValue<TArgs>(reader) : TArgs{}, 0)...};
+  }
+
+  success = success && SkipArrayToEnd(reader);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
 
 #endif // MICROSOFT_REACTNATIVE_JSVALUEREADER
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValueTreeReader.cpp b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeReader.cpp
new file mode 100644
index 00000000000..1d04aa5142c
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeReader.cpp
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "JSValueTreeReader.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+//===========================================================================
+// JSValueTreeReader implementation
+//===========================================================================
+
+JSValueTreeReader::StackEntry::StackEntry(const JSValue &value, const JSValueObject::const_iterator &property) noexcept
+    : Value{value}, Property{property} {}
+
+JSValueTreeReader::StackEntry::StackEntry(const JSValue &value, const JSValueArray::const_iterator &item) noexcept
+    : Value{value}, Item{item} {}
+
+JSValueTreeReader::JSValueTreeReader(const JSValue &value) noexcept : m_root{value}, m_current{&value} {}
+
+JSValueTreeReader::JSValueTreeReader(JSValue &&value) noexcept
+    : m_ownedValue{std::move(value)}, m_root{m_ownedValue}, m_current{&m_ownedValue} {}
+
+JSValueType JSValueTreeReader::ValueType() noexcept {
+  return m_current->Type();
+}
+
+bool JSValueTreeReader::GetNextObjectProperty(hstring &propertyName) noexcept {
+  if (!m_isInContainer) {
+    if (m_current->Type() == JSValueType::Object) {
+      const auto &properties = m_current->Object();
+      const auto &property = properties.begin();
+      if (property != properties.end()) {
+        m_stack.emplace_back(*m_current, property);
+        SetCurrentValue(property->second);
+        propertyName = to_hstring(property->first);
+        return true;
+      } else {
+        m_isInContainer = !m_stack.empty();
+      }
+    }
+  } else if (!m_stack.empty()) {
+    auto &entry = m_stack.back();
+    if (entry.Value.Type() == JSValueType::Object) {
+      auto &property = entry.Property;
+      if (++property != entry.Value.Object().end()) {
+        SetCurrentValue(property->second);
+        propertyName = to_hstring(property->first);
+        return true;
+      } else {
+        m_current = &entry.Value;
+        m_stack.pop_back();
+        m_isInContainer = !m_stack.empty();
+      }
+    }
+  }
+
+  propertyName = to_hstring(L"");
+  return false;
+}
+
+bool JSValueTreeReader::GetNextArrayItem() noexcept {
+  if (!m_isInContainer) {
+    if (m_current->Type() == JSValueType::Array) {
+      const auto &item = m_current->Array().begin();
+      if (item != m_current->Array().end()) {
+        m_stack.emplace_back(*m_current, item);
+        SetCurrentValue(*item);
+        return true;
+      } else {
+        m_isInContainer = !m_stack.empty();
+      }
+    }
+  } else if (!m_stack.empty()) {
+    auto &entry = m_stack.back();
+    if (entry.Value.Type() == JSValueType::Array) {
+      if (++entry.Item != entry.Value.Array().end()) {
+        SetCurrentValue(*entry.Item);
+        return true;
+      } else {
+        m_current = &entry.Value;
+        m_stack.pop_back();
+        m_isInContainer = !m_stack.empty();
+      }
+    }
+  }
+
+  return false;
+}
+
+void JSValueTreeReader::SetCurrentValue(const JSValue &value) noexcept {
+  m_current = &value;
+  switch (value.Type()) {
+    case JSValueType::Object:
+    case JSValueType::Array:
+      m_isInContainer = false;
+      break;
+    default:
+      m_isInContainer = true;
+      break;
+  }
+}
+
+hstring JSValueTreeReader::GetString() noexcept {
+  return to_hstring((ValueType() == JSValueType::String) ? m_current->String() : "");
+}
+
+bool JSValueTreeReader::GetBoolean() noexcept {
+  return (ValueType() == JSValueType::Boolean) ? m_current->Boolean() : false;
+}
+
+int64_t JSValueTreeReader::GetInt64() noexcept {
+  return (ValueType() == JSValueType::Int64) ? m_current->Int64() : 0;
+}
+
+double JSValueTreeReader::GetDouble() noexcept {
+  return (ValueType() == JSValueType::Double) ? m_current->Double() : 0;
+}
+
+IJSValueReader MakeJSValueTreeReader(const JSValue &root) noexcept {
+  return make<JSValueTreeReader>(root);
+}
+
+IJSValueReader MakeJSValueTreeReader(JSValue &&root) noexcept {
+  return make<JSValueTreeReader>(std::move(root));
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValueTreeReader.h b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeReader.h
new file mode 100644
index 00000000000..11179793806
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeReader.h
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#ifndef MICROSOFT_REACTNATIVE_JSVALUETREEREADER
+#define MICROSOFT_REACTNATIVE_JSVALUETREEREADER
+
+#include "JSValue.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+struct JSValueTreeReader : implements<JSValueTreeReader, IJSValueReader> {
+  JSValueTreeReader(const JSValue &value) noexcept;
+  JSValueTreeReader(JSValue &&value) noexcept;
+
+ public: // IJSValueReader
+  JSValueType ValueType() noexcept;
+  bool GetNextObjectProperty(hstring &propertyName) noexcept;
+  bool GetNextArrayItem() noexcept;
+  hstring GetString() noexcept;
+  bool GetBoolean() noexcept;
+  int64_t GetInt64() noexcept;
+  double GetDouble() noexcept;
+
+ private:
+  struct StackEntry {
+    StackEntry(const JSValue &value, const JSValueObject::const_iterator &property) noexcept;
+    StackEntry(const JSValue &value, const JSValueArray::const_iterator &item) noexcept;
+
+    const JSValue &Value;
+    JSValueArray::const_iterator Item;
+    JSValueObject::const_iterator Property;
+  };
+
+ private:
+  void SetCurrentValue(const JSValue &value) noexcept;
+
+ private:
+  const JSValue m_ownedValue;
+  const JSValue &m_root;
+  const JSValue *m_current;
+  bool m_isInContainer{false};
+  std::vector<StackEntry> m_stack;
+};
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
+
+#endif // MICROSOFT_REACTNATIVE_JSVALUETREEREADER
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValueTreeWriter.cpp b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeWriter.cpp
new file mode 100644
index 00000000000..7717c8e7942
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeWriter.cpp
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "JSValueTreeWriter.h"
+#include "Crash.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+//===========================================================================
+// JSValueTreeWriter implementation
+//===========================================================================
+
+JSValueTreeWriter::JSValueTreeWriter(JSValue &resultValue) noexcept : m_resultValue{resultValue} {
+  m_containerStack.push(ContainerInfo{ContainerType::None});
+}
+
+void JSValueTreeWriter::WriteNull() noexcept {
+  WriteValue(JSValue{});
+}
+
+void JSValueTreeWriter::WriteBoolean(bool value) noexcept {
+  WriteValue(JSValue{value});
+}
+
+void JSValueTreeWriter::WriteInt64(int64_t value) noexcept {
+  WriteValue(JSValue{value});
+}
+
+void JSValueTreeWriter::WriteDouble(double value) noexcept {
+  WriteValue(JSValue{value});
+}
+
+void JSValueTreeWriter::WriteString(const hstring &value) noexcept {
+  WriteValue(JSValue{to_string(value)});
+}
+
+void JSValueTreeWriter::WriteObjectBegin() noexcept {
+  m_containerStack.push(ContainerInfo{ContainerType::Object});
+}
+
+void JSValueTreeWriter::WritePropertyName(const winrt::hstring &name) noexcept {
+  auto &top = m_containerStack.top();
+  VerifyElseCrash(top.Type == ContainerType::Object);
+  top.PropertyName = to_string(name);
+}
+
+void JSValueTreeWriter::WriteObjectEnd() noexcept {
+  auto &top = m_containerStack.top();
+  VerifyElseCrash(top.Type == ContainerType::Object);
+  JSValue value{std::move(top.Object)};
+  m_containerStack.pop();
+  WriteValue(std::move(value));
+}
+
+void JSValueTreeWriter::WriteArrayBegin() noexcept {
+  m_containerStack.push(ContainerInfo{ContainerType::Array});
+}
+
+void JSValueTreeWriter::WriteArrayEnd() noexcept {
+  auto &top = m_containerStack.top();
+  VerifyElseCrash(top.Type == ContainerType::Array);
+  JSValue value{std::move(top.Array)};
+  m_containerStack.pop();
+  WriteValue(std::move(value));
+}
+
+void JSValueTreeWriter::WriteValue(JSValue &&value) noexcept {
+  auto &top = m_containerStack.top();
+  switch (top.Type) {
+    case ContainerType::None:
+      m_resultValue = std::move(value);
+      break;
+    case ContainerType::Object:
+      top.Object.emplace(std::move(top.PropertyName), std::move(value));
+      break;
+    case ContainerType::Array:
+      top.Array.push_back(std::move(value));
+      break;
+  }
+}
+
+IJSValueWriter MakeJSValueTreeWriter(JSValue &resultValue) noexcept {
+  return make<JSValueTreeWriter>(resultValue);
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValueTreeWriter.h b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeWriter.h
new file mode 100644
index 00000000000..7c5f2c84d15
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValueTreeWriter.h
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#ifndef MICROSOFT_REACTNATIVE_JSVALUETREEWRITER
+#define MICROSOFT_REACTNATIVE_JSVALUETREEWRITER
+
+#include <stack>
+#include "JSValue.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+// Writes to a tree of JSValue objects.
+struct JSValueTreeWriter : implements<JSValueTreeWriter, IJSValueWriter> {
+  JSValueTreeWriter(JSValue &resultValue) noexcept;
+
+ public: // IJSValueWriter
+  void WriteNull() noexcept;
+  void WriteBoolean(bool value) noexcept;
+  void WriteInt64(int64_t value) noexcept;
+  void WriteDouble(double value) noexcept;
+  void WriteString(const winrt::hstring &value) noexcept;
+  void WriteObjectBegin() noexcept;
+  void WritePropertyName(const winrt::hstring &name) noexcept;
+  void WriteObjectEnd() noexcept;
+  void WriteArrayBegin() noexcept;
+  void WriteArrayEnd() noexcept;
+
+ private:
+  enum struct ContainerType { None, Object, Array };
+
+  struct ContainerInfo {
+    ContainerInfo(ContainerType type) noexcept : Type{std::move(type)} {}
+
+    ContainerType Type{ContainerType::None};
+    JSValueObject Object;
+    JSValueArray Array;
+    std::string PropertyName;
+  };
+
+ private:
+  void WriteValue(JSValue &&value) noexcept;
+
+ private:
+  std::stack<ContainerInfo> m_containerStack;
+  JSValue &m_resultValue;
+};
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
+
+#endif // MICROSOFT_REACTNATIVE_JSVALUETREEWRITER
diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValueWriter.h b/vnext/Microsoft.ReactNative.Cxx/JSValueWriter.h
index 2640c5a1119..959e53aef24 100644
--- a/vnext/Microsoft.ReactNative.Cxx/JSValueWriter.h
+++ b/vnext/Microsoft.ReactNative.Cxx/JSValueWriter.h
@@ -5,116 +5,232 @@
 #ifndef MICROSOFT_REACTNATIVE_JSVALUEWRITER
 #define MICROSOFT_REACTNATIVE_JSVALUEWRITER
 
+#include "StructInfo.h"
 #include "winrt/Microsoft.ReactNative.Bridge.h"
-#include "winrt/Microsoft.ReactNative.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
 
 //==============================================================================
-// IJSValueWriter helpers
+// IJSValueWriter extensions
 //==============================================================================
-namespace Microsoft::ReactNative {
 
+// Forward declarations
+void WriteValue(IJSValueWriter const &writer, std::nullptr_t) noexcept;
+template <class T, std::enable_if_t<std::is_convertible_v<T, std::string_view>, int> = 1>
+void WriteValue(IJSValueWriter const &writer, T const &value) noexcept;
+template <class T, std::enable_if_t<std::is_convertible_v<T, std::wstring_view>, int> = 1>
+void WriteValue(IJSValueWriter const &writer, T const &value) noexcept;
+void WriteValue(IJSValueWriter const &writer, bool value) noexcept;
+void WriteValue(IJSValueWriter const &writer, int8_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, int16_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, int32_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, int64_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, uint8_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, uint16_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, uint32_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, uint64_t value) noexcept;
+void WriteValue(IJSValueWriter const &writer, float value) noexcept;
+void WriteValue(IJSValueWriter const &writer, double value) noexcept;
+template <class T, std::enable_if_t<std::is_enum_v<T>, int> = 1>
+void WriteValue(IJSValueWriter const &writer, T const &value) noexcept;
 template <class T>
-inline bool WriteProperty(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer,
-    const std::string &name,
-    T value) noexcept {
-  return writer.WritePropertyName(winrt::to_hstring(name)) && WriteValue(writer, value);
-}
+void WriteValue(IJSValueWriter const &writer, std::optional<T> const &value) noexcept;
+template <class T, class TCompare = std::less<>, class TAlloc = std::allocator<pair<const std::string, T>>>
+void WriteValue(IJSValueWriter const &writer, std::map<std::string, T, TCompare, TAlloc> const &value) noexcept;
+template <class T, class TCompare = std::less<>, class TAlloc = std::allocator<pair<const std::string, T>>>
+void WriteValue(IJSValueWriter const &writer, std::map<std::wstring, T, TCompare, TAlloc> const &value) noexcept;
+template <class T, class TAlloc = allocator<T>>
+void WriteValue(IJSValueWriter const &writer, std::vector<T, TAlloc> const &value) noexcept;
+template <class... Ts>
+void WriteValue(IJSValueWriter const &writer, std::tuple<Ts...> const &value) noexcept;
+
+void WriteValue(IJSValueWriter const &writer, JSValue const &value) noexcept;
+void WriteValue(IJSValueWriter const &writer, JSValueObject const &value) noexcept;
+void WriteValue(IJSValueWriter const &writer, JSValueArray const &value) noexcept;
+
+template <class T, std::enable_if_t<!std::is_void_v<decltype(GetStructInfo(static_cast<T *>(nullptr)))>, int> = 1>
+void WriteValue(IJSValueWriter const &writer, T const &value) noexcept;
 
 template <class T>
-inline bool
-WriteProperty(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, const char *name, T value) noexcept {
-  return writer.WritePropertyName(winrt::to_hstring(name)) && WriteValue(writer, value);
+void WriteProperty(IJSValueWriter const &writer, std::string_view propertyName, T const &value) noexcept;
+template <class T>
+void WriteProperty(IJSValueWriter const &writer, std::wstring_view propertyName, T const &value) noexcept;
+template <class T>
+void WriteProperties(IJSValueWriter const &writer, T const &value) noexcept;
+
+template <class... TArgs>
+void WriteArgs(IJSValueWriter const &writer, TArgs const &... args) noexcept;
+
+IJSValueWriter MakeJSValueTreeWriter(JSValue &resultValue) noexcept;
+
+//==============================================================================
+// IJSValueWriter extensions implementation
+//==============================================================================
+
+inline void WriteValue(IJSValueWriter const &writer, std::nullptr_t) noexcept {
+  writer.WriteNull();
 }
 
-template <class T>
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, T value) noexcept {
-  static_assert(sizeof(std::decay_t<T>) == 0, "Implement WriteValue for the T type");
+template <class T, std::enable_if_t<std::is_convertible_v<T, std::string_view>, int>>
+inline void WriteValue(IJSValueWriter const &writer, T const &value) noexcept {
+  writer.WriteString(to_hstring(value));
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, bool value) noexcept {
-  return writer.WriteBoolean(value);
+template <class T, std::enable_if_t<std::is_convertible_v<T, std::wstring_view>, int>>
+inline void WriteValue(IJSValueWriter const &writer, T const &value) noexcept {
+  writer.WriteString(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, int8_t value) noexcept {
-  return writer.WriteInt64(value);
+inline void WriteValue(IJSValueWriter const &writer, bool value) noexcept {
+  writer.WriteBoolean(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, int16_t value) noexcept {
-  return writer.WriteInt64(value);
+inline void WriteValue(IJSValueWriter const &writer, int8_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, int32_t value) noexcept {
-  return writer.WriteInt64(value);
+inline void WriteValue(IJSValueWriter const &writer, int16_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, int64_t value) noexcept {
-  return writer.WriteInt64(value);
+inline void WriteValue(IJSValueWriter const &writer, int32_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, uint8_t value) noexcept {
-  return writer.WriteInt64(static_cast<int64_t>(value));
+inline void WriteValue(IJSValueWriter const &writer, int64_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, uint16_t value) noexcept {
-  return writer.WriteInt64(static_cast<int64_t>(value));
+inline void WriteValue(IJSValueWriter const &writer, uint8_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, uint32_t value) noexcept {
-  return writer.WriteInt64(static_cast<int64_t>(value));
+inline void WriteValue(IJSValueWriter const &writer, uint16_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, uint64_t value) noexcept {
-  return writer.WriteInt64(static_cast<int64_t>(value));
+inline void WriteValue(IJSValueWriter const &writer, uint32_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, double value) noexcept {
-  return writer.WriteDouble(value);
+inline void WriteValue(IJSValueWriter const &writer, uint64_t value) noexcept {
+  writer.WriteInt64(value);
 }
 
-inline bool WriteValue(winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer, float value) noexcept {
-  return writer.WriteDouble(value);
+inline void WriteValue(IJSValueWriter const &writer, float value) noexcept {
+  writer.WriteDouble(value);
 }
 
-inline bool WriteValue(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer,
-    const std::string &value) noexcept {
-  return writer.WriteString(winrt::to_hstring(value));
+inline void WriteValue(IJSValueWriter const &writer, double value) noexcept {
+  writer.WriteDouble(value);
 }
 
-inline bool WriteValue(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer,
-    const char *value) noexcept {
-  return writer.WriteString(winrt::to_hstring(value));
+template <class T, std::enable_if_t<std::is_enum_v<T>, int>>
+inline void WriteValue(IJSValueWriter const &writer, T const &value) noexcept {
+  WriteValue(writer, static_cast<int32_t>(value));
 }
 
-inline bool WriteValue(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer,
-    const std::wstring &value) noexcept {
-  return writer.WriteString(value);
+template <class T>
+inline void WriteValue(IJSValueWriter const &writer, std::optional<T> const &value) noexcept {
+  if (value.has_value()) {
+    WriteValue(writer, *value);
+  } else {
+    writer.WriteNull();
+  }
 }
 
-inline bool WriteValue(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer,
-    const wchar_t *value) noexcept {
-  return writer.WriteString(value);
+template <class T, class TCompare, class TAlloc>
+inline void WriteValue(IJSValueWriter const &writer, std::map<std::string, T, TCompare, TAlloc> const &value) noexcept {
+  writer.WriteObjectBegin();
+  for (const auto &entry : value) {
+    WriteProperty(writer, entry.first, entry.second);
+  }
+  writer.WriteObjectEnd();
 }
 
-template <class... TArgs>
-inline void WriteArgs(
-    winrt::Microsoft::ReactNative::Bridge::IJSValueWriter const &writer,
-    const TArgs &... args) noexcept {
+template <class T, class TCompare, class TAlloc>
+inline void WriteValue(
+    IJSValueWriter const &writer,
+    std::map<std::wstring, T, TCompare, TAlloc> const &value) noexcept {
+  writer.WriteObjectBegin();
+  for (const auto &entry : value) {
+    WriteProperty(writer, entry.first, entry.second);
+  }
+  writer.WriteObjectEnd();
+}
+
+template <class T, class TAlloc>
+inline void WriteValue(IJSValueWriter const &writer, std::vector<T, TAlloc> const &value) noexcept {
   writer.WriteArrayBegin();
+  for (const auto &item : value) {
+    WriteValue(writer, item);
+  }
+  writer.WriteArrayEnd();
+}
+
+template <class T, size_t... I>
+inline void WriteTuple(IJSValueWriter const &writer, T const &tuple, std::index_sequence<I...>) noexcept {
+  WriteArgs(writer, std::get<I>(tuple)...);
+}
 
+template <class... Ts>
+inline void WriteValue(IJSValueWriter const &writer, std::tuple<Ts...> const &value) noexcept {
+  WriteTuple(writer, value, std::make_index_sequence<sizeof...(Ts)>{});
+}
+
+inline void WriteValue(IJSValueWriter const &writer, JSValue const &value) noexcept {
+  value.WriteTo(writer);
+}
+
+inline void WriteValue(IJSValueWriter const &writer, JSValueObject const &value) noexcept {
+  JSValue::WriteObjectTo(writer, value);
+}
+
+inline void WriteValue(IJSValueWriter const &writer, JSValueArray const &value) noexcept {
+  JSValue::WriteArrayTo(writer, value);
+}
+
+template <class T, std::enable_if_t<!std::is_void_v<decltype(GetStructInfo(static_cast<T *>(nullptr)))>, int>>
+inline void WriteValue(IJSValueWriter const &writer, T const &value) noexcept {
+  writer.WriteObjectBegin();
+  for (const auto &fieldEntry : StructInfo<T>::FieldMap) {
+    writer.WritePropertyName(fieldEntry.first);
+    fieldEntry.second.WriteField(writer, &value);
+  }
+  writer.WriteObjectEnd();
+}
+
+template <class T>
+inline void WriteProperty(IJSValueWriter const &writer, std::string_view propertyName, T const &value) noexcept {
+  writer.WritePropertyName(to_hstring(propertyName));
+  WriteValue(writer, value);
+}
+
+template <class T>
+inline void WriteProperty(IJSValueWriter const &writer, std::wstring_view propertyName, T const &value) noexcept {
+  writer.WritePropertyName(propertyName);
+  WriteValue(writer, value);
+}
+
+template <class T>
+inline void WriteProperties(IJSValueWriter const &writer, T const &value) noexcept {
+  JSValue jsValue;
+  WriteValue(MakeJSValueTreeWriter(/*ref*/ jsValue), value);
+  for (auto &property : jsValue.Object()) {
+    WriteProperty(writer, property.first, property.second);
+  }
+}
+
+template <class... TArgs>
+inline void WriteArgs(IJSValueWriter const &writer, TArgs const &... args) noexcept {
+  writer.WriteArrayBegin();
   if constexpr (sizeof...(args) > 0) {
-    // To write variadic template arguments in natural order we must use them in
-    // an initializer list.
+    // To write variadic template arguments in natural order we must use them in an initializer list.
     [[maybe_unused]] int dummy[] = {(WriteValue(writer, args), 0)...};
   }
-
   writer.WriteArrayEnd();
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Bridge
 
 #endif // MICROSOFT_REACTNATIVE_JSVALUEWRITER
diff --git a/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems b/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems
index 05b6b6ea773..401562a3c51 100644
--- a/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems
+++ b/vnext/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems
@@ -14,13 +14,26 @@
     <ProjectCapability Include="SourceItemsFromImports" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)Crash.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSValue.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSValueReader.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSValueTreeReader.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)JSValueTreeWriter.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSValueWriter.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ModuleMemberRegistration.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ModuleRegistration.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ModuleRegistry.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)NativeModules.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ReactError.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ReactMemberInfo.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)ReactPromise.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)StructInfo.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSValue.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSValueTreeReader.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JSValueTreeWriter.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ModuleRegistration.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ReactPromise.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Cxx/ModuleMemberRegistration.h b/vnext/Microsoft.ReactNative.Cxx/ModuleMemberRegistration.h
index 05319925e25..159f3168351 100644
--- a/vnext/Microsoft.ReactNative.Cxx/ModuleMemberRegistration.h
+++ b/vnext/Microsoft.ReactNative.Cxx/ModuleMemberRegistration.h
@@ -1,46 +1,53 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+// We implement optional parameter macros based on the StackOverflow discussion:
+// https://stackoverflow.com/questions/3046889/optional-parameters-with-c-macros
+// Please refer to it if you want to understand it works.
+
 #pragma once
-#include "winrt/Microsoft.ReactNative.Bridge.h"
-#include "winrt/Microsoft.ReactNative.h"
+#include "ReactMemberInfo.h"
 
 // Internal implementation details.
 // Registration of a method relies on a TLS context that is setup when object is
 // created. The advantage is that we do zero work during static initialization.
 // The disadvantage is that we require to have one bool field per registration.
-#define INTERNAL_REACT_METHOD_4_ARGS(methodType, isAsync, method, methodName)                                 \
-  bool REACT_reg##method{                                                                                     \
-      ::Microsoft::ReactNative::                                                                              \
-          Module##methodType##MethodInfo<decltype(&std::remove_pointer_t<decltype(this)>::method)>::Register( \
-              this, methodName, &std::remove_pointer_t<decltype(this)>::method, isAsync)};
+#define INTERNAL_REACT_METHOD_3_ARGS(methodType, method, methodName)                                     \
+  template <class TClass, class TRegistry>                                                               \
+  static void RegisterMember(                                                                            \
+      TRegistry &registry, winrt::Microsoft::ReactNative::Bridge::ReactMemberId<__COUNTER__>) noexcept { \
+    registry.Register##methodType##Method<TClass>(&TClass::method, methodName);                          \
+  }
 
-#define INTERNAL_REACT_METHOD_3_ARGS(methodType, isAsync, method) \
-  INTERNAL_REACT_METHOD_4_ARGS(methodType, isAsync, method, #method)
+#define INTERNAL_REACT_METHOD_2_ARGS(methodType, method) INTERNAL_REACT_METHOD_3_ARGS(methodType, method, L## #method)
 
 #define INTERNAL_REACT_MEMBER_3RD_ARG(arg1, arg2, arg3, ...) arg3
 
 #define INTERNAL_REACT_MEMBER_RECOMPOSER(argsWithParentheses) INTERNAL_REACT_MEMBER_3RD_ARG argsWithParentheses
 
-#define INTERNAL_REACT_METHOD_MACRO_CHOOSER(...) \
-  INTERNAL_REACT_MEMBER_RECOMPOSER((__VA_ARGS__, INTERNAL_REACT_METHOD_4_ARGS, INTERNAL_REACT_METHOD_3_ARGS, ))
+#define INTERNAL_REACT_METHOD(...) \
+  INTERNAL_REACT_MEMBER_RECOMPOSER((__VA_ARGS__, INTERNAL_REACT_METHOD_3_ARGS, INTERNAL_REACT_METHOD_2_ARGS, ))
 
-#define INTERNAL_REACT_CONSTANT_2_ARGS(field, constantName)                                                     \
-  bool REACT_reg##field{                                                                                        \
-      ::Microsoft::ReactNative::ModuleConstFieldInfo<decltype(&std::remove_pointer_t<decltype(this)>::field)>:: \
-          Register(this, constantName, &std::remove_pointer_t<decltype(this)>::field)};
+#define INTERNAL_REACT_CONSTANT_2_ARGS(field, constantName)                                              \
+  template <class TClass, class TRegistry>                                                               \
+  static void RegisterMember(                                                                            \
+      TRegistry &registry, winrt::Microsoft::ReactNative::Bridge::ReactMemberId<__COUNTER__>) noexcept { \
+    registry.RegisterConstant<TClass>(&TClass::field, constantName);                                     \
+  }
 
-#define INTERNAL_REACT_CONSTANT_1_ARGS(field) INTERNAL_REACT_CONSTANT_2_ARGS(field, #field)
+#define INTERNAL_REACT_CONSTANT_1_ARGS(field) INTERNAL_REACT_CONSTANT_2_ARGS(field, L## #field)
 
-#define INTERNAL_REACT_CONSTANT_MACRO_CHOOSER(...) \
+#define INTERNAL_REACT_CONSTANT(...) \
   INTERNAL_REACT_MEMBER_RECOMPOSER((__VA_ARGS__, INTERNAL_REACT_CONSTANT_2_ARGS, INTERNAL_REACT_CONSTANT_1_ARGS, ))
 
-#define INTERNAL_REACT_EVENT_2_ARGS(field, eventName)                                                           \
-  bool REACT_reg##field{                                                                                        \
-      ::Microsoft::ReactNative::ModuleEventFieldInfo<decltype(&std::remove_pointer_t<decltype(this)>::field)>:: \
-          Register(this, eventName, &std::remove_pointer_t<decltype(this)>::field)};
+#define INTERNAL_REACT_EVENT_2_ARGS(field, eventName)                                                    \
+  template <class TClass, class TRegistry>                                                               \
+  static void RegisterMember(                                                                            \
+      TRegistry &registry, winrt::Microsoft::ReactNative::Bridge::ReactMemberId<__COUNTER__>) noexcept { \
+    registry.RegisterEvent<TClass>(&TClass::field, eventName);                                           \
+  }
 
-#define INTERNAL_REACT_EVENT_1_ARGS(field) INTERNAL_REACT_EVENT_2_ARGS(field, #field)
+#define INTERNAL_REACT_EVENT_1_ARGS(field) INTERNAL_REACT_EVENT_2_ARGS(field, L## #field)
 
-#define INTERNAL_REACT_EVENT_MACRO_CHOOSER(...) \
+#define INTERNAL_REACT_EVENT(...) \
   INTERNAL_REACT_MEMBER_RECOMPOSER((__VA_ARGS__, INTERNAL_REACT_EVENT_2_ARGS, INTERNAL_REACT_EVENT_1_ARGS, ))
diff --git a/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.cpp b/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.cpp
index 90844afddf3..f9c2c7ae96d 100644
--- a/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.cpp
+++ b/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.cpp
@@ -4,12 +4,11 @@
 #include "pch.h"
 #include "ModuleRegistration.h"
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Bridge {
 
 const ModuleRegistration *ModuleRegistration::s_head{nullptr};
 
-ModuleRegistration::ModuleRegistration(const char *moduleName, const char *eventEmitterName) noexcept
-    : m_moduleName{moduleName}, m_eventEmitterName{eventEmitterName}, m_next{s_head} {
+ModuleRegistration::ModuleRegistration(const wchar_t *moduleName) noexcept : m_moduleName{moduleName}, m_next{s_head} {
   s_head = this;
 }
 
@@ -19,4 +18,4 @@ void AddAttributedModules(winrt::Microsoft::ReactNative::Bridge::IReactPackageBu
   }
 }
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.h b/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.h
index a2331a120f6..3ca2213bdf4 100644
--- a/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.h
+++ b/vnext/Microsoft.ReactNative.Cxx/ModuleRegistration.h
@@ -3,18 +3,17 @@
 
 #pragma once
 #include "winrt/Microsoft.ReactNative.Bridge.h"
-#include "winrt/Microsoft.ReactNative.h"
 
 #define INTERNAL_REACT_MODULE_3_ARGS(moduleClass, moduleName, eventEmitterName)                               \
   struct moduleClass;                                                                                         \
                                                                                                               \
   template <class TDummy>                                                                                     \
-  struct moduleClass##_ModuleRegistration final : ::Microsoft::ReactNative::ModuleRegistration {              \
+  struct moduleClass##_ModuleRegistration final : winrt::Microsoft::ReactNative::Bridge::ModuleRegistration { \
     moduleClass##_ModuleRegistration() noexcept                                                               \
-        : ::Microsoft::ReactNative::ModuleRegistration(moduleName, eventEmitterName) {}                       \
+        : winrt::Microsoft::ReactNative::Bridge::ModuleRegistration(moduleName) {}                            \
                                                                                                               \
     winrt::Microsoft::ReactNative::Bridge::ReactModuleProvider MakeModuleProvider() const noexcept override { \
-      return ::Microsoft::ReactNative::MakeModuleProvider<moduleClass>(ModuleName(), EventEmitterName());     \
+      return winrt::Microsoft::ReactNative::Bridge::MakeModuleProvider<moduleClass>();                        \
     }                                                                                                         \
                                                                                                               \
     static const moduleClass##_ModuleRegistration Registration;                                               \
@@ -22,24 +21,30 @@
                                                                                                               \
   template <class TDummy>                                                                                     \
   const moduleClass##_ModuleRegistration<TDummy> moduleClass##_ModuleRegistration<TDummy>::Registration;      \
-  template struct moduleClass##_ModuleRegistration<int>;
+  template struct moduleClass##_ModuleRegistration<int>;                                                      \
+                                                                                                              \
+  template <class TRegistry>                                                                                  \
+  void RegisterModule(TRegistry &registry, moduleClass *) noexcept {                                          \
+    registry.RegisterModule<moduleClass>(                                                                     \
+        moduleName, eventEmitterName, winrt::Microsoft::ReactNative::Bridge::ReactMemberId<__COUNTER__>{});   \
+  }
 
-#define INTERNAL_REACT_MODULE_2_ARGS(moduleClass, moduleName) INTERNAL_REACT_MODULE_3_ARGS(moduleClass, moduleName, "")
+#define INTERNAL_REACT_MODULE_2_ARGS(moduleClass, moduleName) INTERNAL_REACT_MODULE_3_ARGS(moduleClass, moduleName, L"")
 
-#define INTERNAL_REACT_MODULE_1_ARGS(moduleClass) INTERNAL_REACT_MODULE_2_ARGS(moduleClass, #moduleClass)
+#define INTERNAL_REACT_MODULE_1_ARGS(moduleClass) INTERNAL_REACT_MODULE_2_ARGS(moduleClass, L## #moduleClass)
 
 #define INTERNAL_REACT_MODULE_4TH_ARG(arg1, arg2, arg3, arg4, ...) arg4
 
 #define INTERNAL_REACT_MODULE_RECOMPOSER(argsWithParentheses) INTERNAL_REACT_MODULE_4TH_ARG argsWithParentheses
 
-#define INTERNAL_REACT_MODULE_MACRO_CHOOSER(...) \
-  INTERNAL_REACT_MODULE_RECOMPOSER(              \
+#define INTERNAL_REACT_MODULE(...)  \
+  INTERNAL_REACT_MODULE_RECOMPOSER( \
       (__VA_ARGS__, INTERNAL_REACT_MODULE_3_ARGS, INTERNAL_REACT_MODULE_2_ARGS, INTERNAL_REACT_MODULE_1_ARGS, ))
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Bridge {
 
 struct ModuleRegistration {
-  ModuleRegistration(const char *moduleName, const char *eventEmitterName) noexcept;
+  ModuleRegistration(const wchar_t *moduleName) noexcept;
 
   virtual winrt::Microsoft::ReactNative::Bridge::ReactModuleProvider MakeModuleProvider() const noexcept = 0;
 
@@ -51,17 +56,12 @@ struct ModuleRegistration {
     return m_next;
   }
 
-  const char *ModuleName() const noexcept {
+  const wchar_t *ModuleName() const noexcept {
     return m_moduleName;
   }
 
-  const char *EventEmitterName() const noexcept {
-    return m_eventEmitterName;
-  }
-
  private:
-  const char *m_moduleName;
-  const char *m_eventEmitterName;
+  const wchar_t *m_moduleName;
   const ModuleRegistration *m_next{nullptr};
 
   static const ModuleRegistration *s_head;
@@ -69,4 +69,4 @@ struct ModuleRegistration {
 
 void AddAttributedModules(winrt::Microsoft::ReactNative::Bridge::IReactPackageBuilder const &packageBuilder) noexcept;
 
-} // namespace Microsoft::ReactNative
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/ModuleRegistry.h b/vnext/Microsoft.ReactNative.Cxx/ModuleRegistry.h
new file mode 100644
index 00000000000..9821cbd108c
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/ModuleRegistry.h
@@ -0,0 +1,17 @@
+#pragma once
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "ReactMemberInfo.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+struct ModuleRegistry {
+  template <class TClass, int I>
+  void RegisterModule(wchar_t const *moduleName, wchar_t const *eventEmitterName, ReactMemberId<I>) noexcept;
+
+  template <class TClass, int I>
+  void RegisterModule(wchar_t const *moduleName, wchar_t const *eventEmitterName, ReactMemberId<I>) noexcept;
+};
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/NativeModules.h b/vnext/Microsoft.ReactNative.Cxx/NativeModules.h
index fbb27e7c328..110473d3fab 100644
--- a/vnext/Microsoft.ReactNative.Cxx/NativeModules.h
+++ b/vnext/Microsoft.ReactNative.Cxx/NativeModules.h
@@ -3,13 +3,13 @@
 
 #pragma once
 #include "winrt/Microsoft.ReactNative.Bridge.h"
-#include "winrt/Microsoft.ReactNative.h"
 
 #include <type_traits>
 #include "JSValueReader.h"
 #include "JSValueWriter.h"
 #include "ModuleMemberRegistration.h"
 #include "ModuleRegistration.h"
+#include "ReactPromise.h"
 
 // The macro to annotate a C++ class as a ReactNative module.
 //
@@ -20,15 +20,16 @@
 // - eventEmitterName (optional) - the event emitter name used in JavaScript.
 //     Default is the RCTDeviceEventEmitter.
 #define REACT_MODULE(/* moduleClass, [opt] moduleName, [opt] eventEmitterName */...) \
-  INTERNAL_REACT_MODULE_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
+  INTERNAL_REACT_MODULE(__VA_ARGS__)(__VA_ARGS__)
 
-// The macro to annotate a method to export to JavaScript.
+// REACT_METHOD annotates a method to export to JavaScript.
 // It declares an asynchronous method. To return a value:
 // - Return void and have a Callback as a last parameter. The Callback type can
 // be any std::function like type. I.e. Func<void(Args...)>.
-// - Return void and have two callbacks as last parameters. In JavaScript the
-// method returns Promise. To keep it as two callbacks use the
-// REACT_ASYNC_METHOD macro.
+// - Return void and have two callbacks as last parameters. One is used to return
+// value and another an error.
+// - Return void and have a ReactPromise as a last parameter. In JavaScript the
+// method returns Promise.
 // - Return non-void value. In JavaScript it is treated as a method with one
 // Callback. Return std::pair<Error, Value> to be able to communicate error
 // condition.
@@ -37,34 +38,22 @@
 // - method (required) - the method name the macro is attached to.
 // - methodName (optional) - the method name visible to JavaScript. Default is
 //     the method name.
-#define REACT_METHOD(/* method, [opt] methodName */...) \
-  INTERNAL_REACT_METHOD_MACRO_CHOOSER(__VA_ARGS__)(, false, __VA_ARGS__)
-
-// The same as REACT_METHOD, but two callbacks are exposed as callbacks, and not
-// as a Promise.
-#define REACT_ASYNC_METHOD(/* method, [opt] methodName */...) \
-  INTERNAL_REACT_METHOD_MACRO_CHOOSER(__VA_ARGS__)            \
-  (, true, __VA_ARGS__)
+#define REACT_METHOD(/* method, [opt] methodName */...) INTERNAL_REACT_METHOD(__VA_ARGS__)(, __VA_ARGS__)
 
 // A method that is called synchronously. It must be used rarely because it may
 // cause out-of-order execution when used along with asynchronous methods.
-#define REACT_SYNC_METHOD(/* method, [opt] methodName */...) \
-  INTERNAL_REACT_METHOD_MACRO_CHOOSER(__VA_ARGS__)           \
-  (Sync, false, __VA_ARGS__)
+#define REACT_SYNC_METHOD(/* method, [opt] methodName */...) INTERNAL_REACT_METHOD(__VA_ARGS__)(Sync, __VA_ARGS__)
 
 // A method where we can define constants.
-// Constant definition relies on a TLS context that is setup when object is
-// created.
-#define REACT_CONSTANT_PROVIDER(method) INTERNAL_REACT_METHOD_4_ARGS(Const, false, method, "")
+#define REACT_CONSTANT_PROVIDER(method) INTERNAL_REACT_METHOD_3_ARGS(Const, method, L"")
 
 // Use with a field to provide a constant
-#define REACT_CONSTANT(/* field, [opt] constantName */...) \
-  INTERNAL_REACT_CONSTANT_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
+#define REACT_CONSTANT(/* field, [opt] constantName */...) INTERNAL_REACT_CONSTANT(__VA_ARGS__)(__VA_ARGS__)
 
 // Use with a field for events
-#define REACT_EVENT(/* field, [opt] eventName */...) INTERNAL_REACT_EVENT_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__)
+#define REACT_EVENT(/* field, [opt] eventName */...) INTERNAL_REACT_EVENT(__VA_ARGS__)(__VA_ARGS__)
 
-namespace Microsoft::ReactNative {
+namespace winrt::Microsoft::ReactNative::Bridge {
 
 namespace Internal {
 
@@ -89,85 +78,51 @@ struct GetCallbackCount<std::tuple<>> {
 
 template <class TArg>
 struct GetCallbackCount<std::tuple<TArg>> {
-  constexpr static size_t Value = IsCallback<TArg>::value ? 1 : 0;
+  constexpr static size_t Value = IsCallback<std::remove_const_t<std::remove_reference_t<TArg>>>::value ? 1 : 0;
 };
 
 template <class TArg0, class TArg1, class... TArgs>
 struct GetCallbackCount<std::tuple<TArg0, TArg1, TArgs...>> {
   using TupleType = std::tuple<TArg0, TArg1, TArgs...>;
   constexpr static size_t TupleSize = std::tuple_size_v<TupleType>;
-  constexpr static size_t Value = (IsCallback<std::tuple_element_t<TupleSize - 2, TupleType>>::value ? 1 : 0) +
-      (IsCallback<std::tuple_element_t<TupleSize - 1, TupleType>>::value ? 1 : 0);
+  constexpr static size_t Value =
+      (IsCallback<std::remove_const_t<std::remove_reference_t<std::tuple_element_t<TupleSize - 2, TupleType>>>>::value
+           ? 1
+           : 0) +
+      (IsCallback<std::remove_const_t<std::remove_reference_t<std::tuple_element_t<TupleSize - 1, TupleType>>>>::value
+           ? 1
+           : 0);
 };
 
 template <class T>
-struct ThreadLocalHolder {
-  ThreadLocalHolder(T *value) noexcept : m_savedValue{tl_value} {
-    tl_value = value;
-  }
-
-  ~ThreadLocalHolder() noexcept {
-    tl_value = m_savedValue;
-  }
-
-  static T *Get() noexcept {
-    return tl_value;
-  }
-
- private:
-  T *m_savedValue{nullptr};
-  static thread_local T *tl_value;
-};
-
+struct IsPromise : std::false_type {};
 template <class T>
-/*static*/ thread_local T *ThreadLocalHolder<T>::tl_value{nullptr};
+struct IsPromise<ReactPromise<T>> : std::true_type {};
 
 } // namespace Internal
 
-using CurrentNativeModuleBuilder =
-    Internal::ThreadLocalHolder<const winrt::Microsoft::ReactNative::Bridge::IReactModuleBuilder>;
-
 //==============================================================================
 // Module registration helpers
 //==============================================================================
 
-template <class TModule>
-inline winrt::Microsoft::ReactNative::Bridge::ReactModuleProvider MakeModuleProvider(
-    const char *moduleName,
-    const char *eventEmitterName) noexcept {
-  using winrt::Microsoft::ReactNative::Bridge::IReactModuleBuilder;
-
-  return [
-    module = std::shared_ptr<TModule>{nullptr},
-    moduleName = std::string(moduleName),
-    eventEmitterName = std::string(eventEmitterName)
-  ](IReactModuleBuilder const &moduleBuilder) mutable noexcept {
-    CurrentNativeModuleBuilder currentModuleBuilder{&moduleBuilder};
-
-    if (!eventEmitterName.empty()) {
-      currentModuleBuilder.Get()->SetEventEmitterName(winrt::to_hstring(eventEmitterName));
-    }
-
-    module = std::make_shared<TModule>();
-    return winrt::Windows::Foundation::IInspectable{nullptr};
-  };
-}
-
 template <class TFunc>
 struct ModuleMethodInfo;
 
 template <class TModule, class... TArgs>
 struct ModuleMethodInfo<void (TModule::*)(TArgs...) noexcept> {
+  constexpr static bool HasPromise() noexcept {
+    if constexpr (sizeof...(TArgs) > 0) {
+      return Internal::IsPromise<std::remove_const_t<std::remove_reference_t<
+          std::tuple_element_t<sizeof...(TArgs) - 1, std::tuple<std::remove_reference_t<TArgs>...>>>>>::value;
+    }
+    return false;
+  }
+
   constexpr static size_t CallbackCount =
       Internal::GetCallbackCount<std::tuple<std::remove_reference_t<TArgs>...>>::Value;
   using ModuleType = TModule;
   using MethodType = void (TModule::*)(TArgs...) noexcept;
-  using IndexSequence = std::make_index_sequence<sizeof...(TArgs) - CallbackCount>;
-
-  using IJSValueReader = winrt::Microsoft::ReactNative::Bridge::IJSValueReader;
-  using IJSValueWriter = winrt::Microsoft::ReactNative::Bridge::IJSValueWriter;
-  using MethodDelegate = winrt::Microsoft::ReactNative::Bridge::MethodDelegate;
-  using MethodResultCallback = winrt::Microsoft::ReactNative::Bridge::MethodResultCallback;
+  using IndexSequence = std::make_index_sequence<sizeof...(TArgs) - (HasPromise() ? 1 : CallbackCount)>;
 
   template <class>
   struct Invoker;
@@ -177,10 +132,10 @@ struct ModuleMethodInfo<void (TModule::*)(TArgs...) noexcept> {
     // Fire and forget method
     static MethodDelegate GetFunc(ModuleType *module, MethodType method, std::integral_constant<size_t, 0>) noexcept {
       return [ module, method ](
-          const IJSValueReader &argReader,
-          const IJSValueWriter & /*argWriter*/,
-          const MethodResultCallback &,
-          const MethodResultCallback &) mutable noexcept {
+          IJSValueReader const &argReader,
+          IJSValueWriter const & /*argWriter*/,
+          MethodResultCallback const &,
+          MethodResultCallback const &) mutable noexcept {
         std::tuple<std::remove_reference_t<TArgs>...> typedArgs{};
         ReadArgs(argReader, std::get<I>(typedArgs)...);
         (module->*method)(std::get<I>(std::move(typedArgs))...);
@@ -202,7 +157,7 @@ struct ModuleMethodInfo<void (TModule::*)(TArgs...) noexcept> {
       }
     };
 
-    template <class T, class = void>
+    template <class T, class TDummy>
     struct RejectCallbackCreator;
 
     template <template <class...> class TCallback, class TArg>
@@ -237,64 +192,86 @@ struct ModuleMethodInfo<void (TModule::*)(TArgs...) noexcept> {
     struct RejectCallbackCreator<TCallback<void(TArg0, TArg1, TArgs...)>, void>
         : CallbackCreator<TCallback<void(TArg0, TArg1, TArgs...)>> {};
 
+    template <class T>
+    struct PromiseCreator;
+
+    template <class T>
+    struct PromiseCreator<ReactPromise<T>> {
+      static ReactPromise<T> Create(
+          const IJSValueWriter &argWriter,
+          const MethodResultCallback &resolve,
+          const MethodResultCallback &reject) noexcept {
+        return ReactPromise<T>(argWriter, resolve, reject);
+      }
+    };
+
     // Method with one callback
     static MethodDelegate GetFunc(ModuleType *module, MethodType method, std::integral_constant<size_t, 1>) noexcept {
       return [ module, method ](
-          const IJSValueReader &argReader,
-          const IJSValueWriter &argWriter,
-          const MethodResultCallback &callback,
-          const MethodResultCallback &) mutable noexcept {
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &callback,
+          MethodResultCallback const &) mutable noexcept {
         using ArgTuple = std::tuple<std::remove_reference_t<TArgs>...>;
         ArgTuple typedArgs{};
         ReadArgs(argReader, std::get<I>(typedArgs)...);
-        (module->*method)(
-            std::get<I>(std::move(typedArgs))...,
-            CallbackCreator<std::tuple_element_t<sizeof...(TArgs) - 1, ArgTuple>>::Create(
-                argWriter, std::move(callback)));
+        auto cb = CallbackCreator<std::remove_const_t<std::remove_reference_t<
+            std::tuple_element_t<sizeof...(TArgs) - 1, ArgTuple>>>>::Create(argWriter, callback);
+        (module->*method)(std::get<I>(std::move(typedArgs))..., std::move(cb));
       };
     }
 
     // Method with two callbacks
     static MethodDelegate GetFunc(ModuleType *module, MethodType method, std::integral_constant<size_t, 2>) noexcept {
       return [ module, method ](
-          const IJSValueReader &argReader,
-          const IJSValueWriter &argWriter,
-          const MethodResultCallback &callback1,
-          const MethodResultCallback &callback2) mutable noexcept {
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &resolve,
+          MethodResultCallback const &reject) mutable noexcept {
         using ArgTuple = std::tuple<std::remove_reference_t<TArgs>...>;
         ArgTuple typedArgs{};
         ReadArgs(argReader, std::get<I>(typedArgs)...);
-        (module->*method)(
-            std::get<I>(std::move(typedArgs))...,
-            CallbackCreator<std::tuple_element_t<sizeof...(TArgs) - 2, ArgTuple>>::Create(
-                argWriter, std::move(callback1)),
-            RejectCallbackCreator<std::tuple_element_t<sizeof...(TArgs) - 1, ArgTuple>>::Create(
-                argWriter, std::move(callback2)));
+        auto resolveCallback = CallbackCreator<std::remove_const_t<
+            std::remove_reference_t<std::tuple_element_t<sizeof...(TArgs) - 2, ArgTuple>>>>::Create(argWriter, resolve);
+        auto rejectCallback = RejectCallbackCreator<
+            std::remove_const_t<std::remove_reference_t<std::tuple_element_t<sizeof...(TArgs) - 1, ArgTuple>>>,
+            void>::Create(argWriter, reject);
+        (module->*method)(std::get<I>(std::move(typedArgs))..., std::move(resolveCallback), std::move(rejectCallback));
       };
     }
-  };
 
-  static bool Register(void *module, const char *jsName, MethodType method, [[maybe_unused]] bool isAsync) noexcept {
-    using winrt::Microsoft::ReactNative::Bridge::IReactModuleBuilder;
-    using winrt::Microsoft::ReactNative::Bridge::MethodReturnType;
-
-    if (auto m = static_cast<ModuleType *>(module)) {
-      MethodReturnType returnType{MethodReturnType::Void};
-      if constexpr (CallbackCount == 1) {
-        returnType = MethodReturnType::Callback;
-      } else if constexpr (CallbackCount == 2) {
-        if (isAsync) {
-          returnType = MethodReturnType::TwoCallbacks;
-        } else {
-          returnType = MethodReturnType::Promise;
-        }
-      }
+    // Method with Promise
+    static MethodDelegate GetFunc(ModuleType *module, MethodType method, std::integral_constant<size_t, 3>) noexcept {
+      return [ module, method ](
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &resolve,
+          MethodResultCallback const &reject) mutable noexcept {
+        using AllArgsTuple = std::tuple<std::remove_reference_t<TArgs>...>;
+        using ArgsTuple = std::tuple<std::tuple_element_t<I, AllArgsTuple>...>;
+        using PromiseArg = std::remove_const_t<std::tuple_element_t<sizeof...(TArgs) - 1, AllArgsTuple>>;
+        ArgsTuple typedArgs{};
+        ReadArgs(argReader, std::get<I>(typedArgs)...);
+        auto promise = PromiseCreator<PromiseArg>::Create(argWriter, resolve, reject);
+        (module->*method)(std::get<I>(std::move(typedArgs))..., std::move(promise));
+      };
+    }
+  };
 
-      MethodDelegate methodDelegate =
-          Invoker<IndexSequence>::GetFunc(m, method, std::integral_constant<size_t, CallbackCount>{});
-      CurrentNativeModuleBuilder::Get()->AddMethod(winrt::to_hstring(jsName), returnType, methodDelegate);
+  static MethodDelegate GetMethodDelegate(void *module, MethodType method, MethodReturnType &returnType) noexcept {
+    if constexpr (HasPromise()) {
+      returnType = MethodReturnType::Promise;
+    } else if constexpr (CallbackCount == 2) {
+      returnType = MethodReturnType::TwoCallbacks;
+    } else if constexpr (CallbackCount == 1) {
+      returnType = MethodReturnType::Callback;
+    } else {
+      returnType = MethodReturnType::Void;
     }
-    return false;
+
+    constexpr int selector = HasPromise() ? 3 : CallbackCount;
+    return Invoker<IndexSequence>::GetFunc(
+        static_cast<ModuleType *>(module), method, std::integral_constant<size_t, selector>{});
   }
 };
 
@@ -304,11 +281,6 @@ struct ModuleMethodInfo<TResult (TModule::*)(TArgs...) noexcept> {
   using MethodType = TResult (TModule::*)(TArgs...) noexcept;
   using IndexSequence = std::make_index_sequence<sizeof...(TArgs)>;
 
-  using IJSValueReader = winrt::Microsoft::ReactNative::Bridge::IJSValueReader;
-  using IJSValueWriter = winrt::Microsoft::ReactNative::Bridge::IJSValueWriter;
-  using MethodDelegate = winrt::Microsoft::ReactNative::Bridge::MethodDelegate;
-  using MethodResultCallback = winrt::Microsoft::ReactNative::Bridge::MethodResultCallback;
-
   template <class>
   struct Invoker;
 
@@ -317,31 +289,222 @@ struct ModuleMethodInfo<TResult (TModule::*)(TArgs...) noexcept> {
     // Async method with return value
     static MethodDelegate GetFunc(ModuleType *module, MethodType method) noexcept {
       return [ module, method ](
-          const IJSValueReader &argReader,
-          const IJSValueWriter &argWriter,
-          const MethodResultCallback &callback,
-          const MethodResultCallback &) mutable noexcept {
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &callback,
+          MethodResultCallback const &) mutable noexcept {
         using ArgTuple = std::tuple<std::remove_reference_t<TArgs>...>;
         ArgTuple typedArgs{};
         ReadArgs(argReader, std::get<I>(typedArgs)...);
         TResult result = (module->*method)(std::get<I>(std::move(typedArgs))...);
-        WriteArgs(argWriter, std::move(result));
+        WriteArgs(argWriter, result);
         callback(argWriter);
       };
     }
   };
 
-  static bool Register(void *module, const char *jsName, MethodType method, bool /*isAsync*/) noexcept {
-    using winrt::Microsoft::ReactNative::Bridge::IReactModuleBuilder;
-    using winrt::Microsoft::ReactNative::Bridge::MethodReturnType;
+  static MethodDelegate GetMethodDelegate(void *module, MethodType method, MethodReturnType &returnType) noexcept {
+    returnType = MethodReturnType::Callback;
+    return Invoker<IndexSequence>::GetFunc(static_cast<ModuleType *>(module), method);
+  }
+};
 
-    if (auto m = static_cast<ModuleType *>(module)) {
-      MethodDelegate methodDelegate = Invoker<IndexSequence>::GetFunc(m, method);
-      CurrentNativeModuleBuilder::Get()->AddMethod(
-          winrt::to_hstring(jsName), MethodReturnType::Callback, methodDelegate);
+template <class... TArgs>
+struct ModuleMethodInfo<void (*)(TArgs...) noexcept> {
+  constexpr static bool HasPromise() noexcept {
+    if constexpr (sizeof...(TArgs) > 0) {
+      return Internal::IsPromise<std::remove_const_t<std::remove_reference_t<
+          std::tuple_element_t<sizeof...(TArgs) - 1, std::tuple<std::remove_reference_t<TArgs>...>>>>>::value;
     }
     return false;
   }
+
+  constexpr static size_t CallbackCount =
+      Internal::GetCallbackCount<std::tuple<std::remove_reference_t<TArgs>...>>::Value;
+  using MethodType = void (*)(TArgs...) noexcept;
+  using IndexSequence = std::make_index_sequence<sizeof...(TArgs) - (HasPromise() ? 1 : CallbackCount)>;
+
+  template <class>
+  struct Invoker;
+
+  template <size_t... I>
+  struct Invoker<std::index_sequence<I...>> {
+    // Fire and forget method
+    static MethodDelegate GetFunc(MethodType method, std::integral_constant<size_t, 0>) noexcept {
+      return [method](
+          IJSValueReader const &argReader,
+          IJSValueWriter const & /*argWriter*/,
+          MethodResultCallback const &,
+          MethodResultCallback const &) mutable noexcept {
+        std::tuple<std::remove_reference_t<TArgs>...> typedArgs{};
+        ReadArgs(argReader, std::get<I>(typedArgs)...);
+        (*method)(std::get<I>(std::move(typedArgs))...);
+      };
+    }
+
+    template <class T>
+    struct CallbackCreator;
+
+    template <template <class...> class TCallback, class... TArgs>
+    struct CallbackCreator<TCallback<void(TArgs...)>> {
+      static TCallback<void(TArgs...)> Create(
+          const IJSValueWriter &argWriter,
+          const MethodResultCallback &callback) noexcept {
+        return TCallback([ callback = std::move(callback), argWriter ](TArgs... args) noexcept {
+          WriteArgs(argWriter, std::move(args)...);
+          callback(argWriter);
+        });
+      }
+    };
+
+    template <class T, class TDummy>
+    struct RejectCallbackCreator;
+
+    template <template <class...> class TCallback, class TArg>
+    struct RejectCallbackCreator<
+        TCallback<void(TArg)>,
+        std::enable_if_t<std::is_assignable_v<std::string, TArg> || std::is_assignable_v<std::wstring, TArg>>> {
+      static TCallback<void(TArg)> Create(
+          const IJSValueWriter &argWriter,
+          const MethodResultCallback &callback) noexcept {
+        return TCallback([ callback = std::move(callback), argWriter ](TArg arg) noexcept {
+          argWriter.WriteArrayBegin();
+          argWriter.WriteObjectBegin();
+          argWriter.WritePropertyName(L"message");
+          WriteValue(argWriter, arg);
+          argWriter.WriteObjectEnd();
+          argWriter.WriteArrayEnd();
+          callback(argWriter);
+        });
+      }
+    };
+
+    template <template <class...> class TCallback>
+    struct RejectCallbackCreator<TCallback<void()>, void> : CallbackCreator<TCallback<void()>> {};
+
+    template <template <class...> class TCallback, class TArg>
+    struct RejectCallbackCreator<
+        TCallback<void(TArg)>,
+        std::enable_if_t<!std::is_assignable_v<std::string, TArg> && !std::is_assignable_v<std::wstring, TArg>>>
+        : CallbackCreator<TCallback<void(TArg)>> {};
+
+    template <template <class...> class TCallback, class TArg0, class TArg1, class... TArgs>
+    struct RejectCallbackCreator<TCallback<void(TArg0, TArg1, TArgs...)>, void>
+        : CallbackCreator<TCallback<void(TArg0, TArg1, TArgs...)>> {};
+
+    template <class T>
+    struct PromiseCreator;
+
+    template <class T>
+    struct PromiseCreator<ReactPromise<T>> {
+      static ReactPromise<T> Create(
+          const IJSValueWriter &argWriter,
+          const MethodResultCallback &resolve,
+          const MethodResultCallback &reject) noexcept {
+        return ReactPromise<T>(argWriter, resolve, reject);
+      }
+    };
+
+    // Method with one callback
+    static MethodDelegate GetFunc(MethodType method, std::integral_constant<size_t, 1>) noexcept {
+      return [method](
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &callback,
+          MethodResultCallback const &) mutable noexcept {
+        using ArgTuple = std::tuple<std::remove_reference_t<TArgs>...>;
+        ArgTuple typedArgs{};
+        ReadArgs(argReader, std::get<I>(typedArgs)...);
+        auto cb = CallbackCreator<std::remove_const_t<std::remove_reference_t<
+            std::tuple_element_t<sizeof...(TArgs) - 1, ArgTuple>>>>::Create(argWriter, callback);
+        (*method)(std::get<I>(std::move(typedArgs))..., std::move(cb));
+      };
+    }
+
+    // Method with two callbacks
+    static MethodDelegate GetFunc(MethodType method, std::integral_constant<size_t, 2>) noexcept {
+      return [method](
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &resolve,
+          MethodResultCallback const &reject) mutable noexcept {
+        using ArgTuple = std::tuple<std::remove_reference_t<TArgs>...>;
+        ArgTuple typedArgs{};
+        ReadArgs(argReader, std::get<I>(typedArgs)...);
+        auto resolveCallback = CallbackCreator<std::remove_const_t<
+            std::remove_reference_t<std::tuple_element_t<sizeof...(TArgs) - 2, ArgTuple>>>>::Create(argWriter, resolve);
+        auto rejectCallback = RejectCallbackCreator<
+            std::remove_const_t<std::remove_reference_t<std::tuple_element_t<sizeof...(TArgs) - 1, ArgTuple>>>,
+            void>::Create(argWriter, reject);
+        (*method)(std::get<I>(std::move(typedArgs))..., std::move(resolveCallback), std::move(rejectCallback));
+      };
+    }
+
+    // Method with Promise
+    static MethodDelegate GetFunc(MethodType method, std::integral_constant<size_t, 3>) noexcept {
+      return [method](
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &resolve,
+          MethodResultCallback const &reject) mutable noexcept {
+        using AllArgsTuple = std::tuple<std::remove_reference_t<TArgs>...>;
+        using ArgsTuple = std::tuple<std::tuple_element_t<I, AllArgsTuple>...>;
+        using PromiseArg = std::remove_const_t<std::tuple_element_t<sizeof...(TArgs) - 1, AllArgsTuple>>;
+        ArgsTuple typedArgs{};
+        ReadArgs(argReader, std::get<I>(typedArgs)...);
+        auto promise = PromiseCreator<PromiseArg>::Create(argWriter, resolve, reject);
+        (*method)(std::get<I>(std::move(typedArgs))..., std::move(promise));
+      };
+    }
+  };
+
+  static MethodDelegate GetMethodDelegate(void * /*module*/, MethodType method, MethodReturnType &returnType) noexcept {
+    if constexpr (HasPromise()) {
+      returnType = MethodReturnType::Promise;
+    } else if constexpr (CallbackCount == 2) {
+      returnType = MethodReturnType::TwoCallbacks;
+    } else if constexpr (CallbackCount == 1) {
+      returnType = MethodReturnType::Callback;
+    } else {
+      returnType = MethodReturnType::Void;
+    }
+
+    constexpr int selector = HasPromise() ? 3 : CallbackCount;
+    return Invoker<IndexSequence>::GetFunc(method, std::integral_constant<size_t, selector>{});
+  }
+};
+
+template <class TResult, class... TArgs>
+struct ModuleMethodInfo<TResult (*)(TArgs...) noexcept> {
+  using MethodType = TResult (*)(TArgs...) noexcept;
+  using IndexSequence = std::make_index_sequence<sizeof...(TArgs)>;
+
+  template <class>
+  struct Invoker;
+
+  template <size_t... I>
+  struct Invoker<std::index_sequence<I...>> {
+    // Async method with return value
+    static MethodDelegate GetFunc(MethodType method) noexcept {
+      return [method](
+          IJSValueReader const &argReader,
+          IJSValueWriter const &argWriter,
+          MethodResultCallback const &callback,
+          MethodResultCallback const &) mutable noexcept {
+        using ArgTuple = std::tuple<std::remove_reference_t<TArgs>...>;
+        ArgTuple typedArgs{};
+        ReadArgs(argReader, std::get<I>(typedArgs)...);
+        TResult result = (*method)(std::get<I>(typedArgs)...);
+        WriteArgs(argWriter, result);
+        callback(argWriter);
+      };
+    }
+  };
+
+  static MethodDelegate GetMethodDelegate(void * /*module*/, MethodType method, MethodReturnType &returnType) noexcept {
+    returnType = MethodReturnType::Callback;
+    return Invoker<IndexSequence>::GetFunc(method);
+  }
 };
 
 template <class TFunc>
@@ -353,10 +516,6 @@ struct ModuleSyncMethodInfo<TResult (TModule::*)(TArgs...) noexcept> {
   using MethodType = TResult (TModule::*)(TArgs...) noexcept;
   using IndexSequence = std::make_index_sequence<sizeof...(TArgs)>;
 
-  using IJSValueReader = winrt::Microsoft::ReactNative::Bridge::IJSValueReader;
-  using IJSValueWriter = winrt::Microsoft::ReactNative::Bridge::IJSValueWriter;
-  using SyncMethodDelegate = winrt::Microsoft::ReactNative::Bridge::SyncMethodDelegate;
-
   template <class>
   struct Invoker;
 
@@ -368,44 +527,43 @@ struct ModuleSyncMethodInfo<TResult (TModule::*)(TArgs...) noexcept> {
         ArgTuple typedArgs{};
         ReadArgs(argReader, std::get<I>(typedArgs)...);
         TResult result = (module->*method)(std::get<I>(std::move(typedArgs))...);
-        WriteArgs(argWriter, std::move(result));
+        WriteArgs(argWriter, result);
       };
     }
   };
 
-  static bool Register(void *module, const char *jsName, MethodType method, bool /*isAsync*/) noexcept {
-    using winrt::Microsoft::ReactNative::Bridge::IReactModuleBuilder;
-
-    if (auto m = static_cast<ModuleType *>(module)) {
-      SyncMethodDelegate syncMethodDelegate = Invoker<IndexSequence>::GetFunc(m, method);
-      CurrentNativeModuleBuilder::Get()->AddSyncMethod(winrt::to_hstring(jsName), syncMethodDelegate);
-    }
-    return false;
+  static SyncMethodDelegate GetMethodDelegate(void *module, MethodType method) noexcept {
+    return Invoker<IndexSequence>::GetFunc(static_cast<ModuleType *>(module), method);
   }
 };
 
-template <class TFunc>
-struct ModuleConstMethodInfo;
-
-template <class TModule>
-struct ModuleConstMethodInfo<void (TModule::*)(
-    const winrt::Microsoft::ReactNative::Bridge::IJSValueWriter &) noexcept> {
-  using ModuleType = TModule;
-  using IJSValueWriter = winrt::Microsoft::ReactNative::Bridge::IJSValueWriter;
-  using MethodType = void (TModule::*)(const IJSValueWriter &) noexcept;
+template <class TResult, class... TArgs>
+struct ModuleSyncMethodInfo<TResult (*)(TArgs...) noexcept> {
+  using MethodType = TResult (*)(TArgs...) noexcept;
+  using IndexSequence = std::make_index_sequence<sizeof...(TArgs)>;
 
-  static bool Register(void *module, const char * /*jsName*/, MethodType method, bool /*isAsync*/) noexcept {
-    using winrt::Microsoft::ReactNative::Bridge::IReactModuleBuilder;
+  template <class>
+  struct Invoker;
 
-    if (auto m = static_cast<ModuleType *>(module)) {
-      CurrentNativeModuleBuilder::Get()->AddConstantProvider(
-          [ m, method ](const IJSValueWriter &argWriter) mutable noexcept { (m->*method)(argWriter); });
+  template <size_t... I>
+  struct Invoker<std::index_sequence<I...>> {
+    static SyncMethodDelegate GetFunc(MethodType method) noexcept {
+      return [method](IJSValueReader const &argReader, IJSValueWriter const &argWriter) mutable noexcept {
+        using ArgTuple = std::tuple<std::remove_reference_t<TArgs>...>;
+        ArgTuple typedArgs{};
+        ReadArgs(argReader, std::get<I>(typedArgs)...);
+        TResult result = (*method)(std::get<I>(std::move(typedArgs))...);
+        WriteArgs(argWriter, result);
+      };
     }
-    return false;
+  };
+
+  static SyncMethodDelegate GetMethodDelegate(void * /*module*/, MethodType method) noexcept {
+    return Invoker<IndexSequence>::GetFunc(method);
   }
 };
 
-template <class TFunc>
+template <class TField>
 struct ModuleConstFieldInfo;
 
 template <class TModule, class TValue>
@@ -413,34 +571,62 @@ struct ModuleConstFieldInfo<TValue TModule::*> {
   using ModuleType = TModule;
   using FieldType = TValue TModule::*;
 
-  static bool Register(void *module, const char *jsName, FieldType field) noexcept {
-    using winrt::Microsoft::ReactNative::Bridge::IReactModuleBuilder;
-    using winrt::Microsoft::ReactNative::Bridge::IJSValueWriter;
+  static ConstantProvider GetConstantProvider(void *module, wchar_t const *name, FieldType field) noexcept {
+    return [ module = static_cast<ModuleType *>(module), name = std::wstring{name}, field ](
+        IJSValueWriter const &argWriter) mutable noexcept {
+      WriteProperty(argWriter, name, module->*field);
+    };
+  }
+};
+
+template <class TValue>
+struct ModuleConstFieldInfo<TValue *> {
+  using FieldType = TValue *;
 
-    if (auto m = static_cast<ModuleType *>(module)) {
-      CurrentNativeModuleBuilder::Get()->AddConstantProvider(
-          [ m, name = std::string(jsName), field ](const IJSValueWriter &argWriter) mutable noexcept {
-            ::Microsoft::ReactNative::WriteProperty(argWriter, name, m->*field);
-          });
-    }
-    return false;
+  static ConstantProvider GetConstantProvider(void * /*module*/, wchar_t const *name, FieldType field) noexcept {
+    return [ name = std::wstring{name}, field ](IJSValueWriter const &argWriter) mutable noexcept {
+      WriteProperty(argWriter, name, *field);
+    };
   }
 };
 
-struct ModuleConstantInfo {
-  template <class TValue>
-  static bool Register(void *module, const char *jsName, TValue &&value) noexcept {
-    using winrt::Microsoft::ReactNative::Bridge::IJSValueWriter;
-
-    if (module) {
-      CurrentNativeModuleBuilder::Get()->AddConstantProvider(
-          [ name = std::string(jsName),
-            value = std::forward<TValue>(value) ](const IJSValueWriter &argWriter) mutable noexcept {
-            ::Microsoft::ReactNative::WriteProperty(argWriter, name, value);
-          });
-    }
+struct ReactConstantProvider {
+  ReactConstantProvider(IJSValueWriter const &writer) noexcept : m_writer{writer} {}
 
-    return false;
+  template <class T>
+  void Add(const wchar_t *name, const T &value) noexcept {
+    WriteProperty(m_writer, name, value);
+  }
+
+ private:
+  IJSValueWriter m_writer;
+};
+
+template <class TMethod>
+struct ModuleConstantInfo;
+
+template <class TModule>
+struct ModuleConstantInfo<void (TModule::*)(ReactConstantProvider &) noexcept> {
+  using ModuleType = TModule;
+  using MethodType = void (TModule::*)(ReactConstantProvider &) noexcept;
+
+  static ConstantProvider GetConstantProvider(void *module, MethodType method) noexcept {
+    return [ module = static_cast<ModuleType *>(module), method ](IJSValueWriter const &argWriter) mutable noexcept {
+      ReactConstantProvider constantProvider{argWriter};
+      (module->*method)(constantProvider);
+    };
+  }
+};
+
+template <>
+struct ModuleConstantInfo<void (*)(ReactConstantProvider &) noexcept> {
+  using MethodType = void (*)(ReactConstantProvider &) noexcept;
+
+  static ConstantProvider GetConstantProvider(void * /*module*/, MethodType method) noexcept {
+    return [method](IJSValueWriter const &argWriter) mutable noexcept {
+      ReactConstantProvider constantProvider{argWriter};
+      (*method)(constantProvider);
+    };
   }
 };
 
@@ -453,19 +639,103 @@ struct ModuleEventFieldInfo<TFunc<void(TArg)> TModule::*> {
   using EventType = TFunc<void(TArg)>;
   using FieldType = EventType TModule::*;
 
-  static bool Register(TModule *module, const char *jsName, FieldType field) noexcept {
-    using winrt::Microsoft::ReactNative::Bridge::ReactEventHandler;
-    using winrt::Microsoft::ReactNative::Bridge::IJSValueWriter;
+  static ReactEventHandlerSetter GetEventHandlerSetter(void *module, FieldType field) noexcept {
+    return [ module = static_cast<ModuleType *>(module), field ](const ReactEventHandler &eventHandler) noexcept {
+      module->*field = [eventHandler](TArg arg) noexcept {
+        eventHandler([&](const IJSValueWriter &argWriter) noexcept { WriteValue(argWriter, arg); });
+      };
+    };
+  }
+};
 
-    CurrentNativeModuleBuilder::Get()->AddEventHandlerSetter(
-        winrt::to_hstring(jsName), [ module, field ](const ReactEventHandler &eventHandler) noexcept {
-          module->*field = [eventHandler](TArg arg) noexcept {
-            eventHandler([&](const IJSValueWriter &argWriter) noexcept { WriteValue(argWriter, arg); });
-          };
-        });
+struct ReactModuleBuilder {
+  ReactModuleBuilder(void *module, IReactModuleBuilder const &moduleBuilder) noexcept
+      : m_module{module}, m_moduleBuilder{moduleBuilder} {}
+
+  template <class TModule, int I>
+  void RegisterModule(
+      const wchar_t * /*moduleName*/,
+      const wchar_t *eventEmitterName,
+      winrt::Microsoft::ReactNative::Bridge::ReactMemberId<I>) noexcept {
+    m_moduleBuilder.SetEventEmitterName(eventEmitterName);
+    RegisterMembers<TModule, I>();
+  }
 
-    return false;
+  template <class TClass, int I>
+  auto HasRegisterMember(ReactModuleBuilder &builder, ReactMemberId<I> id)
+      -> decltype(TClass::template RegisterMember<TClass>(builder, id), std::true_type{});
+  template <class TClass>
+  auto HasRegisterMember(...) -> std::false_type;
+
+  template <class TModule, int I>
+  void RegisterMembers() noexcept {
+    if constexpr (decltype(HasRegisterMember<TModule>(*this, ReactMemberId<I + 1>{}))::value) {
+      TModule::template RegisterMember<TModule>(*this, ReactMemberId<I + 1>{});
+      RegisterMembers<TModule, I + 1>();
+    }
+  }
+
+  template <class TClass, class TMethod>
+  void RegisterMethod(TMethod method, wchar_t const *name) noexcept {
+    MethodReturnType returnType;
+    auto methodDelegate = ModuleMethodInfo<TMethod>::GetMethodDelegate(m_module, method, /*out*/ returnType);
+    m_moduleBuilder.AddMethod(name, returnType, methodDelegate);
+  }
+
+  template <class TClass, class TMethod>
+  void RegisterSyncMethod(TMethod method, wchar_t const *name) noexcept {
+    auto syncMethodDelegate = ModuleSyncMethodInfo<TMethod>::GetMethodDelegate(m_module, method);
+    m_moduleBuilder.AddSyncMethod(name, syncMethodDelegate);
   }
+
+  template <class TClass, class TMethod>
+  void RegisterConstMethod(TMethod method, wchar_t const * /*name*/) noexcept {
+    auto constantProvider = ModuleConstantInfo<TMethod>::GetConstantProvider(m_module, method);
+    m_moduleBuilder.AddConstantProvider(constantProvider);
+  }
+
+  template <class TClass, class TField>
+  void RegisterConstant(TField field, wchar_t const *name) noexcept {
+    auto constantProvider = ModuleConstFieldInfo<TField>::GetConstantProvider(m_module, name, field);
+    m_moduleBuilder.AddConstantProvider(constantProvider);
+  }
+
+  template <class TClass, class TField>
+  void RegisterEvent(TField field, wchar_t const *name) noexcept {
+    auto eventHandlerSetter = ModuleEventFieldInfo<TField>::GetEventHandlerSetter(m_module, field);
+    m_moduleBuilder.AddEventHandlerSetter(name, eventHandlerSetter);
+  }
+
+ private:
+  void *m_module;
+  IReactModuleBuilder m_moduleBuilder;
+};
+
+template <class T>
+struct BoxedValue : implements<BoxedValue<T>, IBoxedValue> {
+  BoxedValue() noexcept {}
+
+  int64_t GetPtr() noexcept {
+    return reinterpret_cast<int64_t>(&m_value);
+  }
+
+  static T &GetImpl(IBoxedValue &module) noexcept {
+    return *reinterpret_cast<T *>(module.GetPtr());
+  }
+
+ private:
+  T m_value{};
 };
 
-} // namespace Microsoft::ReactNative
+template <class TModule>
+inline ReactModuleProvider MakeModuleProvider() noexcept {
+  return [](IReactModuleBuilder const &moduleBuilder) noexcept {
+    auto moduleObject = make<BoxedValue<TModule>>();
+    auto module = &BoxedValue<TModule>::GetImpl(moduleObject);
+    ReactModuleBuilder builder{module, moduleBuilder};
+    RegisterModule(builder, module);
+    return moduleObject;
+  };
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/ReactError.h b/vnext/Microsoft.ReactNative.Cxx/ReactError.h
new file mode 100644
index 00000000000..2001c4ddfb9
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/ReactError.h
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#include "JSValue.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+struct ReactError {
+  std::string Code;
+  std::string Message;
+  JSValueObject UserInfo;
+};
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/ReactMemberInfo.h b/vnext/Microsoft.ReactNative.Cxx/ReactMemberInfo.h
new file mode 100644
index 00000000000..0904a817214
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/ReactMemberInfo.h
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#ifndef MICROSOFT_REACTNATIVE_REACTMEMBERINFO
+#define MICROSOFT_REACTNATIVE_REACTMEMBERINFO
+
+#include "winrt/Microsoft.ReactNative.Bridge.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+template <int I>
+using ReactMemberId = std::integral_constant<int, I>;
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
+
+#endif // MICROSOFT_REACTNATIVE_REACTMEMBERINFO
diff --git a/vnext/Microsoft.ReactNative.Cxx/ReactPromise.cpp b/vnext/Microsoft.ReactNative.Cxx/ReactPromise.cpp
new file mode 100644
index 00000000000..3c040827c74
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/ReactPromise.cpp
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "ReactPromise.h"
+#include "JSValueWriter.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+static const char *ErrorDefaultCode = "EUNSPECIFIED";
+static const char *ErrorDefaultMessage = "Error not specified.";
+
+// Keys for m_reject's Error object
+static const char *ErrorMapKeyCode = "code";
+static const char *ErrorMapKeyMessage = "message";
+static const char *ErrorMapKeyUserInfo = "userInfo";
+
+ReactPromiseBase::ReactPromiseBase(
+    IJSValueWriter const &writer,
+    MethodResultCallback const &resolve,
+    MethodResultCallback const &reject) noexcept
+    : m_writer{writer}, m_resolve{resolve}, m_reject{reject} {}
+
+// Reject the ReactPromise and report an error.
+void ReactPromiseBase::Reject(ReactError &&error) noexcept {
+  if (m_reject == nullptr) {
+    Clear();
+    return;
+  }
+
+  JSValueObject errorInfo;
+  errorInfo.emplace(ErrorMapKeyCode, !error.Code.empty() ? error.Code : ErrorDefaultCode);
+  errorInfo.emplace(ErrorMapKeyMessage, !error.Message.empty() ? error.Message : ErrorDefaultMessage);
+
+  // For consistency with iOS ensure userInfo key exists, even if we null it.
+  // iOS: /React/Base/RCTUtils.m -> RCTJSErrorFromCodeMessageAndNSError
+  errorInfo.emplace(ErrorMapKeyUserInfo, !error.UserInfo.empty() ? JSValue(std::move(error.UserInfo)) : nullptr);
+
+  WriteArgs(m_writer, errorInfo);
+  m_reject(m_writer);
+  Clear();
+}
+
+void ReactPromiseBase::Reject(const char *errorMessage) noexcept {
+  if (m_reject == nullptr) {
+    Clear();
+    return;
+  }
+
+  m_writer.WriteArrayBegin();
+  m_writer.WriteObjectBegin();
+
+  WriteProperty(m_writer, ErrorMapKeyCode, ErrorDefaultCode);
+  WriteProperty(m_writer, ErrorMapKeyMessage, errorMessage);
+
+  // For consistency with iOS ensure userInfo key exists, even if we null it.
+  // iOS: /React/Base/RCTUtils.m -> RCTJSErrorFromCodeMessageAndNSError
+  WriteProperty(m_writer, ErrorMapKeyUserInfo, nullptr);
+
+  m_writer.WriteObjectEnd();
+  m_writer.WriteArrayEnd();
+  m_reject(m_writer);
+  Clear();
+}
+
+void ReactPromiseBase::Reject(const wchar_t *errorMessage) noexcept {
+  if (m_reject == nullptr) {
+    Clear();
+    return;
+  }
+
+  m_writer.WriteArrayBegin();
+  m_writer.WriteObjectBegin();
+
+  WriteProperty(m_writer, ErrorMapKeyCode, ErrorDefaultCode);
+  WriteProperty(m_writer, ErrorMapKeyMessage, errorMessage);
+
+  // For consistency with iOS ensure userInfo key exists, even if we null it.
+  // iOS: /React/Base/RCTUtils.m -> RCTJSErrorFromCodeMessageAndNSError
+  WriteProperty(m_writer, ErrorMapKeyUserInfo, nullptr);
+
+  m_writer.WriteObjectEnd();
+  m_writer.WriteArrayEnd();
+  m_reject(m_writer);
+  Clear();
+}
+
+void ReactPromiseBase::Clear() noexcept {
+  m_resolve = nullptr;
+  m_reject = nullptr;
+  m_writer = nullptr;
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/ReactPromise.h b/vnext/Microsoft.ReactNative.Cxx/ReactPromise.h
new file mode 100644
index 00000000000..cfad8200963
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/ReactPromise.h
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#include "ReactError.h"
+#include "winrt/Microsoft.ReactNative.Bridge.h"
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+// ReactPromise represents a JavaScript Promise
+// which can be passed to the native module as a method parameter.
+//
+// Methods with REACT_METHOD attribute that use an ReactPromise as the last parameter
+// will be marked as "promise" and will return a promise when invoked from JavaScript.
+
+// Base class that does not depend on template parameter T
+struct ReactPromiseBase {
+  ReactPromiseBase(
+      IJSValueWriter const &writer,
+      MethodResultCallback const &resolve,
+      MethodResultCallback const &reject) noexcept;
+
+  // Report an Error.
+  void Reject(ReactError &&error) noexcept;
+
+  void Reject(const char *errorMessage) noexcept;
+  void Reject(const wchar_t *errorMessage) noexcept;
+
+ protected:
+  void Clear() noexcept;
+
+ protected:
+  IJSValueWriter m_writer;
+  MethodResultCallback m_resolve;
+  MethodResultCallback m_reject;
+};
+
+template <class T>
+struct ReactPromise : ReactPromiseBase {
+  using ReactPromiseBase::ReactPromiseBase;
+
+  // Successfully resolve the IReactPromise with an optional value.
+  void Resolve(T const &value) noexcept;
+};
+
+//  Successfully resolve the ReactPromise with an optional value.
+template <class T>
+void ReactPromise<T>::Resolve(T const &value) noexcept {
+  if (m_resolve) {
+    WriteArgs(m_writer, value);
+    m_resolve(m_writer);
+    Clear();
+  }
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative.Cxx/StructInfo.h b/vnext/Microsoft.ReactNative.Cxx/StructInfo.h
new file mode 100644
index 00000000000..b87dd6a6fbd
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Cxx/StructInfo.h
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#ifndef MICROSOFT_REACTNATIVE_STRUCTINFO
+#define MICROSOFT_REACTNATIVE_STRUCTINFO
+
+#include "winrt/Microsoft.ReactNative.Bridge.h"
+
+#define REACT_STRUCT(type)                                                                   \
+  struct type;                                                                               \
+  winrt::Microsoft::ReactNative::Bridge::FieldMap GetStructInfo(type *) noexcept {           \
+    winrt::Microsoft::ReactNative::Bridge::FieldMap fieldMap{};                              \
+    winrt::Microsoft::ReactNative::Bridge::CollectStructFields<type, __COUNTER__>(fieldMap); \
+    return fieldMap;                                                                         \
+  }
+
+#define REACT_FIELD(field)                                                         \
+  template <class TClass>                                                          \
+  static void RegisterField(                                                       \
+      winrt::Microsoft::ReactNative::Bridge::FieldMap &fieldMap,                   \
+      winrt::Microsoft::ReactNative::Bridge::ReactFieldId<__COUNTER__>) noexcept { \
+    fieldMap.emplace(L## #field, &TClass::field);                                  \
+  }
+
+namespace winrt::Microsoft::ReactNative::Bridge {
+
+struct FieldInfo;
+using FieldMap = std::map<std::wstring, FieldInfo, std::less<>>;
+using FieldReaderType =
+    void (*)(IJSValueReader const & /*reader*/, void * /*obj*/, const uintptr_t * /*fieldPtrStore*/) noexcept;
+using FieldWriterType =
+    void (*)(IJSValueWriter const & /*writer*/, const void * /*obj*/, const uintptr_t * /*fieldPtrStore*/) noexcept;
+
+template <class T>
+void GetStructInfo(T *) {}
+
+template <class TClass, class TValue>
+void FieldReader(IJSValueReader const &reader, void *obj, const uintptr_t *fieldPtrStore) noexcept;
+
+template <class TClass, class TValue>
+void FieldWriter(IJSValueWriter const &writer, const void *obj, const uintptr_t *fieldPtrStore) noexcept;
+
+struct FieldInfo {
+  template <class TClass, class TValue>
+  FieldInfo(TValue TClass::*fieldPtr) noexcept
+      : m_fieldReader{FieldReader<TClass, TValue>},
+        m_fieldWriter{FieldWriter<TClass, TValue>},
+        m_fieldPtrStore{*reinterpret_cast<uintptr_t *>(&fieldPtr)} {
+    static_assert(sizeof(m_fieldPtrStore) >= sizeof(fieldPtr));
+  }
+
+  void ReadField(IJSValueReader const &reader, void *obj) const noexcept {
+    m_fieldReader(reader, obj, &m_fieldPtrStore);
+  }
+
+  void WriteField(IJSValueWriter const &writer, const void *obj) const noexcept {
+    m_fieldWriter(writer, obj, &m_fieldPtrStore);
+  }
+
+ private:
+  FieldReaderType m_fieldReader;
+  FieldWriterType m_fieldWriter;
+  const uintptr_t m_fieldPtrStore;
+};
+
+template <class TClass, class TValue>
+void FieldReader(IJSValueReader const &reader, void *obj, const uintptr_t *fieldPtrStore) noexcept {
+  using FieldPtrType = TValue TClass::*;
+  ReadValue(reader, /*out*/ static_cast<TClass *>(obj)->*(*reinterpret_cast<const FieldPtrType *>(fieldPtrStore)));
+}
+
+template <class TClass, class TValue>
+void FieldWriter(IJSValueWriter const &writer, const void *obj, const uintptr_t *fieldPtrStore) noexcept {
+  using FieldPtrType = TValue TClass::*;
+  WriteValue(writer, static_cast<const TClass *>(obj)->*(*reinterpret_cast<const FieldPtrType *>(fieldPtrStore)));
+}
+
+template <class T>
+struct StructInfo {
+  static const FieldMap FieldMap;
+};
+
+template <class T>
+/*static*/ const FieldMap StructInfo<T>::FieldMap = GetStructInfo(static_cast<T *>(nullptr));
+
+template <int I>
+using ReactFieldId = std::integral_constant<int, I>;
+
+template <class TClass, int I>
+auto HasRegisterField(FieldMap &fieldMap, ReactFieldId<I> id)
+    -> decltype(TClass::template RegisterField<TClass>(fieldMap, id), std::true_type{});
+template <class TClass>
+auto HasRegisterField(...) -> std::false_type;
+
+template <class TClass, int I>
+void CollectStructFields(FieldMap &fieldMap) noexcept {
+  if constexpr (decltype(HasRegisterField<TClass>(fieldMap, ReactFieldId<I + 1>{}))::value) {
+    TClass::template RegisterField<TClass>(fieldMap, ReactFieldId<I + 1>{});
+    CollectStructFields<TClass, I + 1>(fieldMap);
+  }
+}
+
+} // namespace winrt::Microsoft::ReactNative::Bridge
+
+#endif // MICROSOFT_REACTNATIVE_STRUCTINFO
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/LockScreenLogo.scale-200.png b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/LockScreenLogo.scale-200.png
new file mode 100644
index 00000000000..735f57adb5d
Binary files /dev/null and b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/LockScreenLogo.scale-200.png differ
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/SplashScreen.scale-200.png b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/SplashScreen.scale-200.png
new file mode 100644
index 00000000000..023e7f1feda
Binary files /dev/null and b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/SplashScreen.scale-200.png differ
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square150x150Logo.scale-200.png b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 00000000000..af49fec1a54
Binary files /dev/null and b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square150x150Logo.scale-200.png differ
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square44x44Logo.scale-200.png b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 00000000000..ce342a2ec8a
Binary files /dev/null and b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square44x44Logo.scale-200.png differ
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000000..f6c02ce97e0
Binary files /dev/null and b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/StoreLogo.png b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/StoreLogo.png
new file mode 100644
index 00000000000..7385b56c0e4
Binary files /dev/null and b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/StoreLogo.png differ
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Wide310x150Logo.scale-200.png b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000000..288995b397f
Binary files /dev/null and b/vnext/Microsoft.ReactNative.Managed.UnitTests/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/JSValueReaderTest.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/JSValueReaderTest.cs
new file mode 100644
index 00000000000..a65c80b4d21
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/JSValueReaderTest.cs
@@ -0,0 +1,471 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.ReactNative.Managed.UnitTests
+{
+  class RobotInfo
+  {
+    public RobotModel Model { get; set; }
+    public string Name { get; set; }
+    public int Age;
+    public RobotShape Shape { get; set; }
+    public RobotShape? Shape2 { get; set; }
+    public RobotShape? Shape3 { get; set; }
+    public IList<int> Steps { get; set; }
+    public IDictionary<string, int> Dimensions { get; set; }
+    public Tuple<int, string, bool> Badges { get; set; }
+    public RobotTool[] Tools { get; set; }
+    public RobotPoint[] Path { get; set; }
+    public OneOf2<T2Extra, R2D2Extra> Extra { get; set; }
+  }
+
+  enum RobotModel
+  {
+    T2,
+    R2D2,
+    C3PO,
+  };
+
+  // We are generating ReadValue for it.
+  enum RobotShape
+  {
+    Humanoid,
+    Trashcan,
+    Beercan,
+    Quadrocopter,
+  }
+
+  class RobotTool
+  {
+    public string Name { get; set; }
+    public int Weight = 0;
+    public bool IsEnabled { get; set; }
+  }
+
+  struct RobotPoint
+  {
+    public int X;
+    public int Y;
+  }
+
+  class T2Extra
+  {
+    public string ActorName { get; set; }
+    public int MovieYear { get; set; }
+  }
+
+  class R2D2Extra
+  {
+    public string MovieSeries { get; set; }
+  }
+
+  static class RobotSerialization
+  {
+    // Reading RobotInfo value. It could be generated instead.
+    public static void ReadValue(this IJSValueReader reader, out RobotInfo value)
+    {
+      value = new RobotInfo();
+      if (reader.ValueType == JSValueType.Object)
+      {
+        while (reader.GetNextObjectProperty(out string propertyName))
+        {
+          switch (propertyName)
+          {
+            case nameof(value.Model): value.Model = reader.ReadValue<RobotModel>(); break;
+            case nameof(value.Name): value.Name = reader.ReadValue<string>(); break;
+            case nameof(value.Age): value.Age = reader.ReadValue<int>(); break;
+            case nameof(value.Shape): value.Shape = reader.ReadValue<RobotShape>(); break;
+            case nameof(value.Shape2): value.Shape2 = reader.ReadValue<RobotShape?>(); break;
+            case nameof(value.Shape3): value.Shape3 = reader.ReadValue<RobotShape?>(); break;
+            case nameof(value.Steps): value.Steps = reader.ReadValue<IList<int>>(); break;
+            case nameof(value.Dimensions): value.Dimensions = reader.ReadValue<IDictionary<string, int>>(); break;
+            case nameof(value.Badges): value.Badges = reader.ReadValue<Tuple<int, string, bool>>(); break;
+            case nameof(value.Tools): value.Tools = reader.ReadValue<RobotTool[]>(); break;
+            case nameof(value.Path): value.Path = reader.ReadValue<RobotPoint[]>(); break;
+            case nameof(value.Extra): value.Extra = reader.ReadValue<OneOf2<T2Extra, R2D2Extra>>(); break;
+            default: reader.ReadValue<JSValue>(); break;
+          }
+        }
+      }
+    }
+
+    // Writing RobotInfo value. It could be generated instead.
+    public static void WriteValue(this IJSValueWriter writer, RobotInfo value)
+    {
+      if (value != null)
+      {
+        writer.WriteObjectBegin();
+        writer.WriteObjectProperty(nameof(value.Model), value.Model);
+        writer.WriteObjectProperty(nameof(value.Name), value.Name);
+        writer.WriteObjectProperty(nameof(value.Age), value.Age);
+        writer.WriteObjectProperty(nameof(value.Shape), value.Shape);
+        writer.WriteObjectProperty(nameof(value.Shape2), value.Shape2);
+        writer.WriteObjectProperty(nameof(value.Shape3), value.Shape3);
+        writer.WriteObjectProperty(nameof(value.Steps), value.Steps);
+        writer.WriteObjectProperty(nameof(value.Dimensions), value.Dimensions);
+        writer.WriteObjectProperty(nameof(value.Badges), value.Badges);
+        writer.WriteObjectProperty(nameof(value.Tools), value.Tools);
+        writer.WriteObjectProperty(nameof(value.Path), value.Path);
+        writer.WriteObjectProperty(nameof(value.Extra), value.Extra);
+        writer.WriteObjectEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    // Reading RobotModel enum value. It could be generated instead.
+    public static void ReadValue(this IJSValueReader reader, out RobotModel value)
+    {
+      value = (RobotModel)reader.ReadValue<int>();
+    }
+
+    // Writing RobotModel enum value. It could be generated instead.
+    public static void WriteValue(this IJSValueWriter writer, RobotModel value)
+    {
+      writer.WriteValue((int)value);
+    }
+
+    // Reading discriminating union requires using JSValue.
+    public static void ReadValue(this JSValue jsValue, out OneOf2<T2Extra, R2D2Extra> value)
+    {
+      value = default;
+      if (jsValue.TryGetObjectProperty("Kind", out JSValue kind))
+      {
+        RobotModel modelType = kind.ReadValue<RobotModel>();
+        switch (modelType)
+        {
+          case RobotModel.T2: value = jsValue.ReadValue<T2Extra>(); break;
+          case RobotModel.R2D2: value = jsValue.ReadValue<R2D2Extra>(); break;
+        }
+      }
+    }
+
+    // Writing discriminating union is simpler than reading.
+    public static void WriteValue(this IJSValueWriter writer, OneOf2<T2Extra, R2D2Extra> value)
+    {
+      writer.WriteObjectBegin();
+      if (value.TryGet(out T2Extra t2))
+      {
+        writer.WriteObjectProperty("Kind", RobotModel.T2);
+        writer.WriteObjectProperties(t2);
+      }
+      else if (value.TryGet(out R2D2Extra r2d2))
+      {
+        writer.WriteObjectProperty("Kind", RobotModel.R2D2);
+        writer.WriteObjectProperties(r2d2);
+      }
+      writer.WriteObjectEnd();
+    }
+  }
+
+  [TestClass]
+  public class JSValueReaderTest
+  {
+    [TestMethod]
+    public void TestReadCustomType()
+    {
+      JObject jobj = JObject.Parse(@"{
+                Model: 1,
+                Name: ""Bob"",
+                Age: 42,
+                Shape: 1,
+                Shape2: 2,
+                Shape3: null,
+                Steps: [1, 2, 3],
+                Dimensions: {Width: 24, Height: 78},
+                Badges: [2, ""Maverick"", true],
+                Tools: [{Name: ""Screwdriver"", Weight: 2, IsEnabled: true}, {Name: ""Electro-shocker"", Weight: 3, IsEnabled: false}],
+                Path: [{X: 5, Y: 6}, {X: 45, Y: 90}, {X: 15, Y: 16}],
+                Extra: {Kind: 1, MovieSeries: ""Episode 2""}
+            }");
+      IJSValueReader reader = new JTokenJSValueReader(jobj);
+
+      reader.ReadValue(out RobotInfo robot);
+      Assert.AreEqual(RobotModel.R2D2, robot.Model);
+      Assert.AreEqual("Bob", robot.Name);
+      Assert.AreEqual(42, robot.Age);
+      Assert.AreEqual(RobotShape.Trashcan, robot.Shape);
+      Assert.AreEqual(RobotShape.Beercan, robot.Shape2.Value);
+      Assert.IsFalse(robot.Shape3.HasValue);
+      Assert.AreEqual(3, robot.Steps.Count);
+      Assert.AreEqual(1, robot.Steps[0]);
+      Assert.AreEqual(2, robot.Steps[1]);
+      Assert.AreEqual(3, robot.Steps[2]);
+      Assert.AreEqual(2, robot.Dimensions.Count);
+      Assert.AreEqual(24, robot.Dimensions["Width"]);
+      Assert.AreEqual(78, robot.Dimensions["Height"]);
+      Assert.AreEqual(2, robot.Badges.Item1);
+      Assert.AreEqual("Maverick", robot.Badges.Item2);
+      Assert.AreEqual(true, robot.Badges.Item3);
+      Assert.AreEqual(2, robot.Tools.Length);
+      Assert.AreEqual("Screwdriver", robot.Tools[0].Name);
+      Assert.AreEqual(2, robot.Tools[0].Weight);
+      Assert.AreEqual(true, robot.Tools[0].IsEnabled);
+      Assert.AreEqual("Electro-shocker", robot.Tools[1].Name);
+      Assert.AreEqual(3, robot.Tools[1].Weight);
+      Assert.AreEqual(false, robot.Tools[1].IsEnabled);
+      Assert.AreEqual(3, robot.Path.Length);
+      Assert.AreEqual(5, robot.Path[0].X);
+      Assert.AreEqual(6, robot.Path[0].Y);
+      Assert.AreEqual(45, robot.Path[1].X);
+      Assert.AreEqual(90, robot.Path[1].Y);
+      Assert.AreEqual(15, robot.Path[2].X);
+      Assert.AreEqual(16, robot.Path[2].Y);
+      Assert.AreEqual(true, robot.Extra.TryGet<R2D2Extra>(out var r2d2Extra));
+      Assert.AreEqual("Episode 2", r2d2Extra.MovieSeries);
+    }
+
+    [TestMethod]
+    public void TestWriteCustomType()
+    {
+      var robot = new RobotInfo
+      {
+        Model = RobotModel.R2D2,
+        Name = "Bob",
+        Age = 42,
+        Shape = RobotShape.Trashcan,
+        Shape2 = RobotShape.Beercan,
+        Shape3 = null,
+        Steps = new List<int> { 1, 2, 3 },
+        Dimensions = new Dictionary<string, int> { ["Width"] = 24, ["Height"] = 78 },
+        Badges = Tuple.Create(2, "Maverick", true),
+        Tools = new RobotTool[] {
+                    new RobotTool { Name = "Screwdriver", Weight = 2, IsEnabled = true},
+                    new RobotTool { Name = "Electro-shocker", Weight = 3, IsEnabled = false}
+                },
+        Path = new RobotPoint[] {
+                    new RobotPoint {X = 5, Y = 6},
+                    new RobotPoint { X = 45, Y = 90},
+                    new RobotPoint { X = 15, Y = 16}
+                },
+        Extra = new R2D2Extra { MovieSeries = "Episode 2" }
+      };
+
+      var writer = new JTokenJSValueWriter();
+      writer.WriteValue(robot);
+      JToken jValue = writer.TakeValue();
+
+      Assert.AreEqual((int)RobotModel.R2D2, jValue["Model"]);
+      Assert.AreEqual("Bob", jValue["Name"]);
+      Assert.AreEqual(42, jValue["Age"]);
+      Assert.AreEqual((int)RobotShape.Trashcan, jValue["Shape"]);
+      Assert.AreEqual((int)RobotShape.Beercan, jValue["Shape2"]);
+      Assert.AreEqual(JTokenType.Null, jValue["Shape3"].Type);
+      Assert.AreEqual(3, (jValue["Steps"] as JArray).Count);
+      Assert.AreEqual(1, jValue["Steps"][0]);
+      Assert.AreEqual(2, jValue["Steps"][1]);
+      Assert.AreEqual(3, jValue["Steps"][2]);
+      Assert.AreEqual(2, (jValue["Dimensions"] as JObject).Count);
+      Assert.AreEqual(24, jValue["Dimensions"]["Width"]);
+      Assert.AreEqual(78, jValue["Dimensions"]["Height"]);
+      Assert.AreEqual(2, jValue["Badges"][0]);
+      Assert.AreEqual("Maverick", jValue["Badges"][1]);
+      Assert.AreEqual(true, jValue["Badges"][2]);
+      Assert.AreEqual(2, (jValue["Tools"] as JArray).Count);
+      Assert.AreEqual("Screwdriver", jValue["Tools"][0]["Name"]);
+      Assert.AreEqual(2, jValue["Tools"][0]["Weight"]);
+      Assert.AreEqual(true, jValue["Tools"][0]["IsEnabled"]);
+      Assert.AreEqual("Electro-shocker", jValue["Tools"][1]["Name"]);
+      Assert.AreEqual(3, jValue["Tools"][1]["Weight"]);
+      Assert.AreEqual(false, jValue["Tools"][1]["IsEnabled"]);
+      Assert.AreEqual(3, (jValue["Path"] as JArray).Count);
+      Assert.AreEqual(5, jValue["Path"][0]["X"]);
+      Assert.AreEqual(6, jValue["Path"][0]["Y"]);
+      Assert.AreEqual(45, jValue["Path"][1]["X"]);
+      Assert.AreEqual(90, jValue["Path"][1]["Y"]);
+      Assert.AreEqual(15, jValue["Path"][2]["X"]);
+      Assert.AreEqual(16, jValue["Path"][2]["Y"]);
+      Assert.AreEqual("Episode 2", jValue["Extra"]["MovieSeries"]);
+    }
+
+    [TestMethod]
+    public void TestReadValueDefaultExtensions()
+    {
+      JObject jobj = JObject.Parse(@"{
+                StringValue1: """",
+                StringValue2: ""5"",
+                StringValue3: ""Hello"",
+                BoolValue1: false,
+                BoolValue2: true,
+                IntValue1: 0,
+                IntValue2: 42,
+                FloatValue: 3.14,
+                NullValue: null
+            }");
+      IJSValueReader reader = new JTokenJSValueReader(jobj);
+
+      Assert.AreEqual(JSValueType.Object, reader.ValueType);
+      int properyCount = 0;
+      while (reader.GetNextObjectProperty(out string propertyName))
+      {
+        switch (propertyName)
+        {
+          case "StringValue1":
+            Assert.AreEqual("", reader.ReadValue<string>());
+            Assert.AreEqual(false, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)0, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)0, reader.ReadValue<short>());
+            Assert.AreEqual(0, reader.ReadValue<int>());
+            Assert.AreEqual(0, reader.ReadValue<long>());
+            Assert.AreEqual((byte)0, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)0, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)0, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)0, reader.ReadValue<ulong>());
+            Assert.AreEqual(0, reader.ReadValue<float>());
+            Assert.AreEqual(0, reader.ReadValue<double>());
+            break;
+          case "StringValue2":
+            Assert.AreEqual("5", reader.ReadValue<string>());
+            Assert.AreEqual(true, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)5, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)5, reader.ReadValue<short>());
+            Assert.AreEqual(5, reader.ReadValue<int>());
+            Assert.AreEqual(5, reader.ReadValue<long>());
+            Assert.AreEqual((byte)5, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)5, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)5, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)5, reader.ReadValue<ulong>());
+            Assert.AreEqual(5, reader.ReadValue<float>());
+            Assert.AreEqual(5, reader.ReadValue<double>());
+            break;
+          case "StringValue3":
+            Assert.AreEqual("Hello", reader.ReadValue<string>());
+            Assert.AreEqual(true, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)0, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)0, reader.ReadValue<short>());
+            Assert.AreEqual(0, reader.ReadValue<int>());
+            Assert.AreEqual(0, reader.ReadValue<long>());
+            Assert.AreEqual((byte)0, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)0, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)0, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)0, reader.ReadValue<ulong>());
+            Assert.AreEqual(0, reader.ReadValue<float>());
+            Assert.AreEqual(0, reader.ReadValue<double>());
+            break;
+          case "BoolValue1":
+            Assert.AreEqual("false", reader.ReadValue<string>());
+            Assert.AreEqual(false, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)0, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)0, reader.ReadValue<short>());
+            Assert.AreEqual(0, reader.ReadValue<int>());
+            Assert.AreEqual(0, reader.ReadValue<long>());
+            Assert.AreEqual((byte)0, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)0, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)0, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)0, reader.ReadValue<ulong>());
+            Assert.AreEqual(0, reader.ReadValue<float>());
+            Assert.AreEqual(0, reader.ReadValue<double>());
+            break;
+          case "BoolValue2":
+            Assert.AreEqual("true", reader.ReadValue<string>());
+            Assert.AreEqual(true, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)1, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)1, reader.ReadValue<short>());
+            Assert.AreEqual(1, reader.ReadValue<int>());
+            Assert.AreEqual(1, reader.ReadValue<long>());
+            Assert.AreEqual((byte)1, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)1, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)1, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)1, reader.ReadValue<ulong>());
+            Assert.AreEqual(1, reader.ReadValue<float>());
+            Assert.AreEqual(1, reader.ReadValue<double>());
+            break;
+          case "IntValue1":
+            Assert.AreEqual("0", reader.ReadValue<string>());
+            Assert.AreEqual(false, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)0, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)0, reader.ReadValue<short>());
+            Assert.AreEqual(0, reader.ReadValue<int>());
+            Assert.AreEqual(0, reader.ReadValue<long>());
+            Assert.AreEqual((byte)0, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)0, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)0, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)0, reader.ReadValue<ulong>());
+            Assert.AreEqual(0, reader.ReadValue<float>());
+            Assert.AreEqual(0, reader.ReadValue<double>());
+            break;
+          case "IntValue2":
+            Assert.AreEqual("42", reader.ReadValue<string>());
+            Assert.AreEqual(true, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)42, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)42, reader.ReadValue<short>());
+            Assert.AreEqual(42, reader.ReadValue<int>());
+            Assert.AreEqual(42, reader.ReadValue<long>());
+            Assert.AreEqual((byte)42, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)42, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)42, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)42, reader.ReadValue<ulong>());
+            Assert.AreEqual(42, reader.ReadValue<float>());
+            Assert.AreEqual(42, reader.ReadValue<double>());
+            break;
+          case "FloatValue":
+            Assert.AreEqual("3.14", reader.ReadValue<string>());
+            Assert.AreEqual(true, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)3, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)3, reader.ReadValue<short>());
+            Assert.AreEqual(3, reader.ReadValue<int>());
+            Assert.AreEqual(3, reader.ReadValue<long>());
+            Assert.AreEqual((byte)3, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)3, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)3, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)3, reader.ReadValue<ulong>());
+            Assert.AreEqual((float)3.14, reader.ReadValue<float>());
+            Assert.AreEqual(3.14, reader.ReadValue<double>());
+            break;
+          case "NullValue":
+            Assert.AreEqual("", reader.ReadValue<string>());
+            Assert.AreEqual(false, reader.ReadValue<bool>());
+            Assert.AreEqual((sbyte)0, reader.ReadValue<sbyte>());
+            Assert.AreEqual((short)0, reader.ReadValue<short>());
+            Assert.AreEqual(0, reader.ReadValue<int>());
+            Assert.AreEqual(0, reader.ReadValue<long>());
+            Assert.AreEqual((byte)0, reader.ReadValue<byte>());
+            Assert.AreEqual((ushort)0, reader.ReadValue<ushort>());
+            Assert.AreEqual((uint)0, reader.ReadValue<uint>());
+            Assert.AreEqual((ulong)0, reader.ReadValue<ulong>());
+            Assert.AreEqual(0, reader.ReadValue<float>());
+            Assert.AreEqual(0, reader.ReadValue<double>());
+            break;
+        }
+        ++properyCount;
+      }
+      Assert.AreEqual(9, properyCount);
+    }
+
+    [TestMethod]
+    public void TestWriteValueDefaultExtensions()
+    {
+      var writer = new JTokenJSValueWriter();
+      writer.WriteObjectBegin();
+      writer.WriteObjectProperty("StringValue1", "");
+      writer.WriteObjectProperty("StringValue2", "5");
+      writer.WriteObjectProperty("StringValue3", "Hello");
+      writer.WriteObjectProperty("BoolValue1", false);
+      writer.WriteObjectProperty("BoolValue2", true);
+      writer.WriteObjectProperty("IntValue1", 0);
+      writer.WriteObjectProperty("IntValue2", 42);
+      writer.WriteObjectProperty("FloatValue", 3.14);
+      writer.WriteObjectProperty("NullValue", JSValue.Null);
+      writer.WriteObjectEnd();
+      JToken jValue = writer.TakeValue();
+
+      Assert.AreEqual("", jValue["StringValue1"]);
+      Assert.AreEqual("5", jValue["StringValue2"]);
+      Assert.AreEqual("Hello", jValue["StringValue3"]);
+      Assert.AreEqual(false, jValue["BoolValue1"]);
+      Assert.AreEqual(true, jValue["BoolValue2"]);
+      Assert.AreEqual(0, jValue["IntValue1"]);
+      Assert.AreEqual(42, jValue["IntValue2"]);
+      Assert.AreEqual(3.14, jValue["FloatValue"]);
+      Assert.AreEqual(JTokenType.Null, jValue["NullValue"].Type);
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/JSValueTest.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/JSValueTest.cs
new file mode 100644
index 00000000000..dab01bcfc4f
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/JSValueTest.cs
@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.ReactNative.Managed.UnitTests
+{
+  [TestClass]
+  public class JSValueTest
+  {
+    [TestMethod]
+    public void TestReadObject()
+    {
+      JObject jobj = JObject.Parse(@"{
+              NullValue: null,
+              ObjValue: {},
+              ArrayValue: [],
+              StringValue: ""Hello"",
+              BoolValue: true,
+              IntValue: 42,
+              DoubleValue: 4.5
+            }");
+      IJSValueReader reader = new JTokenJSValueReader(jobj);
+
+      JSValue jsValue = JSValue.ReadFrom(reader);
+      Assert.AreEqual(JSValueType.Object, jsValue.Type);
+      Assert.IsTrue(jsValue.Object["NullValue"].IsNull);
+      Assert.IsNotNull(jsValue.Object["ObjValue"].Object);
+      Assert.IsNotNull(jsValue.Object["ArrayValue"].Array);
+      Assert.AreEqual("Hello", jsValue.Object["StringValue"].String);
+      Assert.AreEqual(true, jsValue.Object["BoolValue"].Boolean);
+      Assert.AreEqual(42, jsValue.Object["IntValue"].Int64);
+      Assert.AreEqual(4.5, jsValue.Object["DoubleValue"].Double);
+    }
+
+    [TestMethod]
+    public void TestReadNestedObject()
+    {
+      JObject jobj = JObject.Parse(@"{
+              NestedObj: {
+                NullValue: null,
+                ObjValue: {},
+                ArrayValue: [],
+                StringValue: ""Hello"",
+                BoolValue: true,
+                IntValue: 42,
+                DoubleValue: 4.5
+              }
+            }");
+      IJSValueReader reader = new JTokenJSValueReader(jobj);
+
+      JSValue jsValue = JSValue.ReadFrom(reader);
+      Assert.AreEqual(JSValueType.Object, jsValue.Type);
+      var nestedObj = jsValue.Object["NestedObj"].Object;
+      Assert.IsTrue(nestedObj["NullValue"].IsNull);
+      Assert.IsNotNull(nestedObj["ObjValue"].Object);
+      Assert.IsNotNull(nestedObj["ArrayValue"].Array);
+      Assert.AreEqual("Hello", nestedObj["StringValue"].String);
+      Assert.AreEqual(true, nestedObj["BoolValue"].Boolean);
+      Assert.AreEqual(42, nestedObj["IntValue"].Int64);
+      Assert.AreEqual(4.5, nestedObj["DoubleValue"].Double);
+    }
+
+    [TestMethod]
+    public void TestReadArray()
+    {
+      JArray jarr = JArray.Parse(@"[null, {}, [], ""Hello"", true, 42, 4.5]");
+      IJSValueReader reader = new JTokenJSValueReader(jarr);
+
+      JSValue jsValue = JSValue.ReadFrom(reader);
+      Assert.AreEqual(JSValueType.Array, jsValue.Type);
+      Assert.IsTrue(jsValue.Array[0].IsNull);
+      Assert.IsNotNull(jsValue.Array[1].Object);
+      Assert.IsNotNull(jsValue.Array[2].Array);
+      Assert.AreEqual("Hello", jsValue.Array[3].String);
+      Assert.AreEqual(true, jsValue.Array[4].Boolean);
+      Assert.AreEqual(42, jsValue.Array[5].Int64);
+      Assert.AreEqual(4.5, jsValue.Array[6].Double);
+    }
+
+    [TestMethod]
+    public void TestReadNestedArray()
+    {
+      JArray jarr = JArray.Parse(@"[[null, {}, [], ""Hello"", true, 42, 4.5]]");
+      IJSValueReader reader = new JTokenJSValueReader(jarr);
+
+      JSValue jsValue = JSValue.ReadFrom(reader);
+      Assert.AreEqual(JSValueType.Array, jsValue.Type);
+      var nestedArr = jsValue.Array[0].Array;
+      Assert.IsTrue(nestedArr[0].IsNull);
+      Assert.IsNotNull(nestedArr[1].Object);
+      Assert.IsNotNull(nestedArr[2].Array);
+      Assert.AreEqual("Hello", nestedArr[3].String);
+      Assert.AreEqual(true, nestedArr[4].Boolean);
+      Assert.AreEqual(42, nestedArr[5].Int64);
+      Assert.AreEqual(4.5, nestedArr[6].Double);
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/JTokenJSValueReader.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/JTokenJSValueReader.cs
new file mode 100644
index 00000000000..5f85a92aef5
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/JTokenJSValueReader.cs
@@ -0,0 +1,194 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
+
+namespace Microsoft.ReactNative.Managed.UnitTests
+{
+  class JTokenJSValueReader : IJSValueReader
+  {
+    private JToken m_current;
+    private bool m_isIterating = false;
+    private readonly Stack<StackEntry> m_stack = new Stack<StackEntry>();
+
+    public JTokenJSValueReader(JToken root)
+    {
+      m_current = root;
+    }
+
+    public JSValueType ValueType
+    {
+      get
+      {
+        switch (m_current.Type)
+        {
+          case JTokenType.Null:
+            return JSValueType.Null;
+          case JTokenType.Object:
+            return JSValueType.Object;
+          case JTokenType.Array:
+            return JSValueType.Array;
+          case JTokenType.String:
+            return JSValueType.String;
+          case JTokenType.Boolean:
+            return JSValueType.Boolean;
+          case JTokenType.Integer:
+            return JSValueType.Int64;
+          case JTokenType.Float:
+            return JSValueType.Double;
+          default:
+            return JSValueType.Null;
+        }
+      }
+    }
+
+    public bool GetNextObjectProperty(out string propertyName)
+    {
+      if (!m_isIterating)
+      {
+        if (m_current.Type == JTokenType.Object)
+        {
+          var properties = ((JObject)m_current).Properties().GetEnumerator();
+          if (properties.MoveNext())
+          {
+            m_stack.Push(StackEntry.ObjectProperty(m_current, properties));
+            SetCurrentValue(properties.Current.Value);
+            propertyName = properties.Current.Name;
+            return true;
+          }
+          else
+          {
+            m_isIterating = m_stack.Count != 0;
+          }
+        }
+      }
+      else if (m_stack.Count != 0)
+      {
+        StackEntry entry = m_stack.Peek();
+        if (entry.Value.Type == JTokenType.Object)
+        {
+          if (entry.Property.MoveNext())
+          {
+            SetCurrentValue(entry.Property.Current.Value);
+            propertyName = entry.Property.Current.Name;
+            return true;
+          }
+          else
+          {
+            m_current = entry.Value;
+            m_stack.Pop();
+            m_isIterating = m_stack.Count != 0;
+          }
+        }
+      }
+
+      propertyName = "";
+      return false;
+    }
+
+    public bool GetNextArrayItem()
+    {
+      if (!m_isIterating)
+      {
+        if (m_current.Type == JTokenType.Array)
+        {
+          var items = ((JArray)m_current).GetEnumerator();
+          if (items.MoveNext())
+          {
+            m_stack.Push(StackEntry.ArrayItem(m_current, items));
+            SetCurrentValue(items.Current);
+            return true;
+          }
+          else
+          {
+            m_isIterating = m_stack.Count != 0;
+          }
+        }
+      }
+      else if (m_stack.Count != 0)
+      {
+        var entry = m_stack.Peek();
+        if (entry.Value.Type == JTokenType.Array)
+        {
+          if (entry.Item.MoveNext())
+          {
+            SetCurrentValue(entry.Item.Current);
+            return true;
+          }
+          else
+          {
+            m_current = entry.Value;
+            m_stack.Pop();
+            m_isIterating = m_stack.Count != 0;
+          }
+        }
+      }
+
+      return false;
+    }
+
+    private void SetCurrentValue(JToken value)
+    {
+      m_current = value;
+      switch (value.Type)
+      {
+        case JTokenType.Object:
+        case JTokenType.Array:
+          m_isIterating = false;
+          break;
+        default:
+          m_isIterating = true;
+          break;
+      }
+    }
+
+    public string GetString()
+    {
+      return (m_current.Type == JTokenType.String) ? (string)(JValue)m_current : "";
+    }
+
+    public bool GetBoolean()
+    {
+      return (m_current.Type == JTokenType.Boolean) ? (bool)(JValue)m_current : false;
+    }
+
+    public long GetInt64()
+    {
+      return (m_current.Type == JTokenType.Integer) ? (long)(JValue)m_current : 0;
+    }
+
+    public double GetDouble()
+    {
+      return (m_current.Type == JTokenType.Float) ? (double)(JValue)m_current : 0;
+    }
+
+    private struct StackEntry
+    {
+      public static StackEntry ObjectProperty(JToken value, IEnumerator<JProperty> property)
+      {
+        return new StackEntry
+        {
+          Value = value,
+          Item = null,
+          Property = property
+        };
+      }
+
+      public static StackEntry ArrayItem(JToken value, IEnumerator<JToken> item)
+      {
+        return new StackEntry
+        {
+          Value = value,
+          Item = item,
+          Property = null
+        };
+      }
+
+      public JToken Value;
+      public IEnumerator<JToken> Item;
+      public IEnumerator<JProperty> Property;
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/JTokenJSValueWriter.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/JTokenJSValueWriter.cs
new file mode 100644
index 00000000000..90ee87f650c
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/JTokenJSValueWriter.cs
@@ -0,0 +1,207 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.ReactNative.Managed.UnitTests
+{
+  class JTokenJSValueWriter : IJSValueWriter
+  {
+    private State m_state = State.Start;
+    private List<StackEntry> m_stack = new List<StackEntry>();
+    private JToken m_dynamic;
+    private string m_propertyName;
+    private JToken m_result;
+
+    public JToken TakeValue()
+    {
+      return m_result;
+    }
+
+    public void WriteNull()
+    {
+      WriteValue(new JValue((object)null));
+    }
+
+    public void WriteBoolean(bool value)
+    {
+      WriteValue(new JValue(value));
+    }
+
+    public void WriteInt64(long value)
+    {
+      WriteValue(new JValue(value));
+    }
+
+    public void WriteDouble(double value)
+    {
+      WriteValue(new JValue(value));
+    }
+
+    public void WriteString(string value)
+    {
+      WriteValue(new JValue(value));
+    }
+
+    public void WriteObjectBegin()
+    {
+      if (m_state == State.PropertyValue)
+      {
+        m_stack.Add(new StackEntry(m_state, (JObject)m_dynamic, m_propertyName));
+      }
+      else if (m_state == State.Array)
+      {
+        m_stack.Add(new StackEntry(m_state, (JArray)m_dynamic));
+      }
+      else if (m_state != State.Start)
+      {
+        throw new InvalidOperationException();
+      }
+
+      m_dynamic = new JObject();
+      m_state = State.PropertyName;
+    }
+
+    public void WritePropertyName(string name)
+    {
+      if (m_state == State.PropertyName)
+      {
+        m_propertyName = name;
+        m_state = State.PropertyValue;
+      }
+      else
+      {
+        throw new InvalidOperationException();
+      }
+    }
+
+    public void WriteObjectEnd()
+    {
+      if (m_state == State.PropertyName)
+      {
+        if (m_stack.Count == 0)
+        {
+          m_result = m_dynamic;
+          m_state = State.Finish;
+          return;
+        }
+        else
+        {
+          StackEntry entry = m_stack.Last();
+          if (entry.State == State.PropertyValue)
+          {
+            ((JObject)entry.Dynamic)[entry.PropertyName] = m_dynamic;
+            m_dynamic = entry.Dynamic;
+            m_state = State.PropertyName;
+            m_stack.RemoveAt(m_stack.Count - 1);
+            return;
+          }
+          else if (entry.State == State.Array)
+          {
+            entry.Dynamic.Add(m_dynamic);
+            m_dynamic = entry.Dynamic;
+            m_state = State.Array;
+            m_stack.RemoveAt(m_stack.Count - 1);
+            return;
+          }
+        }
+      }
+
+      throw new InvalidOperationException();
+    }
+
+    public void WriteArrayBegin()
+    {
+      if (m_state == State.PropertyValue)
+      {
+        m_stack.Add(new StackEntry(m_state, (JObject)m_dynamic, m_propertyName));
+      }
+      else if (m_state == State.Array)
+      {
+        m_stack.Add(new StackEntry(m_state, (JArray)m_dynamic));
+      }
+      else if (m_state != State.Start)
+      {
+        throw new InvalidOperationException();
+      }
+
+      m_dynamic = new JArray();
+      m_state = State.Array;
+    }
+
+    public void WriteArrayEnd()
+    {
+      if (m_state == State.Array)
+      {
+        if (m_stack.Count == 0)
+        {
+          m_result = m_dynamic;
+          m_state = State.Finish;
+          return;
+        }
+        else
+        {
+          StackEntry entry = m_stack.Last();
+          if (entry.State == State.PropertyValue)
+          {
+            ((JObject)entry.Dynamic)[entry.PropertyName] = m_dynamic;
+            m_dynamic = entry.Dynamic;
+            m_state = State.PropertyName;
+            m_stack.RemoveAt(m_stack.Count - 1);
+            return;
+          }
+          else if (entry.State == State.Array)
+          {
+            entry.Dynamic.Add(m_dynamic);
+            m_dynamic = entry.Dynamic;
+            m_state = State.Array;
+            m_stack.RemoveAt(m_stack.Count - 1);
+            return;
+          }
+        }
+      }
+
+      throw new InvalidOperationException();
+    }
+
+    private enum State { Start, PropertyName, PropertyValue, Array, Finish };
+
+    class StackEntry
+    {
+      public StackEntry(State state, JObject obj, string propertyName)
+      {
+        State = state;
+        Dynamic = obj;
+        PropertyName = propertyName;
+      }
+
+      public StackEntry(State state, JArray arr)
+      {
+        State = state;
+        Dynamic = arr;
+        PropertyName = null;
+      }
+
+      public State State;
+      public JContainer Dynamic;
+      public string PropertyName;
+    }
+
+    private void WriteValue(JToken value)
+    {
+      if (m_state == State.PropertyValue)
+      {
+        m_dynamic[m_propertyName] = value;
+        m_state = State.PropertyName;
+      }
+      else if (m_state == State.Array)
+      {
+        ((JArray)m_dynamic).Add(value);
+      }
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj
new file mode 100644
index 00000000000..2eca04c8739
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.ReactNative.Managed.UnitTests</RootNamespace>
+    <AssemblyName>Microsoft.ReactNative.Managed.UnitTests</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
+    <OutputPath>bin\ARM64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
+  <ItemGroup>
+    <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="JSValueReaderTest.cs" />
+    <Compile Include="JSValueTest.cs" />
+    <Compile Include="JTokenJSValueReader.cs" />
+    <Compile Include="JTokenJSValueWriter.cs" />
+    <Compile Include="NativeModuleTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReactModuleBuilderMock.cs" />
+    <Compile Include="UnitTestApp.xaml.cs">
+      <DependentUpon>UnitTestApp.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="UnitTestApp.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Properties\Default.rd.xml" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.9</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="MSTest.TestFramework">
+      <Version>1.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
+      <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
+      <Name>Microsoft.ReactNative</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems" Label="Shared" />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/NativeModuleTest.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/NativeModuleTest.cs
new file mode 100644
index 00000000000..ef79393ea0e
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/NativeModuleTest.cs
@@ -0,0 +1,827 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace Microsoft.ReactNative.Managed.UnitTests
+{
+  public struct Point
+  {
+    public int X;
+    public int Y;
+  }
+
+  class SimpleNativeModule
+  {
+    [ReactMethod]
+    public int Add(int x, int y)
+    {
+      return x + y;
+    }
+
+    [ReactMethod]
+    public int Negate(int x)
+    {
+      return -x;
+    }
+
+    [ReactMethod]
+    public string SayHello()
+    {
+      return "Hello";
+    }
+
+    [ReactMethod]
+    public static int StaticAdd(int x, int y)
+    {
+      return x + y;
+    }
+
+    [ReactMethod]
+    public static int StaticNegate(int x)
+    {
+      return -x;
+    }
+
+    [ReactMethod]
+    public static string StaticSayHello()
+    {
+      return "Hello";
+    }
+
+    [ReactMethod]
+    public void SayHello0()
+    {
+      Message = "Hello_0";
+    }
+
+    [ReactMethod]
+    public void PrintPoint(Point pt)
+    {
+      Message = $"Point: ({pt.X}, {pt.Y})";
+    }
+
+    [ReactMethod]
+    public void PrintLine(Point start, Point end)
+    {
+      Message = $"Line: ({start.X}, {start.Y})-({end.X}, {end.Y})";
+    }
+
+    [ReactMethod]
+    public static void StaticSayHello1()
+    {
+      StaticMessage = "Hello_1";
+    }
+
+    [ReactMethod]
+    public static void StaticPrintPoint(Point pt)
+    {
+      StaticMessage = $"Static Point: ({pt.X}, {pt.Y})";
+    }
+
+    [ReactMethod]
+    public static void StaticPrintLine(Point start, Point end)
+    {
+      StaticMessage = $"Static Line: ({start.X}, {start.Y})-({end.X}, {end.Y})";
+    }
+
+    [ReactMethod]
+    public void AddCallback(int x, int y, Action<int> resolve)
+    {
+      resolve(x + y);
+    }
+
+    [ReactMethod]
+    public void NegateCallback(int x, Action<int> resolve)
+    {
+      resolve(-x);
+    }
+
+    [ReactMethod]
+    public void SayHelloCallback(Action<string> resolve)
+    {
+      resolve("Hello_2");
+    }
+
+    [ReactMethod]
+    public static void StaticAddCallback(int x, int y, Action<int> resolve)
+    {
+      resolve(x + y);
+    }
+
+    [ReactMethod]
+    public static void StaticNegateCallback(int x, Action<int> resolve)
+    {
+      resolve(-x);
+    }
+
+    [ReactMethod]
+    public static void StaticSayHelloCallback(Action<string> resolve)
+    {
+      resolve("Static Hello_2");
+    }
+
+    [ReactMethod]
+    public void DivideCallbacks(int x, int y, Action<int> resolve, Action<string> reject)
+    {
+      if (y != 0)
+      {
+        resolve(x / y);
+      }
+      else
+      {
+        reject("Division by 0");
+      }
+    }
+
+    [ReactMethod]
+    public void NegateCallbacks(int x, Action<int> resolve, Action<string> reject)
+    {
+      if (x >= 0)
+      {
+        resolve(-x);
+      }
+      else
+      {
+        reject("Already negative");
+      }
+    }
+
+    [ReactMethod]
+    public void ResolveSayHelloCallbacks(Action<string> resolve, Action<string> reject)
+    {
+      resolve("Hello_3");
+    }
+
+    [ReactMethod]
+    public void RejectSayHelloCallbacks(Action<string> resolve, Action<string> reject)
+    {
+      reject("Goodbye");
+    }
+
+    [ReactMethod]
+    public static void StaticDivideCallbacks(int x, int y, Action<int> resolve, Action<string> reject)
+    {
+      if (y != 0)
+      {
+        resolve(x / y);
+      }
+      else
+      {
+        reject("Division by 0");
+      }
+    }
+
+    [ReactMethod]
+    public static void StaticNegateCallbacks(int x, Action<int> resolve, Action<string> reject)
+    {
+      if (x >= 0)
+      {
+        resolve(-x);
+      }
+      else
+      {
+        reject("Already negative");
+      }
+    }
+
+    [ReactMethod]
+    public static void StaticResolveSayHelloCallbacks(Action<string> resolve, Action<string> reject)
+    {
+      resolve("Hello_3");
+    }
+
+    [ReactMethod]
+    public static void StaticRejectSayHelloCallbacks(Action<string> resolve, Action<string> reject)
+    {
+      reject("Goodbye");
+    }
+
+    [ReactMethod]
+    public void DividePromise(int x, int y, IReactPromise<int> promise)
+    {
+      if (y != 0)
+      {
+        promise.Resolve(x / y);
+      }
+      else
+      {
+        promise.Reject(new ReactError { Message = "Division by 0" });
+      }
+    }
+
+    [ReactMethod]
+    public void NegatePromise(int x, IReactPromise<int> promise)
+    {
+      if (x >= 0)
+      {
+        promise.Resolve(-x);
+      }
+      else
+      {
+        promise.Reject(new ReactError { Message = "Already negative" });
+      }
+    }
+
+    [ReactMethod]
+    public void ResolveSayHelloPromise(IReactPromise<string> promise)
+    {
+      promise.Resolve("Hello_3");
+    }
+
+    [ReactMethod]
+    public void RejectSayHelloPromise(IReactPromise<string> promise)
+    {
+      promise.Reject(new ReactError { Message = "Promise rejected" });
+    }
+
+    [ReactMethod]
+    public static void StaticDividePromise(int x, int y, IReactPromise<int> promise)
+    {
+      if (y != 0)
+      {
+        promise.Resolve(x / y);
+      }
+      else
+      {
+        promise.Reject(new ReactError { Message = "Division by 0" });
+      }
+    }
+
+    [ReactMethod]
+    public static void StaticNegatePromise(int x, IReactPromise<int> promise)
+    {
+      if (x >= 0)
+      {
+        promise.Resolve(-x);
+      }
+      else
+      {
+        promise.Reject(new ReactError { Message = "Already negative" });
+      }
+    }
+
+    [ReactMethod]
+    public static void StaticResolveSayHelloPromise(IReactPromise<string> promise)
+    {
+      promise.Resolve("Hello_3");
+    }
+
+    [ReactMethod]
+    public static void StaticRejectSayHelloPromise(IReactPromise<string> promise)
+    {
+      promise.Reject(new ReactError { Message = "Promise rejected" });
+    }
+
+    [ReactSyncMethod]
+    public int AddSync(int x, int y)
+    {
+      return x + y;
+    }
+
+    [ReactSyncMethod]
+    public int NegateSync(int x)
+    {
+      return -x;
+    }
+
+    [ReactSyncMethod]
+    public string SayHelloSync()
+    {
+      return "Hello";
+    }
+
+    [ReactSyncMethod]
+    public static int StaticAddSync(int x, int y)
+    {
+      return x + y;
+    }
+
+    [ReactSyncMethod]
+    public static int StaticNegateSync(int x)
+    {
+      return -x;
+    }
+
+    [ReactSyncMethod]
+    public static string StaticSayHelloSync()
+    {
+      return "Hello";
+    }
+
+    [ReactConstant]
+    public readonly string Constant1 = "MyConstant1";
+
+    [ReactConstant("const2")]
+    public static readonly string Constant2 = "MyConstant2";
+
+    [ReactConstant("const3")]
+    public Point Constant3 => new Point { X = 2, Y = 3 };
+
+    [ReactConstant]
+    public static Point Constant4 => new Point { X = 3, Y = 4 };
+
+    [ReactConstantProvider]
+    public void Constant5(ReactConstantProvider provider)
+    {
+      provider.Add("const51", new Point { X = 12, Y = 14 });
+      provider.Add("const52", "MyConstant52");
+    }
+
+    [ReactConstantProvider]
+    public static void Constant6(ReactConstantProvider provider)
+    {
+      provider.Add("const61", new Point { X = 15, Y = 17 });
+      provider.Add("const62", "MyConstant62");
+    }
+
+    [ReactEvent("onIntResult1")]
+    public Action<int> OnIntResult1 = null;
+
+    [ReactEvent]
+    public static Action<int> OnIntResult2 = null;
+
+    [ReactEvent]
+    public Action<Point> OnPointResult3 { get; set; }
+
+    [ReactEvent("onPointResult4")]
+    public static Action<Point> OnPointResult4 { get; set; }
+
+    public string Message { get; set; }
+    public static string StaticMessage { get; set; }
+  }
+
+  [TestClass]
+  public class NativeModuleTest
+  {
+    private ReactModuleBuilderMock m_moduleBuilder;
+    private ReactModuleInfo m_moduleInfo;
+    private SimpleNativeModule m_module;
+
+    [TestInitialize]
+    public void Initialize()
+    {
+      m_moduleBuilder = new ReactModuleBuilderMock();
+      m_moduleInfo = new ReactModuleInfo(typeof(SimpleNativeModule), "SimpleNativeModule", "SimpleNativeModule");
+      m_module = (SimpleNativeModule)m_moduleInfo.ModuleProvider(m_moduleBuilder);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_Add()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.Add), 3, 5, (int result) => Assert.AreEqual(8, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_Negate()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.Negate), 3, (int result) => Assert.AreEqual(-3, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_SayHello()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.SayHello), (string result) => Assert.AreEqual("Hello", result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticAdd()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.StaticAdd), 3, 5, (int result) => Assert.AreEqual(8, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticNegate()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.StaticNegate), 3, (int result) => Assert.AreEqual(-3, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticSayHello()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.StaticSayHello), (string result) => Assert.AreEqual("Hello", result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_SayHello0()
+    {
+      m_moduleBuilder.Call0(nameof(SimpleNativeModule.SayHello0));
+      Assert.AreEqual("Hello_0", m_module.Message);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_PrintPoint()
+    {
+      m_moduleBuilder.Call0(nameof(SimpleNativeModule.PrintPoint), new Point { X = 3, Y = 5 });
+      Assert.AreEqual("Point: (3, 5)", m_module.Message);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_PrintLine()
+    {
+      m_moduleBuilder.Call0(nameof(SimpleNativeModule.PrintLine), new Point { X = 3, Y = 5 }, new Point { X = 6, Y = 8 });
+      Assert.AreEqual("Line: (3, 5)-(6, 8)", m_module.Message);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticSayHello1()
+    {
+      m_moduleBuilder.Call0(nameof(SimpleNativeModule.StaticSayHello1));
+      Assert.AreEqual("Hello_1", SimpleNativeModule.StaticMessage);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticPrintPoint()
+    {
+      m_moduleBuilder.Call0(nameof(SimpleNativeModule.StaticPrintPoint), new Point { X = 13, Y = 15 });
+      Assert.AreEqual("Static Point: (13, 15)", SimpleNativeModule.StaticMessage);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticPrintLine()
+    {
+      m_moduleBuilder.Call0(nameof(SimpleNativeModule.StaticPrintLine),
+          new Point { X = 13, Y = 15 }, new Point { X = 16, Y = 18 });
+      Assert.AreEqual("Static Line: (13, 15)-(16, 18)", SimpleNativeModule.StaticMessage);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_AddCallback()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.AddCallback), 7, -8, (int result) => Assert.AreEqual(-1, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_NegateCallback()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.NegateCallback), 3, (int result) => Assert.AreEqual(-3, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_SayHelloCallback()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.SayHelloCallback), (string result) => Assert.AreEqual("Hello_2", result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticAddCallback()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.StaticAddCallback), 4, 56, (int result) => Assert.AreEqual(60, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticNegateCallback()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.StaticNegateCallback), 33, (int result) => Assert.AreEqual(-33, result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticSayHelloCallback()
+    {
+      m_moduleBuilder.Call1(nameof(SimpleNativeModule.StaticSayHelloCallback), (string result) => Assert.AreEqual("Static Hello_2", result));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_DivideCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.DivideCallbacks), 6, 2,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_DivideCallbacksError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.DivideCallbacks), 6, 0,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_NegateCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.NegateCallbacks), 5,
+          (int result) => Assert.AreEqual(-5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_NegateCallbacksError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.NegateCallbacks), -5,
+          (int result) => Assert.AreEqual(5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_ResolveSayHelloCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.ResolveSayHelloCallbacks),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Goodbye", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_RejectSayHelloCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.RejectSayHelloCallbacks),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Goodbye", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticDivideCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticDivideCallbacks), 6, 2,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticDivideCallbacksError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticDivideCallbacks), 6, 0,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticNegateCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticNegateCallbacks), 5,
+          (int result) => Assert.AreEqual(-5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticNegateCallbacksError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticNegateCallbacks), -5,
+          (int result) => Assert.AreEqual(5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticResolveSayHelloCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticResolveSayHelloCallbacks),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Goodbye", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticRejectSayHelloCallbacks()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticRejectSayHelloCallbacks),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Goodbye", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_DividePromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.DividePromise), 6, 2,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_DividePromiseError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.DividePromise), 6, 0,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_NegatePromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.NegatePromise), 5,
+          (int result) => Assert.AreEqual(-5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_NegatePromiseError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.NegatePromise), -5,
+          (int result) => Assert.AreEqual(5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_ResolveSayHelloPromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.ResolveSayHelloPromise),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Promise rejected", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_RejectSayHelloPromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.RejectSayHelloPromise),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Promise rejected", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticDividePromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticDividePromise), 6, 2,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticDividePromiseError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticDividePromise), 6, 0,
+          (int result) => Assert.AreEqual(3, result),
+          (JSValue error) => Assert.AreEqual("Division by 0", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticNegatePromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticNegatePromise), 5,
+          (int result) => Assert.AreEqual(-5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticNegatePromiseError()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticNegatePromise), -5,
+          (int result) => Assert.AreEqual(5, result),
+          (JSValue error) => Assert.AreEqual("Already negative", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticResolveSayHelloPromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticResolveSayHelloPromise),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Promise rejected", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsResolveCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodCall_StaticRejectSayHelloPromise()
+    {
+      m_moduleBuilder.Call2(nameof(SimpleNativeModule.StaticRejectSayHelloPromise),
+          (string result) => Assert.AreEqual("Hello_3", result),
+          (JSValue error) => Assert.AreEqual("Promise rejected", error.Object["message"].String));
+      Assert.IsTrue(m_moduleBuilder.IsRejectCallbackCalled);
+    }
+
+    [TestMethod]
+    public void TestMethodSyncCall_AddSync()
+    {
+      m_moduleBuilder.CallSync(nameof(SimpleNativeModule.AddSync), 3, 5, out int result);
+      Assert.AreEqual(8, result);
+    }
+
+    [TestMethod]
+    public void TestMethodSyncCall_NegateSync()
+    {
+      m_moduleBuilder.CallSync(nameof(SimpleNativeModule.NegateSync), 3, out int result);
+      Assert.AreEqual(-3, result);
+    }
+
+    [TestMethod]
+    public void TestMethodSyncCall_SayHelloSync()
+    {
+      m_moduleBuilder.CallSync(nameof(SimpleNativeModule.SayHelloSync), out string result);
+      Assert.AreEqual("Hello", result);
+    }
+
+    [TestMethod]
+    public void TestMethodSyncCall_StaticAddSync()
+    {
+      m_moduleBuilder.CallSync(nameof(SimpleNativeModule.StaticAddSync), 3, 5, out int result);
+      Assert.AreEqual(8, result);
+    }
+
+    [TestMethod]
+    public void TestMethodSyncCall_StaticNegateSync()
+    {
+      m_moduleBuilder.CallSync(nameof(SimpleNativeModule.StaticNegateSync), 3, out int result);
+      Assert.AreEqual(-3, result);
+    }
+
+    [TestMethod]
+    public void TestMethodSyncCall_StaticSayHelloSync()
+    {
+      m_moduleBuilder.CallSync(nameof(SimpleNativeModule.StaticSayHelloSync), out string result);
+      Assert.AreEqual("Hello", result);
+    }
+
+    [TestMethod]
+    public void TestConstants()
+    {
+      var constants = m_moduleBuilder.GetConstants();
+      Assert.AreEqual("MyConstant1", constants[nameof(SimpleNativeModule.Constant1)].String);
+      Assert.AreEqual("MyConstant2", constants["const2"].String);
+      Assert.AreEqual(new Point { X = 2, Y = 3 }, constants["const3"].To<Point>());
+      Assert.AreEqual(new Point { X = 3, Y = 4 }, constants[nameof(SimpleNativeModule.Constant4)].To<Point>());
+      Assert.AreEqual(new Point { X = 12, Y = 14 }, constants["const51"].To<Point>());
+      Assert.AreEqual("MyConstant52", constants["const52"].String);
+      Assert.AreEqual(new Point { X = 15, Y = 17 }, constants["const61"].To<Point>());
+      Assert.AreEqual("MyConstant62", constants["const62"].String);
+    }
+
+    [TestMethod]
+    public void TestEvent_EventField()
+    {
+      bool eventRaised = false;
+      m_moduleBuilder.SetEventHandler("onIntResult1", (int eventArg) =>
+      {
+        Assert.AreEqual(42, eventArg);
+        eventRaised = true;
+      });
+
+      m_module.OnIntResult1(42);
+      Assert.IsTrue(eventRaised);
+    }
+
+    [TestMethod]
+    public void TestEvent_StaticEventField()
+    {
+      bool eventRaised = false;
+      m_moduleBuilder.SetEventHandler(nameof(SimpleNativeModule.OnIntResult2), (int eventArg) =>
+      {
+        Assert.AreEqual(64, eventArg);
+        eventRaised = true;
+      });
+
+      SimpleNativeModule.OnIntResult2(64);
+      Assert.IsTrue(eventRaised);
+    }
+
+    [TestMethod]
+    public void TestEvent_EventProperty()
+    {
+      bool eventRaised = false;
+      m_moduleBuilder.SetEventHandler(nameof(SimpleNativeModule.OnPointResult3), (Point eventArg) =>
+      {
+        Assert.AreEqual(12, eventArg.X);
+        Assert.AreEqual(14, eventArg.Y);
+        eventRaised = true;
+      });
+
+      m_module.OnPointResult3(new Point { X = 12, Y = 14 });
+      Assert.IsTrue(eventRaised);
+    }
+
+    [TestMethod]
+    public void TestEvent_StaticEventProperty()
+    {
+      bool eventRaised = false;
+      m_moduleBuilder.SetEventHandler("onPointResult4", (Point eventArg) =>
+      {
+        Assert.AreEqual(32, eventArg.X);
+        Assert.AreEqual(42, eventArg.Y);
+        eventRaised = true;
+      });
+
+      SimpleNativeModule.OnPointResult4(new Point { X = 32, Y = 42 });
+      Assert.IsTrue(eventRaised);
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Package.appxmanifest b/vnext/Microsoft.ReactNative.Managed.UnitTests/Package.appxmanifest
new file mode 100644
index 00000000000..1458ba80cc9
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Package.appxmanifest
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  IgnorableNamespaces="uap mp">
+
+  <Identity Name="275f6fce-b23e-420f-a82a-1c30fb308a0f"
+            Publisher="CN=vmorozov"
+            Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="275f6fce-b23e-420f-a82a-1c30fb308a0f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>Microsoft.ReactNative.Managed.UnitTests</DisplayName>
+    <PublisherDisplayName>vmorozov</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="vstest.executionengine.universal.App"
+        Executable="$targetnametoken$.exe"
+        EntryPoint="Microsoft.ReactNative.Managed.UnitTests.App">
+      <uap:VisualElements
+        DisplayName="Microsoft.ReactNative.Managed.UnitTests"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png"
+        Description="Microsoft.ReactNative.Managed.UnitTests"
+        BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClientServer" />
+    <Capability Name="privateNetworkClientServer" />
+  </Capabilities>
+</Package>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Properties/AssemblyInfo.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..bf9f2fd0347
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,18 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Microsoft.ReactNative.Managed.UnitTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Microsoft.ReactNative.Managed.UnitTests")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyMetadata("TargetPlatform","UAP")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Properties/Default.rd.xml b/vnext/Microsoft.ReactNative.Managed.UnitTests/Properties/Default.rd.xml
new file mode 100644
index 00000000000..996a8392ada
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Properties/Default.rd.xml
@@ -0,0 +1,29 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+    <!-- Add your application specific runtime directives here. -->
+
+
+  </Application>
+</Directives>
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/ReactModuleBuilderMock.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/ReactModuleBuilderMock.cs
new file mode 100644
index 00000000000..0c4e2a2f104
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/ReactModuleBuilderMock.cs
@@ -0,0 +1,206 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.ReactNative.Managed.UnitTests
+{
+  class ReactModuleBuilderMock : IReactModuleBuilder
+  {
+    private string m_eventEmitterName;
+    private Dictionary<string, Tuple<MethodReturnType, MethodDelegate>> m_methods =
+        new Dictionary<string, Tuple<MethodReturnType, MethodDelegate>>();
+    private Dictionary<string, SyncMethodDelegate> m_syncMethods =
+        new Dictionary<string, SyncMethodDelegate>();
+    private List<ConstantProvider> m_constProviders = new List<ConstantProvider>();
+    private Dictionary<string, Action<IJSValueReader>> m_eventHandlers =
+        new Dictionary<string, Action<IJSValueReader>>();
+
+    public bool IsResolveCallbackCalled { get; private set; }
+    public bool IsRejectCallbackCalled { get; private set; }
+
+    public void SetEventEmitterName(string name)
+    {
+      m_eventEmitterName = name;
+    }
+
+    public void AddMethod(string name, MethodReturnType returnType, MethodDelegate method)
+    {
+      m_methods.Add(name, Tuple.Create(returnType, method));
+    }
+
+    public void AddSyncMethod(string name, SyncMethodDelegate method)
+    {
+      m_syncMethods.Add(name, method);
+    }
+
+    public void AddConstantProvider(ConstantProvider constantProvider)
+    {
+      m_constProviders.Add(constantProvider);
+    }
+
+    public void AddEventHandlerSetter(string name, ReactEventHandlerSetter eventHandlerSetter)
+    {
+      eventHandlerSetter((ReactArgWriter argWriter) =>
+      {
+        if (m_eventHandlers.TryGetValue(name, out var eventHandler))
+        {
+          var writer = new JSValueTreeWriter();
+          writer.WriteArrayBegin();
+          argWriter(writer);
+          writer.WriteArrayEnd();
+
+          eventHandler(new JSValueTreeReader(writer.TakeValue()));
+        }
+      });
+    }
+
+    public void Call0(string methodName) =>
+        GetMethod0(methodName)?.Invoke(ArgReader(), ArgWriter(), null, null);
+
+    public void Call0<T1>(string methodName, T1 arg1) =>
+        GetMethod0(methodName)?.Invoke(ArgReader(arg1), ArgWriter(), null, null);
+
+    public void Call0<T1, T2>(string methodName, T1 arg1, T2 arg2) =>
+        GetMethod0(methodName)?.Invoke(ArgReader(arg1, arg2), ArgWriter(), null, null);
+
+    public void Call0<T1, T2, T3>(string methodName, T1 arg1, T2 arg2, T3 arg3) =>
+        GetMethod0(methodName)?.Invoke(ArgReader(arg1, arg2, arg3), ArgWriter(), null, null);
+
+    public void Call1<TResult>(string methodName, Action<TResult> resolve) =>
+        GetMethod1(methodName)?.Invoke(ArgReader(), ArgWriter(), ResolveCallback(resolve), null);
+
+    public void Call1<T1, TResult>(string methodName, T1 arg1, Action<TResult> resolve) =>
+        GetMethod1(methodName)?.Invoke(ArgReader(arg1), ArgWriter(), ResolveCallback(resolve), null);
+
+    public void Call1<T1, T2, TResult>(string methodName, T1 arg1, T2 arg2, Action<TResult> resolve) =>
+        GetMethod1(methodName)?.Invoke(ArgReader(arg1, arg2), ArgWriter(), ResolveCallback(resolve), null);
+
+    public void Call1<T1, T2, T3, TResult>(string methodName, T1 arg1, T2 arg2, T3 arg3, Action<TResult> resolve) =>
+        GetMethod1(methodName)?.Invoke(ArgReader(arg1, arg2, arg3), ArgWriter(), ResolveCallback(resolve), null);
+
+    public void Call2<TResult, TError>(string methodName, Action<TResult> resolve, Action<TError> reject) =>
+        GetMethod2(methodName)?.Invoke(ArgReader(), ArgWriter(),
+            ResolveCallback(resolve), RejectCallback(reject));
+
+    public void Call2<T1, TResult, TError>(string methodName, T1 arg1,
+        Action<TResult> resolve, Action<TError> reject) =>
+        GetMethod2(methodName)?.Invoke(ArgReader(arg1), ArgWriter(),
+            ResolveCallback(resolve), RejectCallback(reject));
+
+    public void Call2<T1, T2, TResult, TError>(string methodName, T1 arg1, T2 arg2,
+        Action<TResult> resolve, Action<TError> reject) =>
+        GetMethod2(methodName)?.Invoke(ArgReader(arg1, arg2), ArgWriter(),
+            ResolveCallback(resolve), RejectCallback(reject));
+
+    public void Call2<T1, T2, T3, TResult, TError>(string methodName, T1 arg1, T2 arg2, T3 arg3,
+        Action<TResult> resolve, Action<TError> reject) =>
+        GetMethod2(methodName)?.Invoke(ArgReader(arg1, arg2, arg3), ArgWriter(),
+            ResolveCallback(resolve), RejectCallback(reject));
+
+    public void CallSync<TResult>(string methodName, out TResult result)
+    {
+      var writer = ArgWriter();
+      GetSyncMethod(methodName)?.Invoke(ArgReader(), writer);
+      result = GetResult<TResult>(writer);
+    }
+
+    public void CallSync<T1, TResult>(string methodName, T1 arg1, out TResult result)
+    {
+      var writer = ArgWriter();
+      GetSyncMethod(methodName)?.Invoke(ArgReader(arg1), writer);
+      result = GetResult<TResult>(writer);
+    }
+
+    public void CallSync<T1, T2, TResult>(string methodName, T1 arg1, T2 arg2, out TResult result)
+    {
+      var writer = ArgWriter();
+      GetSyncMethod(methodName)?.Invoke(ArgReader(arg1, arg2), writer);
+      result = GetResult<TResult>(writer);
+    }
+
+    public void CallSync<T1, T2, T3, TResult>(string methodName, T1 arg1, T2 arg2, T3 arg3, out TResult result)
+    {
+      var writer = ArgWriter();
+      GetSyncMethod(methodName)?.Invoke(ArgReader(arg1, arg2, arg3), writer);
+      result = GetResult<TResult>(writer);
+    }
+
+    private MethodDelegate GetMethod0(string methodName) =>
+        (m_methods.TryGetValue(methodName, out var tuple) && tuple.Item1 == MethodReturnType.Void) ? tuple.Item2 : null;
+
+    private MethodDelegate GetMethod1(string methodName) =>
+        (m_methods.TryGetValue(methodName, out var tuple) && tuple.Item1 == MethodReturnType.Callback) ? tuple.Item2 : null;
+
+    private MethodDelegate GetMethod2(string methodName) =>
+        (m_methods.TryGetValue(methodName, out var tuple)
+        && (tuple.Item1 == MethodReturnType.TwoCallbacks) || tuple.Item1 == MethodReturnType.Promise) ? tuple.Item2 : null;
+
+    private SyncMethodDelegate GetSyncMethod(string methodName) =>
+        m_syncMethods.TryGetValue(methodName, out var syncMethod) ? syncMethod : null;
+
+    private MethodResultCallback ResolveCallback<T>(Action<T> resolve)
+    {
+      return (IJSValueWriter writer) =>
+      {
+        resolve(GetResult<T>(writer));
+        IsResolveCallbackCalled = true;
+      };
+    }
+
+    private MethodResultCallback RejectCallback<T>(Action<T> reject)
+    {
+      return (IJSValueWriter writer) =>
+      {
+        reject(GetResult<T>(writer));
+        IsRejectCallbackCalled = true;
+      };
+    }
+
+    private static T GetResult<T>(IJSValueWriter writer)
+    {
+      var resulReader = new JSValueTreeReader((writer as JSValueTreeWriter).TakeValue());
+      resulReader.ReadArgs(out T result);
+      return result;
+    }
+
+    private static IJSValueWriter ArgWriter() => new JSValueTreeWriter();
+
+    private static IJSValueReader ArgReader() => CreateArgReader(w => w.WriteArgs());
+
+    private static IJSValueReader ArgReader<T1>(T1 arg1) => CreateArgReader(w => w.WriteArgs(arg1));
+
+    private static IJSValueReader ArgReader<T1, T2>(T1 arg1, T2 arg2) =>
+        CreateArgReader(w => w.WriteArgs(arg1, arg2));
+
+    private static IJSValueReader ArgReader<T1, T2, T3>(T1 arg1, T2 arg2, T3 arg3) =>
+        CreateArgReader(w => w.WriteArgs(arg1, arg2, arg3));
+
+    private static IJSValueReader CreateArgReader(Func<IJSValueWriter, IJSValueWriter> argWriter) =>
+        new JSValueTreeReader((argWriter(new JSValueTreeWriter()) as JSValueTreeWriter).TakeValue());
+
+    public IReadOnlyDictionary<string, JSValue> GetConstants()
+    {
+      var constantWriter = new JSValueTreeWriter();
+      constantWriter.WriteObjectBegin();
+      foreach (var constantProvider in m_constProviders)
+      {
+        constantProvider(constantWriter);
+      }
+
+      constantWriter.WriteObjectEnd();
+      return constantWriter.TakeValue().Object;
+    }
+
+    public void SetEventHandler<T>(string eventName, Action<T> eventHandler)
+    {
+      m_eventHandlers.Add(eventName, (IJSValueReader reader) =>
+      {
+        reader.ReadArgs(out T arg);
+        eventHandler(arg);
+      });
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/UnitTestApp.xaml b/vnext/Microsoft.ReactNative.Managed.UnitTests/UnitTestApp.xaml
new file mode 100644
index 00000000000..1a025700b44
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/UnitTestApp.xaml
@@ -0,0 +1,9 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved.
+     Licensed under the MIT License. -->
+<Application
+    x:Class="Microsoft.ReactNative.Managed.UnitTests.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.ReactNative.Managed.UnitTests">
+
+</Application>
diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/UnitTestApp.xaml.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/UnitTestApp.xaml.cs
new file mode 100644
index 00000000000..bc50962d4b4
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/UnitTestApp.xaml.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace Microsoft.ReactNative.Managed.UnitTests
+{
+  /// <summary>
+  /// Provides application-specific behavior to supplement the default Application class.
+  /// </summary>
+  sealed partial class App : Application
+  {
+    /// <summary>
+    /// Initializes the singleton application object.  This is the first line of authored code
+    /// executed, and as such is the logical equivalent of main() or WinMain().
+    /// </summary>
+    public App()
+    {
+      this.InitializeComponent();
+      this.Suspending += OnSuspending;
+    }
+
+    /// <summary>
+    /// Invoked when the application is launched normally by the end user.  Other entry points
+    /// will be used such as when the application is launched to open a specific file.
+    /// </summary>
+    /// <param name="e">Details about the launch request and process.</param>
+    protected override void OnLaunched(LaunchActivatedEventArgs e)
+    {
+
+#if DEBUG
+      if (System.Diagnostics.Debugger.IsAttached)
+      {
+        this.DebugSettings.EnableFrameRateCounter = true;
+      }
+#endif
+
+      Frame rootFrame = Window.Current.Content as Frame;
+
+      // Do not repeat app initialization when the Window already has content,
+      // just ensure that the window is active
+      if (rootFrame == null)
+      {
+        // Create a Frame to act as the navigation context and navigate to the first page
+        rootFrame = new Frame();
+
+        rootFrame.NavigationFailed += OnNavigationFailed;
+
+        if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
+        {
+          //TODO: Load state from previously suspended application
+        }
+
+        // Place the frame in the current Window
+        Window.Current.Content = rootFrame;
+      }
+
+      Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();
+
+      // Ensure the current window is active
+      Window.Current.Activate();
+
+      Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments);
+    }
+
+    /// <summary>
+    /// Invoked when Navigation to a certain page fails
+    /// </summary>
+    /// <param name="sender">The Frame which failed navigation</param>
+    /// <param name="e">Details about the navigation failure</param>
+    void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+    {
+      throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+    }
+
+    /// <summary>
+    /// Invoked when application execution is being suspended.  Application state is saved
+    /// without knowing whether the application will be terminated or resumed with the contents
+    /// of memory still intact.
+    /// </summary>
+    /// <param name="sender">The source of the suspend request.</param>
+    /// <param name="e">Details about the suspend request.</param>
+    private void OnSuspending(object sender, SuspendingEventArgs e)
+    {
+      var deferral = e.SuspendingOperation.GetDeferral();
+      //TODO: Save application state and stop any background activity
+      deferral.Complete();
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/AttributedViewManager.cs b/vnext/Microsoft.ReactNative.SharedManaged/AttributedViewManager.cs
index e2e9bddfb83..8061f39ab05 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/AttributedViewManager.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/AttributedViewManager.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.ReactNative.Bridge;
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
@@ -8,8 +9,6 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
 
-using Microsoft.ReactNative.Bridge;
-
 namespace Microsoft.ReactNative.Managed
 {
   internal abstract class AttributedViewManager<TFrameworkElement> :
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/IJSValueTreeReader.cs b/vnext/Microsoft.ReactNative.SharedManaged/IJSValueTreeReader.cs
new file mode 100644
index 00000000000..9757e83b155
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/IJSValueTreeReader.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Microsoft.ReactNative.Managed
+{
+  interface IJSValueTreeReader
+  {
+    JSValue Current { get; }
+
+    JSValue Root { get; }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/IReactPromise.cs b/vnext/Microsoft.ReactNative.SharedManaged/IReactPromise.cs
new file mode 100644
index 00000000000..ee66325b879
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/IReactPromise.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// The code is adopted from Facebook's ReactNative implementation for Java.
+// It is changed to be more C#-like, but we kept some original comments.
+// Below is the original Facebook's copyright notice:
+//
+//
+// Copyright (c) Facebook, Inc. and its affiliates.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.ReactNative.Managed
+{
+  // Interface that represents a JavaScript Promise which can be passed to the native module as a
+  // method parameter.
+  //
+  // Methods annotated with ReactMethodAttribute that use a IReactPromise as the last parameter
+  // will be marked as "promise" and will return a promise when invoked from JavaScript.
+  interface IReactPromise<T>
+  {
+    // Successfully resolve the IReactPromise with an optional value.
+    void Resolve(T value);
+
+    // Report an Error.
+    void Reject(ReactError error);
+  }
+
+  class ReactError
+  {
+    public string Code = null;
+    public string Message = null;
+    public Exception Exception = null;
+    public IReadOnlyDictionary<string, JSValue> UserInfo = null;
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValue.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValue.cs
new file mode 100644
index 00000000000..1e0214cd24a
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValue.cs
@@ -0,0 +1,317 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.ReactNative.Managed
+{
+  // JSValue represents an immutable JavaScript value passed as a parameter.
+  // It is created to simplify working with IJSValueReader.
+  //
+  // JSValue is designed to minimize number of memory allocations:
+  // - It is a struct that avoid extra memory allocations when it is stored in a container.
+  // - It avoids boxing simple values by using a union type to store them.
+  // The JSValue is an immutable and is safe to be used from multiple threads.
+  // It does not implement GetHashCode() and must not be used as a key in a dictionary.
+  struct JSValue : IEquatable<JSValue>
+  {
+    public static readonly JSValue Null = new JSValue();
+
+    private readonly SimpleValue m_simpleValue;
+    private readonly object m_objValue;
+
+    public JSValue(IReadOnlyDictionary<string, JSValue> value)
+    {
+      Type = JSValueType.Object;
+      m_simpleValue = new SimpleValue();
+      m_objValue = value;
+    }
+
+    public JSValue(IReadOnlyList<JSValue> value)
+    {
+      Type = JSValueType.Array;
+      m_simpleValue = new SimpleValue();
+      m_objValue = value;
+    }
+
+    public JSValue(string value)
+    {
+      Type = JSValueType.String;
+      m_simpleValue = new SimpleValue();
+      m_objValue = value;
+    }
+
+    public JSValue(bool value)
+    {
+      Type = JSValueType.Boolean;
+      m_simpleValue = new SimpleValue { BooleanValue = value };
+      m_objValue = null;
+    }
+
+    public JSValue(long value)
+    {
+      Type = JSValueType.Int64;
+      m_simpleValue = new SimpleValue { Int64Value = value };
+      m_objValue = null;
+    }
+
+    public JSValue(double value)
+    {
+      Type = JSValueType.Double;
+      m_simpleValue = new SimpleValue { DoubleValue = value };
+      m_objValue = null;
+    }
+
+    public JSValueType Type { get; }
+
+    public bool IsNull => Type == JSValueType.Null;
+
+    public IReadOnlyDictionary<string, JSValue> Object => (IReadOnlyDictionary<string, JSValue>)m_objValue;
+    public IReadOnlyList<JSValue> Array => (IReadOnlyList<JSValue>)m_objValue;
+    public string String => (string)m_objValue;
+    public bool Boolean => m_simpleValue.BooleanValue;
+    public long Int64 => m_simpleValue.Int64Value;
+    public double Double => m_simpleValue.DoubleValue;
+
+    public T To<T>() => (new JSValueTreeReader(this)).ReadValue<T>();
+
+    public JSValue From<T>(T value)
+    {
+      var writer = new JSValueTreeWriter();
+      writer.WriteValue(value);
+      return writer.TakeValue();
+    }
+
+    public bool TryGetObjectProperty(string propertyName, out JSValue value)
+    {
+      if (Type == JSValueType.Object && Object.TryGetValue(propertyName, out value))
+      {
+        return true;
+      }
+
+      value = Null;
+      return false;
+    }
+
+    public static bool operator ==(in JSValue lhs, in JSValue rhs)
+    {
+      return lhs.ValueEquals(rhs);
+    }
+
+    public static bool operator !=(in JSValue lhs, in JSValue rhs)
+    {
+      return !lhs.ValueEquals(rhs);
+    }
+
+    public bool Equals(JSValue other)
+    {
+      return ValueEquals(other);
+    }
+
+    private bool ValueEquals(in JSValue other)
+    {
+      if (Type == other.Type)
+      {
+        switch (Type)
+        {
+          case JSValueType.Null: return true;
+          case JSValueType.Object: return ObjectEquals(other.Object);
+          case JSValueType.Array: return ArrayEquals(other.Array);
+          case JSValueType.String: return String == other.String;
+          case JSValueType.Boolean: return Boolean == other.Boolean;
+          case JSValueType.Int64: return Int64 == other.Int64;
+          case JSValueType.Double: return Double == other.Double;
+          default: return false;
+        }
+      }
+
+      return false;
+    }
+
+    private bool ObjectEquals(IReadOnlyDictionary<string, JSValue> other)
+    {
+      var obj = Object;
+      if (obj.Count != other.Count)
+      {
+        return false;
+      }
+
+      foreach (var entry in obj)
+      {
+        if (!other.TryGetValue(entry.Key, out var value) || !value.ValueEquals(entry.Value))
+        {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    private bool ArrayEquals(IReadOnlyList<JSValue> other)
+    {
+      var arr = Array;
+      if (arr.Count != other.Count)
+      {
+        return false;
+      }
+
+      for (int i = 0; i < arr.Count; ++i)
+      {
+        if (!arr[i].ValueEquals(other[i]))
+        {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    public override bool Equals(object obj)
+    {
+      return (obj is JSValue) && Equals((JSValue)obj);
+    }
+
+    public override int GetHashCode()
+    {
+      throw new NotImplementedException("JSValue currently does not support hash codes");
+    }
+
+    public static JSValue ReadFrom(IJSValueReader reader)
+    {
+      var treeReader = reader as IJSValueTreeReader;
+      if (treeReader != null)
+      {
+        return treeReader.Current;
+      }
+
+      return ReadValue(reader);
+    }
+
+    public static Dictionary<string, JSValue> ReadObjectPropertiesFrom(IJSValueReader reader)
+    {
+      if (reader.ValueType == JSValueType.Object)
+      {
+        var treeReader = reader as IJSValueTreeReader;
+        if (treeReader != null)
+        {
+          return new Dictionary<string, JSValue>(treeReader.Current.Object as IDictionary<string, JSValue>);
+        }
+
+        return ReadObjectProperties(reader);
+      }
+
+      return new Dictionary<string, JSValue>();
+    }
+
+    public static List<JSValue> ReadArrayItemsFrom(IJSValueReader reader)
+    {
+      if (reader.ValueType == JSValueType.Array)
+      {
+        var treeReader = reader as IJSValueTreeReader;
+        if (treeReader != null)
+        {
+          return new List<JSValue>(treeReader.Current.Array as IList<JSValue>);
+        }
+
+        return ReadArrayItems(reader);
+      }
+
+      return new List<JSValue>();
+    }
+
+    private static JSValue ReadValue(IJSValueReader reader)
+    {
+      switch (reader.ValueType)
+      {
+        case JSValueType.Null: return Null;
+        case JSValueType.Object: return ReadObject(reader);
+        case JSValueType.Array: return ReadArray(reader);
+        case JSValueType.String: return new JSValue(reader.GetString());
+        case JSValueType.Boolean: return new JSValue(reader.GetBoolean());
+        case JSValueType.Int64: return new JSValue(reader.GetInt64());
+        case JSValueType.Double: return new JSValue(reader.GetDouble());
+        default: throw new ReactException("Unexpected JSValueType");
+      }
+    }
+
+    private static JSValue ReadObject(IJSValueReader reader)
+    {
+      return new JSValue(new ReadOnlyDictionary<string, JSValue>(ReadObjectProperties(reader)));
+    }
+
+    private static JSValue ReadArray(IJSValueReader reader)
+    {
+      return new JSValue(new ReadOnlyCollection<JSValue>(ReadArrayItems(reader)));
+    }
+
+    private static Dictionary<string, JSValue> ReadObjectProperties(IJSValueReader reader)
+    {
+      var properties = new Dictionary<string, JSValue>();
+      while (reader.GetNextObjectProperty(out string propertyName))
+      {
+        properties.Add(propertyName, ReadValue(reader));
+      }
+
+      return properties;
+    }
+
+    private static List<JSValue> ReadArrayItems(IJSValueReader reader)
+    {
+      var items = new List<JSValue>();
+      while (reader.GetNextArrayItem())
+      {
+        items.Add(ReadValue(reader));
+      }
+
+      return items;
+    }
+
+    public void WriteTo(IJSValueWriter writer)
+    {
+      switch (Type)
+      {
+        case JSValueType.Null: writer.WriteNull(); break;
+        case JSValueType.Object: WriteObject(writer, Object); break;
+        case JSValueType.Array: WriteArray(writer, Array); break;
+        case JSValueType.String: writer.WriteString(String); break;
+        case JSValueType.Boolean: writer.WriteBoolean(Boolean); break;
+        case JSValueType.Int64: writer.WriteInt64(Int64); break;
+        case JSValueType.Double: writer.WriteDouble(Double); break;
+      }
+    }
+
+    public static void WriteObject(IJSValueWriter writer, IEnumerable<KeyValuePair<string, JSValue>> value)
+    {
+      writer.WriteObjectBegin();
+      foreach (var keyValue in value)
+      {
+        writer.WritePropertyName(keyValue.Key);
+        keyValue.Value.WriteTo(writer);
+      }
+      writer.WriteObjectEnd();
+    }
+
+    public static void WriteArray(IJSValueWriter writer, IEnumerable<JSValue> value)
+    {
+      writer.WriteArrayBegin();
+      foreach (var item in value)
+      {
+        item.WriteTo(writer);
+      }
+      writer.WriteArrayEnd();
+    }
+
+    // This is a 'union' type that may store in the same location bool, long, or double.
+    [StructLayout(LayoutKind.Explicit)]
+    private struct SimpleValue
+    {
+      [FieldOffset(0)] public bool BooleanValue;
+      [FieldOffset(0)] public long Int64Value;
+      [FieldOffset(0)] public double DoubleValue;
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValueGenerator.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValueGenerator.cs
new file mode 100644
index 00000000000..505338dc767
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValueGenerator.cs
@@ -0,0 +1,487 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using static System.Linq.Expressions.Expression;
+
+namespace Microsoft.ReactNative.Managed
+{
+  static class JSValueGenerator
+  {
+    // Compare two types by putting more specific types before more generic.
+    // While we use it to compare types with the same generic type base,
+    // we do more thorough comparison because the same method is called
+    // recursively for the generic type arguments.
+    public class GenericTypeComparer : IComparer<Type>
+    {
+      public static readonly GenericTypeComparer Default = new GenericTypeComparer();
+
+      public int Compare(Type x, Type y)
+      {
+        var xTypeInfo = x.GetTypeInfo();
+        var yTypeInfo = y.GetTypeInfo();
+
+        // Generic parameters are less specific and must appear after other types. E.g. string before T.
+        int result = Comparer<bool>.Default.Compare(x.IsGenericParameter, y.IsGenericParameter);
+        if (result != 0) return result;
+
+        // Compare generic parameters. E.g. T vs U. We use default type order.
+        if (x.IsGenericParameter) return Comparer<Type>.Default.Compare(x, y);
+
+        // We consider arrays to be more specific than non-arrays.
+        // Note the minus '-' sign to reverse order.
+        result = -Comparer<bool>.Default.Compare(x.IsArray, y.IsArray);
+        if (result != 0) return result;
+
+        // Compare arrays by their element types.
+        if (x.IsArray) return Compare(x.GetElementType(), y.GetElementType());
+
+        // Generic types are more specific and must appear before non-generic types.
+        // E.g. IDictionary<T, U> before IDictionary. Note the minus '-' sign to reverse order.
+        result = -Comparer<bool>.Default.Compare(xTypeInfo.IsGenericType, yTypeInfo.IsGenericType);
+        if (result != 0) return result;
+
+        // Compare non-generic types. E.g string vs int. We use default type order.
+        if (!xTypeInfo.IsGenericType) return Comparer<Type>.Default.Compare(x, y);
+
+        // We consider types with more generic parameters to be more specific than types with less generic parameters.
+        // E.g. we want to match IDictionary<string, T> before IList<KeyValuePair<string, T>>.
+        var xArgs = x.GetGenericArguments();
+        var yArgs = y.GetGenericArguments();
+        // Note minus sign '-' to order integers in reverse order. E.g. 7 before 5.
+        result = -Comparer<int>.Default.Compare(xArgs.Length, yArgs.Length);
+        if (result != 0) return result;
+
+        // If number of generic arguments is the same, then we use the order generic type definitions.
+        // E.g. List<> vs IList<>.
+        result = Comparer<Type>.Default.Compare(xTypeInfo.GetGenericTypeDefinition(), yTypeInfo.GetGenericTypeDefinition());
+        if (result != 0) return result;
+
+        // We have the same generic type definitions. Recursively compare their generic arguments.
+        for (int i = 0; i < xArgs.Length; ++i)
+        {
+          result = Compare(xArgs[i], yArgs[i]);
+          if (result != 0) return result;
+        }
+
+        return 0;
+      }
+    }
+
+    // Try to match type to pattern with patternArgs.
+    // If successful return matchedArgs where each generic parameter T from patternArgs has a real type.
+    public static bool TryMatchGenericType(Type type, Type pattern, Type[] patternArgs, out Type[] matchedArgs)
+    {
+      matchedArgs = null;
+      var genericBindings = new Dictionary<Type, Type>(patternArgs.Length);
+
+      // This local function is going to be called recursively for generic type arguments.
+      bool MatchType(Type testType, Type patternType)
+      {
+        if (testType == patternType) return true;
+
+        // Match array types
+        if (testType.IsArray != patternType.IsArray) return false;
+        if (testType.IsArray && patternType.IsArray)
+        {
+          return MatchType(testType.GetElementType(), patternType.GetElementType());
+        }
+
+        // Match testType to generic parameter type such as T.
+        if (patternType.IsGenericParameter)
+        {
+          if (genericBindings.TryGetValue(patternType, out var existingBinding))
+          {
+            return testType == existingBinding;
+          }
+          else
+          {
+            genericBindings.Add(patternType, testType);
+            return true;
+          }
+        }
+
+        // Match generic types
+        var testTypeInfo = testType.GetTypeInfo();
+        var patternTypeInfo = patternType.GetTypeInfo();
+        if (testTypeInfo.IsGenericType && patternTypeInfo.IsGenericType)
+        {
+          Type[] testGenericArgs = testType.GetGenericArguments();
+          Type[] patternGenericArgs = pattern.GetGenericArguments();
+          if (testGenericArgs.Length == patternGenericArgs.Length)
+          {
+            for (int i = 0; i < testGenericArgs.Length; ++i)
+            {
+              if (!MatchType(testGenericArgs[i], patternGenericArgs[i]))
+              {
+                return false;
+              }
+            }
+
+            return true;
+          }
+        }
+
+        return false;
+      }
+
+      if (!MatchType(type, pattern)) return false;
+
+      if (patternArgs.Length != genericBindings.Count) return false;
+
+      // Check generic constraints
+      foreach (var genericArg in patternArgs)
+      {
+        // base class and interface constraints
+        var baseTypeConstraints = genericArg.GetTypeInfo().GetGenericParameterConstraints();
+        if (baseTypeConstraints.Length > 0)
+        {
+          var boundType = genericBindings[genericArg];
+          foreach (var baseType in baseTypeConstraints)
+          {
+            // TODO: what if baseType is based on a generic parameter? E.g. 'where T : U'
+            if (!boundType.GetTypeInfo().IsSubclassOf(baseType))
+            {
+              return false;
+            }
+          }
+        }
+
+        // TODO: Consider to add checks for generic parameter attributes: t.GenericParameterAttributes
+      }
+
+      matchedArgs = new Type[patternArgs.Length];
+      for (int i = 0; i < matchedArgs.Length; ++i)
+      {
+        matchedArgs[i] = genericBindings[patternArgs[i]];
+      }
+
+      return true;
+    }
+
+    public class VariableWrapper
+    {
+      public static VariableWrapper CreateVariable(Type type, Expression init)
+      {
+        return new VariableWrapper
+        {
+          Type = type,
+          AsExpression = Expression.Variable(type),
+          Init = init,
+          IsParameter = false
+        };
+      }
+
+      public static VariableWrapper CreateVariable(Type type)
+      {
+        return new VariableWrapper
+        {
+          Type = type,
+          AsExpression = Expression.Variable(type),
+          Init = null,
+          IsParameter = false
+        };
+      }
+
+      public static VariableWrapper CreateParameter(Type type)
+      {
+        return new VariableWrapper
+        {
+          Type = type,
+          AsExpression = Expression.Parameter(type),
+          IsParameter = true
+        };
+      }
+
+      public bool IsParameter { get; private set; }
+
+      public Expression Init { get; private set; }
+
+      public Type Type { get; private set; }
+
+      public ParameterExpression AsExpression { get; private set; }
+
+      public static implicit operator ParameterExpression(VariableWrapper v) => v.AsExpression;
+
+      public Expression Assign(Expression value)
+      {
+        return Expression.Assign(AsExpression, value);
+      }
+
+      public Expression Call(MethodInfo method, params Expression[] args)
+      {
+        return Expression.Call(AsExpression, method, args);
+      }
+
+      public Expression Call(string methodName, params Expression[] args)
+      {
+        return Call(Type.GetMethod(methodName), args);
+      }
+
+      public Expression CallExt(MethodInfo method)
+      {
+        return Expression.Call(method, AsExpression);
+      }
+
+      public Expression CallExt(MethodInfo method, Expression arg0)
+      {
+        return Expression.Call(method, AsExpression, arg0);
+      }
+
+      public Expression CallExt(MethodInfo method, Expression arg0, Expression arg1)
+      {
+        return Expression.Call(method, AsExpression, arg0, arg1);
+      }
+
+      public Expression CallExt(MethodInfo method, params Expression[] args)
+      {
+        return Expression.Call(method, Enumerable.Repeat(AsExpression, 1).Concat(args));
+      }
+
+      public Expression CallExt(MethodInfo method, params VariableWrapper[] args)
+      {
+        return Expression.Call(method,
+          Enumerable.Repeat(this, 1).Concat(args).Select(v => v.AsExpression));
+      }
+
+      // It can be used only for delegate types
+      public Expression Invoke(params Expression[] args)
+      {
+        return Expression.Invoke(AsExpression, args);
+      }
+
+      public Expression Property(string propertyName)
+      {
+        return PropertyOrField(AsExpression, propertyName);
+      }
+
+      public Expression Property(PropertyInfo propertyInfo)
+      {
+        return Expression.Property(propertyInfo.GetGetMethod().IsStatic ? null : AsExpression, propertyInfo);
+      }
+
+      public Expression SetProperty(string propertyName, Expression value)
+      {
+        return Expression.Assign(Property(propertyName), value);
+      }
+
+      public Expression SetPropertyStatement(string propertyName, Expression value)
+      {
+        return Block(SetProperty(propertyName, value), Default(typeof(void)));
+      }
+
+      public Expression SetProperty(PropertyInfo propertyInfo, Expression value)
+      {
+        return Expression.Assign(Property(propertyInfo), value);
+      }
+
+      public Expression CastTo(Type type)
+      {
+        return Convert(AsExpression, type);
+      }
+    }
+
+    public class TypeWrapper
+    {
+      public TypeWrapper(Type type)
+      {
+        Type = type;
+      }
+
+      public Type Type { get; private set; }
+
+      public Delegate CompileLambda(params object[] expressions)
+      {
+        return AutoLambda(Type, expressions).Compile();
+      }
+
+      public static implicit operator Type(TypeWrapper wrapper) => wrapper.Type;
+    }
+
+    public static VariableWrapper Variable(Type type, out VariableWrapper variable, Expression init = null)
+    {
+      return variable = VariableWrapper.CreateVariable(type, init);
+    }
+
+    public static VariableWrapper Parameter(Type type, out VariableWrapper parameter)
+    {
+      return parameter = VariableWrapper.CreateParameter(type);
+    }
+
+    public static BlockExpression AutoBlock(params object[] expressions)
+    {
+      ParseExpressions(expressions, out var body, out _, out var variables);
+      return Block(variables, body);
+    }
+
+    public static LambdaExpression AutoLambda(Type delegateType, params object[] expressions)
+    {
+      ParseExpressions(expressions, out var body, out var parameters, out var variables);
+
+      var lambdaBody = (body.Length == 1 && variables.Length == 0)
+        ? body[0]
+        : Block(variables, body);
+
+      return Lambda(delegateType, lambdaBody, parameters);
+    }
+
+    public static LambdaExpression AutoLambda<TDelegate>(params object[] expressions)
+    {
+      return AutoLambda(typeof(TDelegate), expressions);
+    }
+
+    private static void ParseExpressions(object[] expressions,
+      out Expression[] body, out ParameterExpression[] parameters, out ParameterExpression[] variables)
+    {
+      var bodyList = new List<Expression>();
+      var parameterList = new List<ParameterExpression>();
+      var variableList = new List<ParameterExpression>();
+
+      void ParseArray(object[] exprs)
+      {
+        foreach (var expr in exprs)
+        {
+          switch (expr)
+          {
+            case VariableWrapper parameter when parameter.IsParameter:
+              parameterList.Add(parameter);
+              break;
+            case VariableWrapper variable when !variable.IsParameter:
+              variableList.Add(variable);
+              if (variable.Init != null)
+              {
+                bodyList.Add(variable.Assign(variable.Init));
+              }
+              break;
+            case Expression expression:
+              bodyList.Add(expression);
+              break;
+            case object[] items:
+              ParseArray(items);
+              break;
+          }
+        }
+      }
+
+      ParseArray(expressions);
+      body = bodyList.ToArray();
+      parameters = parameterList.ToArray();
+      variables = variableList.ToArray();
+    }
+
+    public static Expression While(Expression condition, Expression body)
+    {
+      // A label to jump to from a loop.
+      LabelTarget breakLabel = Label(typeof(void));
+
+      // Execute loop while condition is true.
+      return Loop(IfThenElse(condition, body, Break(breakLabel)), breakLabel);
+    }
+
+    public static MethodCallExpression Call(this Expression instance, MethodInfo method, params object[] arguments)
+    {
+      var args = new List<Expression>();
+
+      void ParseArgs(object[] argObjects)
+      {
+        foreach (var arg in argObjects)
+        {
+          switch (arg)
+          {
+            case object[] items: ParseArgs(items); break;
+            case VariableWrapper variable: args.Add(variable.AsExpression); break;
+            case Expression expr: args.Add(expr); break;
+          }
+        }
+      }
+
+      ParseArgs(arguments);
+      return Expression.Call(method.IsStatic ? null : instance, method, args);
+    }
+
+    public static Expression SetField(this Expression instance, FieldInfo fieldInfo, Expression value)
+    {
+      return Assign(Field(fieldInfo.IsStatic ? null : instance, fieldInfo), value);
+    }
+
+    public static Expression SetProperty(this Expression instance, PropertyInfo propertyInfo, Expression value)
+    {
+      return Assign(Property(propertyInfo.GetSetMethod().IsStatic ? null : instance, propertyInfo), value);
+    }
+
+    public static TDelegate CompileLambda<TDelegate>(params object[] expressions) where TDelegate : Delegate
+    {
+      var typeWrapper = new TypeWrapper(typeof(TDelegate));
+      return (TDelegate)typeWrapper.CompileLambda(expressions);
+    }
+
+    public static VariableWrapper[] MethodArgs(
+      ParameterInfo[] parameters,
+      out Type[] argTypes,
+      out VariableWrapper[] args)
+    {
+      argTypes = parameters.Select(p => p.ParameterType).ToArray();
+      args = argTypes.Select(t => Variable(t, out _)).ToArray();
+      return args;
+    }
+
+    public static VariableWrapper[] MethodArgs(
+      ParameterInfo[] parameters,
+      out Type[] argTypes,
+      out VariableWrapper[] args,
+      out Type promiseResultType)
+    {
+      argTypes = parameters.Take(parameters.Length - 1).Select(p => p.ParameterType).ToArray();
+      args = argTypes.Select(t => Variable(t, out _)).ToArray();
+      promiseResultType = parameters[parameters.Length - 1].ParameterType.GetGenericArguments()[0];
+      return args;
+    }
+
+    public static VariableWrapper[] MethodArgs(
+      ParameterInfo[] parameters,
+      out Type[] argTypes,
+      out VariableWrapper[] args,
+      out Type resolveCallbackType,
+      out Type resolveArgType)
+    {
+      argTypes = parameters.Take(parameters.Length - 1).Select(p => p.ParameterType).ToArray();
+      args = argTypes.Select(t => Variable(t, out _)).ToArray();
+      resolveCallbackType = parameters[parameters.Length - 1].ParameterType;
+      resolveArgType = resolveCallbackType.GetMethod("Invoke").GetParameters()[0].ParameterType;
+      return args;
+    }
+
+    public static VariableWrapper[] MethodArgs(
+      ParameterInfo[] parameters,
+      out Type[] argTypes,
+      out VariableWrapper[] args,
+      out Type resolveCallbackType,
+      out Type resolveArgType,
+      out Type rejectCallbackType,
+      out Type rejectArgType)
+    {
+      argTypes = parameters.Take(parameters.Length - 2).Select(p => p.ParameterType).ToArray();
+      args = argTypes.Select(t => Variable(t, out _)).ToArray();
+      resolveCallbackType = parameters[parameters.Length - 2].ParameterType;
+      resolveArgType = resolveCallbackType.GetMethod("Invoke").GetParameters()[0].ParameterType;
+      rejectCallbackType = parameters[parameters.Length - 1].ParameterType;
+      rejectArgType = rejectCallbackType.GetMethod("Invoke").GetParameters()[0].ParameterType;
+      return args;
+    }
+
+    public static TypeWrapper ActionOf(params Type[] argTypes)
+    {
+      switch (argTypes.Length)
+      {
+        case 1: return new TypeWrapper(typeof(Action<>).MakeGenericType(argTypes));
+        default: throw new NotImplementedException($"Not supported argTypes count: {argTypes.Length}");
+      }
+    }
+
+    public static TypeWrapper ActionOf<T1>() => ActionOf(typeof(T1));
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValueReader.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValueReader.cs
index 619d5278983..02c339441ac 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/JSValueReader.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValueReader.cs
@@ -4,116 +4,565 @@
 using Microsoft.ReactNative.Bridge;
 using System;
 using System.Collections.Generic;
-using System.Dynamic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Collections.ObjectModel;
 using System.Threading;
-using ReflectionMethodInfo = System.Reflection.MethodInfo;
 
 namespace Microsoft.ReactNative.Managed
 {
+  delegate void ReadValueDelegate<T>(IJSValueReader reader, out T value);
+
+  // A value can be read from IJSValueReader in one of two ways:
+  // 1. There is a ReadValue extension for IJSValueReader interface that matches the type.
+  // 2. We can auto-generate the read method for the type.
   static class JSValueReader
   {
-    private static Lazy<Dictionary<Type, ReflectionMethodInfo>> s_readValueMethods =
-        new Lazy<Dictionary<Type, ReflectionMethodInfo>>(InitReadValueMethods, LazyThreadSafetyMode.PublicationOnly);
+    private static IReadOnlyDictionary<Type, Delegate> s_readerDelegates = new Dictionary<Type, Delegate>();
 
-    public static ReflectionMethodInfo GetReadValueMethod(Type valueType)
+    public static void ReadValue(this IJSValueReader reader, out string value)
     {
-      ReflectionMethodInfo readValueMethod;
-      if (s_readValueMethods.Value.TryGetValue(valueType.MakeByRefType(), out readValueMethod))
+      switch (reader.ValueType)
       {
-        return readValueMethod;
+        case JSValueType.String: value = reader.GetString(); break;
+        case JSValueType.Boolean: value = reader.GetBoolean() ? "true" : "false"; break;
+        case JSValueType.Int64: value = reader.GetInt64().ToString(); break;
+        case JSValueType.Double: value = reader.GetDouble().ToString(); break;
+        default: value = ""; break;
       }
+    }
 
-      throw new ReactException($"TryReadValue extension method is not found for type {valueType.MakeByRefType().FullName}.");
+    public static void ReadValue(this IJSValueReader reader, out bool value)
+    {
+      switch (reader.ValueType)
+      {
+        case JSValueType.String: value = !string.IsNullOrEmpty(reader.GetString()); break;
+        case JSValueType.Boolean: value = reader.GetBoolean(); break;
+        case JSValueType.Int64: value = reader.GetInt64() != 0; break;
+        case JSValueType.Double: value = reader.GetDouble() != 0; break;
+        default: value = false; break;
+      }
     }
 
-    private static Dictionary<Type, ReflectionMethodInfo> InitReadValueMethods()
+    public static void ReadValue(this IJSValueReader reader, out sbyte value)
     {
-      var query = from type in typeof(JSValueReader).GetTypeInfo().Assembly.GetTypes()
-                  where /*type.IsSealed && !type.IsGenericType && */!type.IsNested
-                  from method in type.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
-                  where method.IsDefined(typeof(ExtensionAttribute), false) && method.Name == "TryReadValue"
-                  let parameters = method.GetParameters()
-                  where parameters.Length == 2 && parameters[0].ParameterType == typeof(IJSValueReader)
-                  select new { valueType = parameters[1].ParameterType, method };
-      return query.ToDictionary(i => i.valueType, i => i.method);
+      reader.ReadValue(out long val);
+      value = (sbyte)val;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out bool value)
+    public static void ReadValue(this IJSValueReader reader, out short value)
     {
-      return reader.TryGetBoolean(out value);
+      reader.ReadValue(out long val);
+      value = (short)val;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out sbyte value)
+    public static void ReadValue(this IJSValueReader reader, out int value)
     {
-      bool result = reader.TryGetInt64(out long int64Value);
-      value = (sbyte)int64Value;
-      return result;
+      reader.ReadValue(out long val);
+      value = (int)val;
     }
-    public static bool TryReadValue(this IJSValueReader reader, out short value)
+
+    public static void ReadValue(this IJSValueReader reader, out long value)
     {
-      bool result = reader.TryGetInt64(out long int64Value);
-      value = (short)int64Value;
-      return result;
+      switch (reader.ValueType)
+      {
+        case JSValueType.String:
+          {
+            if (!long.TryParse(reader.GetString(), out value)) { value = 0; }
+            break;
+          }
+        case JSValueType.Boolean: value = reader.GetBoolean() ? 1 : 0; break;
+        case JSValueType.Int64: value = reader.GetInt64(); break;
+        case JSValueType.Double: value = (long)reader.GetDouble(); break;
+        default: value = 0; break;
+      }
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out int value)
+    public static void ReadValue(this IJSValueReader reader, out byte value)
     {
-      bool result = reader.TryGetInt64(out long int64Value);
-      value = (int)int64Value;
-      return result;
+      reader.ReadValue(out long val);
+      value = (byte)val;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out long value)
+    public static void ReadValue(this IJSValueReader reader, out ushort value)
     {
-      return reader.TryGetInt64(out value);
+      reader.ReadValue(out long val);
+      value = (ushort)val;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out byte value)
+    public static void ReadValue(this IJSValueReader reader, out uint value)
     {
-      bool result = reader.TryGetInt64(out long int64Value);
-      value = (byte)int64Value;
-      return result;
+      reader.ReadValue(out long val);
+      value = (uint)val;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out ushort value)
+    public static void ReadValue(this IJSValueReader reader, out ulong value)
     {
-      bool result = reader.TryGetInt64(out long int64Value);
-      value = (ushort)int64Value;
-      return result;
+      reader.ReadValue(out long val);
+      value = (ulong)val;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out uint value)
+    public static void ReadValue(this IJSValueReader reader, out float value)
     {
-      bool result = reader.TryGetInt64(out long int64Value);
-      value = (uint)int64Value;
-      return result;
+      reader.ReadValue(out double val);
+      value = (float)val;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out ulong value)
+    public static void ReadValue(this IJSValueReader reader, out double value)
     {
-      bool result = reader.TryGetInt64(out long int64Value);
-      value = (ulong)int64Value;
-      return result;
+      switch (reader.ValueType)
+      {
+        case JSValueType.String:
+          {
+            if (!double.TryParse(reader.GetString(), out value)) { value = 0; }
+            break;
+          }
+        case JSValueType.Boolean: value = reader.GetBoolean() ? 1 : 0; break;
+        case JSValueType.Int64: value = reader.GetInt64(); break;
+        case JSValueType.Double: value = reader.GetDouble(); break;
+        default: value = 0; break;
+      }
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out JSValue value)
+    {
+      value = JSValue.ReadFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out Dictionary<string, JSValue> value)
+    {
+      value = JSValue.ReadObjectPropertiesFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IDictionary<string, JSValue> value)
+    {
+      value = JSValue.ReadObjectPropertiesFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out ICollection<KeyValuePair<string, JSValue>> value)
+    {
+      value = JSValue.ReadObjectPropertiesFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IEnumerable<KeyValuePair<string, JSValue>> value)
+    {
+      value = JSValue.ReadObjectPropertiesFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out ReadOnlyDictionary<string, JSValue> value)
+    {
+      value = new ReadOnlyDictionary<string, JSValue>(JSValue.ReadObjectPropertiesFrom(reader));
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IReadOnlyDictionary<string, JSValue> value)
+    {
+      value = new ReadOnlyDictionary<string, JSValue>(JSValue.ReadObjectPropertiesFrom(reader));
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IReadOnlyCollection<KeyValuePair<string, JSValue>> value)
+    {
+      value = new ReadOnlyDictionary<string, JSValue>(JSValue.ReadObjectPropertiesFrom(reader));
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out List<JSValue> value)
+    {
+      value = JSValue.ReadArrayItemsFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IList<JSValue> value)
+    {
+      value = JSValue.ReadArrayItemsFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out ICollection<JSValue> value)
+    {
+      value = JSValue.ReadArrayItemsFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IEnumerable<JSValue> value)
+    {
+      value = JSValue.ReadArrayItemsFrom(reader);
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out ReadOnlyCollection<JSValue> value)
+    {
+      value = new ReadOnlyCollection<JSValue>(JSValue.ReadArrayItemsFrom(reader));
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IReadOnlyList<JSValue> value)
+    {
+      value = new ReadOnlyCollection<JSValue>(JSValue.ReadArrayItemsFrom(reader));
+    }
+
+    public static void ReadValue(this IJSValueReader reader, out IReadOnlyCollection<JSValue> value)
+    {
+      value = new ReadOnlyCollection<JSValue>(JSValue.ReadArrayItemsFrom(reader));
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out T? value) where T : struct
+    {
+      if (reader.ValueType != JSValueType.Null)
+      {
+        value = reader.ReadValue<T>();
+      }
+      else
+      {
+        value = null;
+      }
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out Dictionary<string, T> value)
+    {
+      value = new Dictionary<string, T>();
+      if (reader.ValueType == JSValueType.Object)
+      {
+        while (reader.GetNextObjectProperty(out string propertyName))
+        {
+          value.Add(propertyName, reader.ReadValue<T>());
+        }
+      }
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out IDictionary<string, T> value)
+    {
+      reader.ReadValue(out Dictionary<string, T> dictionary);
+      value = dictionary;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out ICollection<KeyValuePair<string, T>> value)
+    {
+      reader.ReadValue(out Dictionary<string, T> dictionary);
+      value = dictionary;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out IEnumerable<KeyValuePair<string, T>> value)
+    {
+      reader.ReadValue(out Dictionary<string, T> dictionary);
+      value = dictionary;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out ReadOnlyDictionary<string, T> value)
+    {
+      reader.ReadValue(out Dictionary<string, T> dictionary);
+      value = new ReadOnlyDictionary<string, T>(dictionary);
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out IReadOnlyDictionary<string, T> value)
+    {
+      reader.ReadValue(out ReadOnlyDictionary<string, T> dictionary);
+      value = dictionary;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out IReadOnlyCollection<KeyValuePair<string, T>> value)
+    {
+      reader.ReadValue(out ReadOnlyDictionary<string, T> dictionary);
+      value = dictionary;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out List<T> value)
+    {
+      value = new List<T>();
+      if (reader.ValueType == JSValueType.Array)
+      {
+        while (reader.GetNextArrayItem())
+        {
+          value.Add(reader.ReadValue<T>());
+        }
+      }
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out float value)
+    public static void ReadValue<T>(this IJSValueReader reader, out IList<T> value)
     {
-      bool result = reader.TryGetDouble(out double doubleValue);
-      value = (float)doubleValue;
+      ReadValue(reader, out List<T> list);
+      value = list;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out ICollection<T> value)
+    {
+      ReadValue(reader, out List<T> list);
+      value = list;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out IEnumerable<T> value)
+    {
+      ReadValue(reader, out List<T> list);
+      value = list;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out ReadOnlyCollection<T> value)
+    {
+      ReadValue(reader, out List<T> list);
+      value = new ReadOnlyCollection<T>(list);
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out IReadOnlyList<T> value)
+    {
+      ReadValue(reader, out ReadOnlyCollection<T> collection);
+      value = collection;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out IReadOnlyCollection<T> value)
+    {
+      ReadValue(reader, out ReadOnlyCollection<T> collection);
+      value = collection;
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out T[] value)
+    {
+      ReadValue(reader, out List<T> list);
+      value = list.ToArray();
+    }
+
+    public static bool SkipArrayToEnd(this IJSValueReader reader)
+    {
+      while (reader.GetNextArrayItem())
+      {
+        reader.ReadValue<JSValue>(); // Read and ignore the value
+      }
+
+      return true;
+    }
+
+    public static void ReadValue<T1>(this IJSValueReader reader, out Tuple<T1> value)
+    {
+      value = (reader.ValueType == JSValueType.Array
+        && reader.TryReadArrayItem(out T1 t1)
+        && reader.SkipArrayToEnd())
+      ? new Tuple<T1>(t1)
+      : default;
+    }
+
+    public static void ReadValue<T1, T2>(this IJSValueReader reader, out Tuple<T1, T2> value)
+    {
+      value = (reader.ValueType == JSValueType.Array
+        && reader.TryReadArrayItem(out T1 t1)
+        && reader.TryReadArrayItem(out T2 t2)
+        && reader.SkipArrayToEnd())
+      ? new Tuple<T1, T2>(t1, t2)
+      : default;
+    }
+
+    public static void ReadValue<T1, T2, T3>(this IJSValueReader reader, out Tuple<T1, T2, T3> value)
+    {
+      value = (reader.ValueType == JSValueType.Array
+        && reader.TryReadArrayItem(out T1 t1)
+        && reader.TryReadArrayItem(out T2 t2)
+        && reader.TryReadArrayItem(out T3 t3)
+        && reader.SkipArrayToEnd())
+      ? new Tuple<T1, T2, T3>(t1, t2, t3)
+      : default;
+    }
+
+    public static void ReadValue<T1, T2, T3, T4>(this IJSValueReader reader, out Tuple<T1, T2, T3, T4> value)
+    {
+      value = (reader.ValueType == JSValueType.Array
+        && reader.TryReadArrayItem(out T1 t1)
+        && reader.TryReadArrayItem(out T2 t2)
+        && reader.TryReadArrayItem(out T3 t3)
+        && reader.TryReadArrayItem(out T4 t4)
+        && reader.SkipArrayToEnd())
+      ? new Tuple<T1, T2, T3, T4>(t1, t2, t3, t4)
+      : default;
+    }
+
+    public static void ReadValue<T1, T2, T3, T4, T5>(
+      this IJSValueReader reader, out Tuple<T1, T2, T3, T4, T5> value)
+    {
+      value = (reader.ValueType == JSValueType.Array
+        && reader.TryReadArrayItem(out T1 t1)
+        && reader.TryReadArrayItem(out T2 t2)
+        && reader.TryReadArrayItem(out T3 t3)
+        && reader.TryReadArrayItem(out T4 t4)
+        && reader.TryReadArrayItem(out T5 t5)
+        && reader.SkipArrayToEnd())
+      ? new Tuple<T1, T2, T3, T4, T5>(t1, t2, t3, t4, t5)
+      : default;
+    }
+
+    public static void ReadValue<T1, T2, T3, T4, T5, T6>(
+      this IJSValueReader reader, out Tuple<T1, T2, T3, T4, T5, T6> value)
+    {
+      value = (reader.ValueType == JSValueType.Array
+        && reader.TryReadArrayItem(out T1 t1)
+        && reader.TryReadArrayItem(out T2 t2)
+        && reader.TryReadArrayItem(out T3 t3)
+        && reader.TryReadArrayItem(out T4 t4)
+        && reader.TryReadArrayItem(out T5 t5)
+        && reader.TryReadArrayItem(out T6 t6)
+        && reader.SkipArrayToEnd())
+      ? new Tuple<T1, T2, T3, T4, T5, T6>(t1, t2, t3, t4, t5, t6)
+      : default;
+    }
+
+    public static void ReadValue<T1, T2, T3, T4, T5, T6, T7>(
+      this IJSValueReader reader, out Tuple<T1, T2, T3, T4, T5, T6, T7> value)
+    {
+      value = (reader.ValueType == JSValueType.Array
+        && reader.TryReadArrayItem(out T1 t1)
+        && reader.TryReadArrayItem(out T2 t2)
+        && reader.TryReadArrayItem(out T3 t3)
+        && reader.TryReadArrayItem(out T4 t4)
+        && reader.TryReadArrayItem(out T5 t5)
+        && reader.TryReadArrayItem(out T6 t6)
+        && reader.TryReadArrayItem(out T7 t7)
+        && reader.SkipArrayToEnd())
+      ? new Tuple<T1, T2, T3, T4, T5, T6, T7>(t1, t2, t3, t4, t5, t6, t7)
+      : default;
+    }
+
+    public static bool TryReadArrayItem<T>(this IJSValueReader reader, out T value)
+    {
+      bool result = reader.GetNextArrayItem();
+      value = result ? reader.ReadValue<T>() : default;
       return result;
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out double value)
+    public static bool GetNextArrayItem(this IJSValueReader reader, ref bool success)
     {
-      return reader.TryGetDouble(out value);
+      return success = success && reader.GetNextArrayItem();
     }
 
-    public static bool TryReadValue(this IJSValueReader reader, out string value)
+    public static void ReadArgs(this IJSValueReader reader)
     {
-      return reader.TryGetString(out value);
+      bool success = reader.ValueType == JSValueType.Array;
+      _ = success && reader.SkipArrayToEnd();
     }
+
+    public static void ReadArgs<T1>(this IJSValueReader reader, out T1 arg1)
+    {
+      bool success = reader.ValueType == JSValueType.Array;
+      arg1 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T1>() : default;
+      _ = success && reader.SkipArrayToEnd();
+    }
+
+    public static void ReadArgs<T1, T2>(this IJSValueReader reader, out T1 arg1, out T2 arg2)
+    {
+      bool success = reader.ValueType == JSValueType.Array;
+      arg1 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T1>() : default;
+      arg2 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T2>() : default;
+      _ = success && reader.SkipArrayToEnd();
+    }
+
+    public static void ReadArgs<T1, T2, T3>(this IJSValueReader reader, out T1 arg1, out T2 arg2, out T3 arg3)
+    {
+      bool success = reader.ValueType == JSValueType.Array;
+      arg1 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T1>() : default;
+      arg2 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T2>() : default;
+      arg3 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T3>() : default;
+      _ = success && reader.SkipArrayToEnd();
+    }
+
+    public static void ReadArgs<T1, T2, T3, T4>(this IJSValueReader reader,
+      out T1 arg1, out T2 arg2, out T3 arg3, out T4 arg4)
+    {
+      bool success = reader.ValueType == JSValueType.Array;
+      arg1 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T1>() : default;
+      arg2 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T2>() : default;
+      arg3 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T3>() : default;
+      arg4 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T4>() : default;
+      _ = success && reader.SkipArrayToEnd();
+    }
+
+    public static void ReadArgs<T1, T2, T3, T4, T5>(this IJSValueReader reader,
+      out T1 arg1, out T2 arg2, out T3 arg3, out T4 arg4, out T5 arg5)
+    {
+      bool success = reader.ValueType == JSValueType.Array;
+      arg1 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T1>() : default;
+      arg2 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T2>() : default;
+      arg3 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T3>() : default;
+      arg4 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T4>() : default;
+      arg5 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T5>() : default;
+      _ = success && reader.SkipArrayToEnd();
+    }
+
+    public static void ReadArgs<T1, T2, T3, T4, T5, T6>(this IJSValueReader reader,
+      out T1 arg1, out T2 arg2, out T3 arg3, out T4 arg4, out T5 arg5, out T6 arg6)
+    {
+      bool success = reader.ValueType == JSValueType.Array;
+      arg1 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T1>() : default;
+      arg2 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T2>() : default;
+      arg3 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T3>() : default;
+      arg4 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T4>() : default;
+      arg5 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T5>() : default;
+      arg6 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T6>() : default;
+      _ = success && reader.SkipArrayToEnd();
+    }
+
+    public static void ReadArgs<T1, T2, T3, T4, T5, T6, T7>(this IJSValueReader reader,
+      out T1 arg1, out T2 arg2, out T3 arg3, out T4 arg4, out T5 arg5, out T6 arg6, out T7 arg7)
+    {
+      bool success = reader.ValueType == JSValueType.Array;
+      arg1 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T1>() : default;
+      arg2 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T2>() : default;
+      arg3 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T3>() : default;
+      arg4 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T4>() : default;
+      arg5 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T5>() : default;
+      arg6 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T6>() : default;
+      arg7 = reader.GetNextArrayItem(ref success) ? reader.ReadValue<T7>() : default;
+      _ = success && reader.SkipArrayToEnd();
+    }
+
+    public static void ReadValue<T>(this IJSValueReader reader, out T value)
+    {
+      JSValueReaderOf<T>.ReadValue(reader, out value);
+    }
+
+    public static T ReadValue<T>(this IJSValueReader reader)
+    {
+      JSValueReaderOf<T>.ReadValue(reader, out T value);
+      return value;
+    }
+
+    public static void ReadValue<T>(this JSValue jsValue, out T value)
+    {
+      JSValueReaderOf<T>.ReadValue(new JSValueTreeReader(jsValue), out value);
+    }
+
+    public static T ReadValue<T>(this JSValue jsValue)
+    {
+      JSValueReaderOf<T>.ReadValue(new JSValueTreeReader(jsValue), out T value);
+      return value;
+    }
+
+    public static ReadValueDelegate<T> GetReadValueDelegate<T>()
+    {
+      return (ReadValueDelegate<T>)GetReadValueDelegate(typeof(T));
+    }
+
+    public static Delegate GetReadValueDelegate(Type valueType)
+    {
+      // We want to generate the delegate only once even if we cannot insert it
+      // to s_readerDelegates from the first attempt.
+      var generatedDelegate = new Lazy<Delegate>(
+        () => JSValueReaderGenerator.GenerateReadValueDelegate(valueType));
+
+      // We try to add the generated ReadValue delegate in a loop
+      // in a lock-free thread-safe way. We do not change existing s_readerDelegates.
+      // Instead we clone it, update the clone, then replace the s_readerDelegates with the updated clone.
+      while (true)
+      {
+        var readerDelegates = s_readerDelegates; // Get the local pointer first.
+        if (readerDelegates.TryGetValue(valueType, out Delegate readDelegate))
+        {
+          return readDelegate;
+        }
+
+        // The ReadValue delegate is not found. Generate it add try to add to the dictionary atomically.
+        var newDelegate = generatedDelegate.Value; // Generates delegate when we are here a first time.
+
+        // This is a quick shortcut in case if s_readerDelegates changed while we generated the value.
+        // It helps to avoid cloning dictionary in a number of cases. 
+        if (readerDelegates != s_readerDelegates) continue;
+
+        // Clone the dictionary, update the clone, and try to replace the s_readerDelegates.
+        var updatedReaderDelegates = new Dictionary<Type, Delegate>(readerDelegates as IDictionary<Type, Delegate>);
+        updatedReaderDelegates.Add(valueType, newDelegate);
+        Interlocked.CompareExchange(ref s_readerDelegates, updatedReaderDelegates, readerDelegates);
+      }
+    }
+  }
+
+  // This class provides constant time access to the ReadValue delegate.
+  static class JSValueReaderOf<T>
+  {
+    public static ReadValueDelegate<T> ReadValue = JSValueReader.GetReadValueDelegate<T>();
   }
 }
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValueReaderGenerator.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValueReaderGenerator.cs
new file mode 100644
index 00000000000..e2aa11c82fd
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValueReaderGenerator.cs
@@ -0,0 +1,273 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using static System.Linq.Expressions.Expression;
+using static Microsoft.ReactNative.Managed.JSValueGenerator;
+
+namespace Microsoft.ReactNative.Managed
+{
+  static class JSValueReaderGenerator
+  {
+    private static readonly Lazy<KeyValuePair<Type, MethodInfo>[]> s_allMethods;
+    private static readonly Lazy<IReadOnlyDictionary<Type, MethodInfo>> s_nonGenericMethods;
+    private static readonly Lazy<IReadOnlyDictionary<Type, SortedList<Type, MethodInfo>>> s_genericMethods;
+
+    static JSValueReaderGenerator()
+    {
+      // Get all extension ReadValue methods for IJSValueReader and JSValue.
+      // The first parameter must be IJSValueReader or JSValue.
+      // The second parameter must be an 'out' parameter and must not be a generic parameter T.
+      // This is to avoid endless recursion because ReadValue with generic parameter T
+      // is the one who calls the JSValueReaderGenerator.
+      s_allMethods = new Lazy<KeyValuePair<Type, MethodInfo>[]>(() =>
+      {
+        var extensionMethods =
+          from type in typeof(JSValueReader).GetTypeInfo().Assembly.GetTypes()
+          let typeInfo = type.GetTypeInfo()
+          where typeInfo.IsSealed && !typeInfo.IsGenericType && !typeInfo.IsNested
+          from member in type.GetMember(nameof(JSValueReader.ReadValue), BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
+          let method = member as MethodInfo
+          where (method != null) && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+          let parameters = method.GetParameters()
+          where parameters.Length == 2
+            && (parameters[0].ParameterType == typeof(IJSValueReader)
+             || parameters[0].ParameterType == typeof(JSValue))
+            && parameters[1].IsOut
+          let dataType = parameters[1].ParameterType.GetElementType()
+          where !dataType.IsGenericParameter
+          select new KeyValuePair<Type, MethodInfo>(dataType, method);
+        return extensionMethods.ToArray();
+      });
+
+      // Get all non-generic ReadValue extension methods.
+      // They are easy to match and we can put them in a dictionary.
+      s_nonGenericMethods = new Lazy<IReadOnlyDictionary<Type, MethodInfo>>(() =>
+        s_allMethods.Value.Where(p => !p.Value.IsGenericMethod).ToDictionary(p => p.Key, p => p.Value));
+
+      // Get all generic ReadValue extension methods.
+      // Group them by generic type definitions and sort them by having more specific methods getting first.
+      // The matching for generic types is more complicated: we first match the generic type definition,
+      // and then walk the sorted list and try to match types one by one.
+      // Note that the parameter could be an array of generic type. The array is not a generic type. 
+      s_genericMethods = new Lazy<IReadOnlyDictionary<Type, SortedList<Type, MethodInfo>>>(() =>
+      {
+        var genericMethods =
+          from pair in s_allMethods.Value
+          where pair.Value.IsGenericMethod
+          let type = pair.Key
+          let keyType = type.GetTypeInfo().IsGenericType ? type.GetGenericTypeDefinition()
+            : type.IsArray ? typeof(Array)
+            : throw new InvalidOperationException($"Unsupported argument type {type}")
+          group pair by keyType into g
+          select new KeyValuePair<Type, SortedList<Type, MethodInfo>>(
+            g.Key, new SortedList<Type, MethodInfo>(
+              g.ToDictionary(p => p.Key, p => p.Value), GenericTypeComparer.Default));
+        return genericMethods.ToDictionary(p => p.Key, p => p.Value);
+      });
+    }
+
+    public static MethodInfo ReadArgsOf(Type[] typeArgs)
+    {
+      var readArgsMethod =
+        from member in typeof(JSValueReader).GetMember(
+          nameof(JSValueReader.ReadArgs), BindingFlags.Static | BindingFlags.Public)
+        let method = member as MethodInfo
+        let isGeneric = method.IsGenericMethod
+        where method != null
+          && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+        let parameters = method.GetParameters()
+        where parameters.Length == typeArgs.Length + 1
+          && parameters[0].ParameterType == typeof(IJSValueReader)
+        select isGeneric ? method.MakeGenericMethod(typeArgs) : method;
+      return readArgsMethod.First();
+    }
+
+    static MethodInfo GetNextObjectProperty =>
+      typeof(IJSValueReader).GetMethod(nameof(IJSValueReader.GetNextObjectProperty));
+
+    private static MethodInfo MethodOf(string methodName, params Type[] typeArgs) =>
+      typeof(JSValueReaderGenerator).GetMethod(methodName).MakeGenericMethod(typeArgs);
+
+    static string ValueType => nameof(IJSValueReader.ValueType);
+
+    static TypeWrapper ReadValueDelegateOf(Type typeArg) =>
+      new TypeWrapper(typeof(ReadValueDelegate<>).MakeGenericType(typeArg));
+
+    static MethodInfo ReadValueOf(Type typeArg)
+    {
+      var readValueNoParamMethod =
+        from member in typeof(JSValueReader).GetMember(
+          nameof(JSValueReader.ReadValue), BindingFlags.Static | BindingFlags.Public)
+        let method = member as MethodInfo
+        where method != null
+          && method.IsGenericMethod
+          && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+        let parameters = method.GetParameters()
+        where parameters.Length == 1
+          && parameters[0].ParameterType == typeof(IJSValueReader)
+        select method;
+      return readValueNoParamMethod.First().MakeGenericMethod(typeArg);
+    }
+
+    static MethodInfo JSValueReadFrom => typeof(JSValue).GetMethod(nameof(JSValue.ReadFrom));
+
+    public static Delegate GenerateReadValueDelegate(Type valueType)
+    {
+      return GenerateFromExtension(valueType)
+        ?? GenerateReadValueFromGenericExtension(valueType)
+        ?? GenerateReadValueForEnum(valueType)
+        ?? GenerateReadValueForClass(valueType)
+        ?? throw new Exception($"Cannot generate ReadValue delegate for type {valueType}");
+    }
+
+    // Creates a delegate from the ReadValue non-generic extension method
+    private static Delegate GenerateFromExtension(Type valueType)
+    {
+      if (s_nonGenericMethods.Value.TryGetValue(valueType, out MethodInfo methodInfo))
+      {
+        var extendedType = methodInfo.GetParameters()[0].ParameterType;
+        if (extendedType == typeof(IJSValueReader))
+        {
+          return methodInfo.CreateDelegate(typeof(ReadValueDelegate<>).MakeGenericType(valueType));
+        }
+        else if (extendedType == typeof(JSValue))
+        {
+          return GenerateReadValueFromJSValueExtension(valueType, methodInfo);
+        }
+      }
+
+      return null;
+    }
+
+    private static Delegate GenerateReadValueFromGenericExtension(Type valueType)
+    {
+      var keyType = valueType.GetTypeInfo().IsGenericType ? valueType.GetGenericTypeDefinition()
+        : valueType.IsArray ? typeof(Array)
+        : null;
+
+      if (keyType != null
+        && s_genericMethods.Value.TryGetValue(keyType, out SortedList<Type, MethodInfo> candidateMethods))
+      {
+        foreach (var candidateMethod in candidateMethods)
+        {
+          var genericType = candidateMethod.Key;
+          var methodInfo = candidateMethod.Value;
+          var genericArgs = methodInfo.GetGenericArguments();
+          if (TryMatchGenericType(valueType, genericType, genericArgs, out Type[] typeArgs))
+          {
+            var genericMethod = methodInfo.MakeGenericMethod(typeArgs);
+            var extendedType = methodInfo.GetParameters()[0].ParameterType;
+            if (extendedType == typeof(IJSValueReader))
+            {
+              return genericMethod.CreateDelegate(typeof(ReadValueDelegate<>).MakeGenericType(valueType));
+            }
+            else if (extendedType == typeof(JSValue))
+            {
+              return GenerateReadValueFromJSValueExtension(valueType, genericMethod);
+            }
+          }
+        }
+      }
+
+      return null;
+    }
+
+    // Creates a delegate from the JSValue ReadValue non-generic extension method
+    private static Delegate GenerateReadValueFromJSValueExtension(Type valueType, MethodInfo methodInfo)
+    {
+      // Generate code that looks like:
+      //
+      // (IJSValueReader reader, out Type value) =>
+      // {
+      //   var jsValue = JSValue.ReadFrom(reader);
+      //   jsValue.ReadValue(out value);
+      // }
+
+      return ReadValueDelegateOf(valueType).CompileLambda(
+        Parameter(typeof(IJSValueReader), out var reader),
+        Parameter(valueType.MakeByRefType(), out var value),
+        Variable(typeof(JSValue), out var jsValue, Call(JSValueReadFrom, reader)),
+        jsValue.CallExt(methodInfo, value));
+    }
+
+    // It cannot be an extension method because it would conflict with the generic
+    // extension method that uses T value type.
+    public static void ReadEnum<TEnum>(IJSValueReader reader, out TEnum value) where TEnum : Enum
+    {
+      value = (TEnum)(object)reader.ReadValue<int>();
+    }
+
+    private static Delegate GenerateReadValueForEnum(Type valueType)
+    {
+      // Creates a delegate from the ReadEnum method
+      return valueType.GetTypeInfo().IsEnum
+        ? MethodOf(nameof(ReadEnum), valueType).CreateDelegate(typeof(ReadValueDelegate<>).MakeGenericType(valueType))
+        : null;
+    }
+
+    private static Delegate GenerateReadValueForClass(Type valueType)
+    {
+      // Generate code that looks like:
+      //
+      // (IJSValueReader reader, out Type value) =>
+      // {
+      //   value = new Type();
+      //   if (reader.ValueType == JSValueType.Object)
+      //   {
+      //     while (reader.GetNextObjectProperty(out string propertyName))
+      //     {
+      //       // For each object field or property
+      //       switch(propertyName)
+      //       {
+      //         case "Field1": value.Field1 = reader.ReadValue<Field1Type>(); break;
+      //         case "Field2": value.Field2 = reader.ReadValue<Field2Type>(); break;
+      //         case "Prop1": value.Prop1 = reader.ReadValue<Prop1Type>(); break;
+      //         case "Prop2": value.Prop2 = reader.ReadValue<Prop2Type>(); break;
+      //       }
+      //     }
+      //   }
+      // }
+
+      var valueTypeInfo = valueType.GetTypeInfo();
+      bool isStruct = valueTypeInfo.IsValueType && !valueTypeInfo.IsEnum;
+      bool isClass = valueTypeInfo.IsClass;
+      if (isStruct || (isClass && valueType.GetConstructor(Type.EmptyTypes) != null))
+      {
+        var fields =
+          from field in valueType.GetFields(BindingFlags.Public | BindingFlags.Instance)
+          where !field.IsInitOnly
+          select new { field.Name, Type = field.FieldType };
+        var properties =
+          from property in valueType.GetProperties(BindingFlags.Public | BindingFlags.Instance)
+          let propertySetter = property.SetMethod
+          where propertySetter.IsPublic
+          select new { property.Name, Type = property.PropertyType };
+        var members = fields.Concat(properties).ToArray();
+
+        return ReadValueDelegateOf(valueType).CompileLambda(
+          Parameter(typeof(IJSValueReader), out var reader),
+          Parameter(valueType.MakeByRefType(), out var value),
+          value.Assign(New(valueType)),
+          IfThen(Equal(reader.Property(ValueType), Constant(JSValueType.Object)),
+            ifTrue: AutoBlock(
+              Variable(typeof(string), out var propertyName),
+              While(reader.Call(GetNextObjectProperty, propertyName),
+                (members.Length != 0)
+                ? Switch(propertyName,
+                    members.Select(member => SwitchCase(
+                      value.SetPropertyStatement(member.Name, reader.CallExt(ReadValueOf(member.Type))),
+                      Constant(member.Name))).ToArray()) as Expression
+                : Default(typeof(void))))));
+      }
+
+      return null;
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValueTreeReader.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValueTreeReader.cs
new file mode 100644
index 00000000000..dc2d6ecba13
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValueTreeReader.cs
@@ -0,0 +1,174 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using System.Collections.Generic;
+
+namespace Microsoft.ReactNative.Managed
+{
+  class JSValueTreeReader : IJSValueReader, IJSValueTreeReader
+  {
+    private bool m_isIterating = false;
+    private readonly Stack<StackEntry> m_stack = new Stack<StackEntry>();
+
+    public JSValueTreeReader(JSValue root)
+    {
+      Root = root;
+      Current = root;
+    }
+
+    public JSValueType ValueType => Current.Type;
+
+    public JSValue Current { get; private set; }
+
+    public JSValue Root { get; private set; }
+
+    public bool GetNextObjectProperty(out string propertyName)
+    {
+      if (!m_isIterating)
+      {
+        if (Current.Type == JSValueType.Object)
+        {
+          var properties = Current.Object.GetEnumerator();
+          if (properties.MoveNext())
+          {
+            m_stack.Push(StackEntry.ObjectProperty(Current, properties));
+            SetCurrentValue(properties.Current.Value);
+            propertyName = properties.Current.Key;
+            return true;
+          }
+          else
+          {
+            m_isIterating = m_stack.Count != 0;
+          }
+        }
+      }
+      else if (m_stack.Count != 0)
+      {
+        StackEntry entry = m_stack.Peek();
+        if (entry.Value.Type == JSValueType.Object)
+        {
+          if (entry.Property.MoveNext())
+          {
+            SetCurrentValue(entry.Property.Current.Value);
+            propertyName = entry.Property.Current.Key;
+            return true;
+          }
+          else
+          {
+            Current = entry.Value;
+            m_stack.Pop();
+            m_isIterating = m_stack.Count != 0;
+          }
+        }
+      }
+
+      propertyName = "";
+      return false;
+    }
+
+    public bool GetNextArrayItem()
+    {
+      if (!m_isIterating)
+      {
+        if (Current.Type == JSValueType.Array)
+        {
+          var items = Current.Array.GetEnumerator();
+          if (items.MoveNext())
+          {
+            m_stack.Push(StackEntry.ArrayItem(Current, items));
+            SetCurrentValue(items.Current);
+            return true;
+          }
+        }
+        else
+        {
+          m_isIterating = m_stack.Count != 0;
+        }
+
+      }
+      else if (m_stack.Count != 0)
+      {
+        var entry = m_stack.Peek();
+        if (entry.Value.Type == JSValueType.Array)
+        {
+          if (entry.Item.MoveNext())
+          {
+            SetCurrentValue(entry.Item.Current);
+            return true;
+          }
+          else
+          {
+            Current = entry.Value;
+            m_stack.Pop();
+            m_isIterating = m_stack.Count != 0;
+          }
+        }
+      }
+
+      return false;
+    }
+
+    private void SetCurrentValue(JSValue value)
+    {
+      Current = value;
+      switch (value.Type)
+      {
+        case JSValueType.Object:
+        case JSValueType.Array:
+          m_isIterating = false;
+          break;
+        default:
+          m_isIterating = true;
+          break;
+      }
+    }
+
+    public string GetString()
+    {
+      return (Current.Type == JSValueType.String) ? Current.String : "";
+    }
+
+    public bool GetBoolean()
+    {
+      return (Current.Type == JSValueType.Boolean) ? Current.Boolean : false;
+    }
+
+    public long GetInt64()
+    {
+      return (Current.Type == JSValueType.Int64) ? Current.Int64 : 0;
+    }
+
+    public double GetDouble()
+    {
+      return (Current.Type == JSValueType.Double) ? Current.Double : 0;
+    }
+
+    private struct StackEntry
+    {
+      public JSValue Value;
+      public IEnumerator<JSValue> Item;
+      public IEnumerator<KeyValuePair<string, JSValue>> Property;
+
+      public static StackEntry ObjectProperty(JSValue value, IEnumerator<KeyValuePair<string, JSValue>> property)
+      {
+        return new StackEntry
+        {
+          Value = value,
+          Item = null,
+          Property = property
+        };
+      }
+
+      public static StackEntry ArrayItem(JSValue value, IEnumerator<JSValue> item)
+      {
+        return new StackEntry
+        {
+          Value = value,
+          Item = item,
+          Property = null
+        };
+      }
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValueTreeWriter.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValueTreeWriter.cs
new file mode 100644
index 00000000000..9acee67f15e
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValueTreeWriter.cs
@@ -0,0 +1,204 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Microsoft.ReactNative.Managed
+{
+  class JSValueTreeWriter : IJSValueWriter
+  {
+    private State m_state = State.Start;
+    private Stack<StackEntry> m_stack = new Stack<StackEntry>();
+    private object m_dynamic;
+    private string m_propertyName;
+    private JSValue m_result;
+
+    public JSValue TakeValue()
+    {
+      return m_result;
+    }
+
+    public void WriteNull()
+    {
+      WriteValue(new JSValue());
+    }
+
+    public void WriteBoolean(bool value)
+    {
+      WriteValue(new JSValue(value));
+    }
+
+    public void WriteInt64(long value)
+    {
+      WriteValue(new JSValue(value));
+    }
+
+    public void WriteDouble(double value)
+    {
+      WriteValue(new JSValue(value));
+    }
+
+    public void WriteString(string value)
+    {
+      WriteValue(new JSValue(value));
+    }
+
+    public void WriteObjectBegin()
+    {
+      if (m_state == State.PropertyValue)
+      {
+        m_stack.Push(new StackEntry(m_state, (Dictionary<string, JSValue>)m_dynamic, m_propertyName));
+      }
+      else if (m_state == State.Array)
+      {
+        m_stack.Push(new StackEntry(m_state, (List<JSValue>)m_dynamic));
+      }
+      else if (m_state != State.Start)
+      {
+        throw new InvalidOperationException();
+      }
+
+      m_dynamic = new Dictionary<string, JSValue>();
+      m_state = State.PropertyName;
+    }
+
+    public void WritePropertyName(string name)
+    {
+      if (m_state == State.PropertyName)
+      {
+        m_propertyName = name;
+        m_state = State.PropertyValue;
+      }
+      else
+      {
+        throw new InvalidOperationException();
+      }
+    }
+
+    public void WriteObjectEnd()
+    {
+      if (m_state == State.PropertyName)
+      {
+        var obj = new JSValue(new ReadOnlyDictionary<string, JSValue>((Dictionary<string, JSValue>)m_dynamic));
+        if (m_stack.Count == 0)
+        {
+          m_result = obj;
+          m_state = State.Finish;
+          return;
+        }
+        else
+        {
+          StackEntry entry = m_stack.Pop();
+          if (entry.State == State.PropertyValue)
+          {
+            ((Dictionary<string, JSValue>)entry.Dynamic)[entry.PropertyName] = obj;
+            m_dynamic = entry.Dynamic;
+            m_state = State.PropertyName;
+            return;
+          }
+          else if (entry.State == State.Array)
+          {
+            ((List<JSValue>)entry.Dynamic).Add(obj);
+            m_dynamic = entry.Dynamic;
+            m_state = State.Array;
+            return;
+          }
+        }
+      }
+
+      throw new InvalidOperationException();
+    }
+
+    public void WriteArrayBegin()
+    {
+      if (m_state == State.PropertyValue)
+      {
+        m_stack.Push(new StackEntry(m_state, (Dictionary<string, JSValue>)m_dynamic, m_propertyName));
+      }
+      else if (m_state == State.Array)
+      {
+        m_stack.Push(new StackEntry(m_state, (List<JSValue>)m_dynamic));
+      }
+      else if (m_state != State.Start)
+      {
+        throw new InvalidOperationException();
+      }
+
+      m_dynamic = new List<JSValue>();
+      m_state = State.Array;
+    }
+
+    public void WriteArrayEnd()
+    {
+      if (m_state == State.Array)
+      {
+        var arr = new JSValue(new ReadOnlyCollection<JSValue>((List<JSValue>)m_dynamic));
+        if (m_stack.Count == 0)
+        {
+          m_result = arr;
+          m_state = State.Finish;
+          return;
+        }
+        else
+        {
+          StackEntry entry = m_stack.Pop();
+          if (entry.State == State.PropertyValue)
+          {
+            ((Dictionary<string, JSValue>)entry.Dynamic)[entry.PropertyName] = arr;
+            m_dynamic = entry.Dynamic;
+            m_state = State.PropertyName;
+            return;
+          }
+          else if (entry.State == State.Array)
+          {
+            ((List<JSValue>)entry.Dynamic).Add(arr);
+            m_dynamic = entry.Dynamic;
+            m_state = State.Array;
+            return;
+          }
+        }
+      }
+
+      throw new InvalidOperationException();
+    }
+
+    private enum State { Start, PropertyName, PropertyValue, Array, Finish };
+
+    class StackEntry
+    {
+      public State State;
+      public object Dynamic;
+      public string PropertyName;
+
+      public StackEntry(State state, Dictionary<string, JSValue> obj, string propertyName)
+      {
+        State = state;
+        Dynamic = obj;
+        PropertyName = propertyName;
+      }
+
+      public StackEntry(State state, List<JSValue> arr)
+      {
+        State = state;
+        Dynamic = arr;
+        PropertyName = null;
+      }
+    }
+
+    private void WriteValue(JSValue value)
+    {
+      if (m_state == State.PropertyValue)
+      {
+        ((Dictionary<string, JSValue>)m_dynamic)[m_propertyName] = value;
+        m_state = State.PropertyName;
+      }
+      else if (m_state == State.Array)
+      {
+        ((List<JSValue>)m_dynamic).Add(value);
+      }
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValueWriter.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValueWriter.cs
index a20fda27dda..3c9da47156c 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/JSValueWriter.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValueWriter.cs
@@ -4,122 +4,539 @@
 using Microsoft.ReactNative.Bridge;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Collections.ObjectModel;
 using System.Threading;
-using ReflectionMethodInfo = System.Reflection.MethodInfo;
 
 namespace Microsoft.ReactNative.Managed
 {
-  delegate void ValueWriter(IJSValueWriter writer, object value);
+  delegate void WriteValueDelegate<T>(IJSValueWriter writer, T value);
 
   static class JSValueWriter
   {
-    private static Lazy<Dictionary<Type, ReflectionMethodInfo>> s_writeValueMethods =
-        new Lazy<Dictionary<Type, ReflectionMethodInfo>>(InitWriteValueMethods, LazyThreadSafetyMode.PublicationOnly);
+    private static IReadOnlyDictionary<Type, Delegate> s_writerDelegates = new Dictionary<Type, Delegate>();
 
-    public static ReflectionMethodInfo GetWriteValueMethod(Type valueType)
+    public static void WriteValue(this IJSValueWriter writer, string value)
     {
-      ReflectionMethodInfo writeValueMethod;
-      if (s_writeValueMethods.Value.TryGetValue(valueType, out writeValueMethod))
+      writer.WriteString(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, bool value)
+    {
+      writer.WriteBoolean(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, sbyte value)
+    {
+      writer.WriteInt64(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, short value)
+    {
+      writer.WriteInt64(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, int value)
+    {
+      writer.WriteInt64(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, long value)
+    {
+      writer.WriteInt64(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, byte value)
+    {
+      writer.WriteInt64(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, ushort value)
+    {
+      writer.WriteInt64(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, uint value)
+    {
+      writer.WriteInt64(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, ulong value)
+    {
+      writer.WriteInt64((long)value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, float value)
+    {
+      writer.WriteDouble(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, double value)
+    {
+      writer.WriteDouble(value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, JSValue value)
+    {
+      value.WriteTo(writer);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, Dictionary<string, JSValue> value)
+    {
+      JSValue.WriteObject(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IDictionary<string, JSValue> value)
+    {
+      JSValue.WriteObject(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, ICollection<KeyValuePair<string, JSValue>> value)
+    {
+      JSValue.WriteObject(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IEnumerable<KeyValuePair<string, JSValue>> value)
+    {
+      JSValue.WriteObject(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, ReadOnlyDictionary<string, JSValue> value)
+    {
+      JSValue.WriteObject(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IReadOnlyDictionary<string, JSValue> value)
+    {
+      JSValue.WriteObject(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IReadOnlyCollection<KeyValuePair<string, JSValue>> value)
+    {
+      JSValue.WriteObject(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, List<JSValue> value)
+    {
+      JSValue.WriteArray(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IList<JSValue> value)
+    {
+      JSValue.WriteArray(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, ICollection<JSValue> value)
+    {
+      JSValue.WriteArray(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IEnumerable<JSValue> value)
+    {
+      JSValue.WriteArray(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, ReadOnlyCollection<JSValue> value)
+    {
+      JSValue.WriteArray(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IReadOnlyList<JSValue> value)
+    {
+      JSValue.WriteArray(writer, value);
+    }
+
+    public static void WriteValue(this IJSValueWriter writer, IReadOnlyCollection<JSValue> value)
+    {
+      JSValue.WriteArray(writer, value);
+    }
+
+    public static void WriteValue<T>(this IJSValueWriter writer, T? value) where T : struct
+    {
+      if (value.HasValue)
       {
-        return writeValueMethod;
+        writer.WriteValue(value.Value);
       }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
 
-      throw new ReactException($"WriteValue extension method is not found for type {valueType.FullName}.");
+    public static void WriteValue<T>(this IJSValueWriter writer, Dictionary<string, T> value)
+    {
+      writer.WriteValue(value as IEnumerable<KeyValuePair<string, T>>);
     }
 
-    private static Dictionary<Type, ReflectionMethodInfo> InitWriteValueMethods()
+    public static void WriteValue<T>(this IJSValueWriter writer, IDictionary<string, T> value)
     {
-      var query = from type in typeof(JSValueWriter).GetTypeInfo().Assembly.GetTypes()
-                  where /*type.IsSealed && !type.IsGenericType && */!type.IsNested
-                  from method in type.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
-                  where method.IsDefined(typeof(ExtensionAttribute), false) && method.Name == "WriteValue"
-                  let parameters = method.GetParameters()
-                  where parameters.Length == 2 && parameters[0].ParameterType == typeof(IJSValueWriter)
-                  select new { valueType = parameters[1].ParameterType, method };
-      return query.ToDictionary(i => i.valueType, i => i.method);
+      writer.WriteValue(value as IEnumerable<KeyValuePair<string, T>>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, bool value)
+    public static void WriteValue<T>(this IJSValueWriter writer, ICollection<KeyValuePair<string, T>> value)
     {
-      return writer.WriteBoolean(value);
+      writer.WriteValue(value as IEnumerable<KeyValuePair<string, T>>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, sbyte value)
+    public static void WriteValue<T>(this IJSValueWriter writer, IEnumerable<KeyValuePair<string, T>> value)
     {
-      return writer.WriteInt64(value);
+      if (value != null)
+      {
+        writer.WriteObjectBegin();
+        foreach (var pair in value)
+        {
+          writer.WriteObjectProperty(pair.Key, pair.Value);
+        }
+        writer.WriteObjectEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
     }
-    public static bool WriteValue(this IJSValueWriter writer, short value)
+
+    public static void WriteValue<T>(this IJSValueWriter writer, ReadOnlyDictionary<string, T> value)
     {
-      return writer.WriteInt64(value);
+      writer.WriteValue(value as IEnumerable<KeyValuePair<string, T>>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, int value)
+    public static void WriteValue<T>(this IJSValueWriter writer, IReadOnlyDictionary<string, T> value)
     {
-      return writer.WriteInt64(value);
+      writer.WriteValue(value as IEnumerable<KeyValuePair<string, T>>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, long value)
+    public static void WriteValue<T>(this IJSValueWriter writer, IReadOnlyCollection<KeyValuePair<string, T>> value)
     {
-      return writer.WriteInt64(value);
+      writer.WriteValue(value as IEnumerable<KeyValuePair<string, T>>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, byte value)
+    public static void WriteValue<T>(this IJSValueWriter writer, List<T> value)
     {
-      return writer.WriteInt64(value);
+      writer.WriteValue(value as IEnumerable<T>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, ushort value)
+    public static void WriteValue<T>(this IJSValueWriter writer, IList<T> value)
     {
-      return writer.WriteInt64(value);
+      writer.WriteValue(value as IEnumerable<T>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, uint value)
+    public static void WriteValue<T>(this IJSValueWriter writer, ICollection<T> value)
     {
-      return writer.WriteInt64((int)value);
+      writer.WriteValue(value as IEnumerable<T>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, ulong value)
+    public static void WriteValue<T>(this IJSValueWriter writer, IEnumerable<T> value)
     {
-      return writer.WriteInt64((long)value);
+      if (value != null)
+      {
+        writer.WriteArrayBegin();
+        foreach (var item in value)
+        {
+          writer.WriteValue(item);
+        }
+
+        writer.WriteArrayEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, float value)
+    public static void WriteValue<T>(this IJSValueWriter writer, ReadOnlyCollection<T> value)
     {
-      return writer.WriteDouble(value);
+      writer.WriteValue(value as IEnumerable<T>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, double value)
+    public static void WriteValue<T>(this IJSValueWriter writer, IReadOnlyList<T> value)
     {
-      return writer.WriteDouble(value);
+      writer.WriteValue(value as IEnumerable<T>);
     }
 
-    public static bool WriteValue(this IJSValueWriter writer, string value)
+    public static void WriteValue<T>(this IJSValueWriter writer, IReadOnlyCollection<T> value)
     {
-      return writer.WriteString(value);
+      writer.WriteValue(value as IEnumerable<T>);
     }
 
-    public static bool WriteProperty<T>(this IJSValueWriter writer, string name, T value)
+    public static void WriteValue<T>(this IJSValueWriter writer, T[] value)
     {
-      return writer.WritePropertyName(name) && writer.WriteValueObject(value);
+      writer.WriteValue(value as IEnumerable<T>);
     }
 
-    public static void WriteArgs(this IJSValueWriter writer, params object[] args)
+    public static void WriteValue<T1>(this IJSValueWriter writer, Tuple<T1> value)
     {
-      writer.WriteArrayBegin();
-      foreach (var arg in args)
+      if (value != null)
+      {
+        writer.WriteArrayBegin();
+        writer.WriteValue(value.Item1);
+        writer.WriteArrayEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    public static void WriteValue<T1, T2>(this IJSValueWriter writer, Tuple<T1, T2> value)
+    {
+      if (value != null)
       {
-        writer.WriteValueObject(arg);
+        writer.WriteArrayBegin();
+        writer.WriteValue(value.Item1);
+        writer.WriteValue(value.Item2);
+        writer.WriteArrayEnd();
       }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    public static void WriteValue<T1, T2, T3>(this IJSValueWriter writer, Tuple<T1, T2, T3> value)
+    {
+      if (value != null)
+      {
+        writer.WriteArrayBegin();
+        writer.WriteValue(value.Item1);
+        writer.WriteValue(value.Item2);
+        writer.WriteValue(value.Item3);
+        writer.WriteArrayEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    public static void WriteValue<T1, T2, T3, T4>(this IJSValueWriter writer, Tuple<T1, T2, T3, T4> value)
+    {
+      if (value != null)
+      {
+        writer.WriteArrayBegin();
+        writer.WriteValue(value.Item1);
+        writer.WriteValue(value.Item2);
+        writer.WriteValue(value.Item3);
+        writer.WriteValue(value.Item4);
+        writer.WriteArrayEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    public static void WriteValue<T1, T2, T3, T4, T5>(this IJSValueWriter writer, Tuple<T1, T2, T3, T4, T5> value)
+    {
+      if (value != null)
+      {
+        writer.WriteArrayBegin();
+        writer.WriteValue(value.Item1);
+        writer.WriteValue(value.Item2);
+        writer.WriteValue(value.Item3);
+        writer.WriteValue(value.Item4);
+        writer.WriteValue(value.Item5);
+        writer.WriteArrayEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    public static void WriteValue<T1, T2, T3, T4, T5, T6>(this IJSValueWriter writer, Tuple<T1, T2, T3, T4, T5, T6> value)
+    {
+      if (value != null)
+      {
+        writer.WriteArrayBegin();
+        writer.WriteValue(value.Item1);
+        writer.WriteValue(value.Item2);
+        writer.WriteValue(value.Item3);
+        writer.WriteValue(value.Item4);
+        writer.WriteValue(value.Item5);
+        writer.WriteValue(value.Item6);
+        writer.WriteArrayEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    public static void WriteValue<T1, T2, T3, T4, T5, T6, T7>(this IJSValueWriter writer, Tuple<T1, T2, T3, T4, T5, T6, T7> value)
+    {
+      if (value != null)
+      {
+        writer.WriteArrayBegin();
+        writer.WriteValue(value.Item1);
+        writer.WriteValue(value.Item2);
+        writer.WriteValue(value.Item3);
+        writer.WriteValue(value.Item4);
+        writer.WriteValue(value.Item5);
+        writer.WriteValue(value.Item6);
+        writer.WriteValue(value.Item7);
+        writer.WriteArrayEnd();
+      }
+      else
+      {
+        writer.WriteNull();
+      }
+    }
+
+    public static void WriteValue<T>(this IJSValueWriter writer, T value)
+    {
+      JSValueWriterOf<T>.WriteValue(writer, value);
+    }
+
+    public static void WriteObjectProperty<T>(this IJSValueWriter writer, string name, T value)
+    {
+      writer.WritePropertyName(name);
+      writer.WriteValue<T>(value);
+    }
+
+    public static void WriteObjectProperties<T>(this IJSValueWriter writer, T value)
+    {
+      var treeWriter = new JSValueTreeWriter();
+      treeWriter.WriteValue(value);
+      foreach (var property in treeWriter.TakeValue().Object)
+      {
+        writer.WriteObjectProperty(property.Key, property.Value);
+      }
+    }
+
+    public static IJSValueWriter WriteArgs(this IJSValueWriter writer)
+    {
+      writer.WriteArrayBegin();
+      writer.WriteArrayEnd();
+      return writer;
+    }
+
+    public static IJSValueWriter WriteArgs<T1>(this IJSValueWriter writer, T1 arg1)
+    {
+      writer.WriteArrayBegin();
+      writer.WriteValue(arg1);
+      writer.WriteArrayEnd();
+      return writer;
+    }
+
+    public static IJSValueWriter WriteArgs<T1, T2>(this IJSValueWriter writer, T1 arg1, T2 arg2)
+    {
+      writer.WriteArrayBegin();
+      writer.WriteValue(arg1);
+      writer.WriteValue(arg2);
+      writer.WriteArrayEnd();
+      return writer;
+    }
+
+    public static IJSValueWriter WriteArgs<T1, T2, T3>(this IJSValueWriter writer, T1 arg1, T2 arg2, T3 arg3)
+    {
+      writer.WriteArrayBegin();
+      writer.WriteValue(arg1);
+      writer.WriteValue(arg2);
+      writer.WriteValue(arg3);
       writer.WriteArrayEnd();
+      return writer;
     }
 
-    public static bool WriteValueObject(this IJSValueWriter writer, object value)
+    public static IJSValueWriter WriteArgs<T1, T2, T3, T4>(this IJSValueWriter writer,
+      T1 arg1, T2 arg2, T3 arg3, T4 arg4)
     {
-      ReflectionMethodInfo writeValue = GetWriteValueMethod(value.GetType());
-      return (bool)writeValue.Invoke(null, new object[] { writer, value });
+      writer.WriteArrayBegin();
+      writer.WriteValue(arg1);
+      writer.WriteValue(arg2);
+      writer.WriteValue(arg3);
+      writer.WriteValue(arg4);
+      writer.WriteArrayEnd();
+      return writer;
     }
+
+    public static IJSValueWriter WriteArgs<T1, T2, T3, T4, T5>(this IJSValueWriter writer,
+      T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
+    {
+      writer.WriteArrayBegin();
+      writer.WriteValue(arg1);
+      writer.WriteValue(arg2);
+      writer.WriteValue(arg3);
+      writer.WriteValue(arg4);
+      writer.WriteValue(arg5);
+      writer.WriteArrayEnd();
+      return writer;
+    }
+
+    public static IJSValueWriter WriteArgs<T1, T2, T3, T4, T5, T6>(this IJSValueWriter writer,
+      T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
+    {
+      writer.WriteArrayBegin();
+      writer.WriteValue(arg1);
+      writer.WriteValue(arg2);
+      writer.WriteValue(arg3);
+      writer.WriteValue(arg4);
+      writer.WriteValue(arg5);
+      writer.WriteValue(arg6);
+      writer.WriteArrayEnd();
+      return writer;
+    }
+
+    public static IJSValueWriter WriteArgs<T1, T2, T3, T4, T5, T6, T7>(this IJSValueWriter writer,
+      T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
+    {
+      writer.WriteArrayBegin();
+      writer.WriteValue(arg1);
+      writer.WriteValue(arg2);
+      writer.WriteValue(arg3);
+      writer.WriteValue(arg4);
+      writer.WriteValue(arg5);
+      writer.WriteValue(arg6);
+      writer.WriteValue(arg7);
+      writer.WriteArrayEnd();
+      return writer;
+    }
+
+    public static IJSValueWriter WriteError<T>(this IJSValueWriter writer, T error)
+    {
+      return (error is string errorMessage)
+       ? writer.WriteArgs(new Dictionary<string, string> { ["message"] = errorMessage })
+       : writer.WriteArgs(error);
+    }
+
+    public static WriteValueDelegate<T> GetWriteValueDelegate<T>()
+    {
+      return (WriteValueDelegate<T>)GetWriteValueDelegate(typeof(T));
+    }
+
+    public static Delegate GetWriteValueDelegate(Type valueType)
+    {
+      // We want to generate the delegate only once even if we cannot insert it
+      // to s_writerDelegates from the first attempt.
+      var generatedDelegate = new Lazy<Delegate>(
+        () => JSValueWriterGenerator.GenerateWriteValueDelegate(valueType));
+
+      // We try to add the generated WriteValue delegate in a loop
+      // in a lock-free thread-safe way. We do not change existing s_writerDelegates.
+      // Instead we clone it, update the clone, then replace the s_writerDelegates with the updated clone.
+      while (true)
+      {
+        var writerDelegates = s_writerDelegates; // Get the local pointer first.
+        if (writerDelegates.TryGetValue(valueType, out Delegate writeDelegate))
+        {
+          return writeDelegate;
+        }
+
+        // The WriteValue delegate is not found. Generate it add try to add to the dictionary atomically.
+        var newDelegate = generatedDelegate.Value; // Generates delegate when we are here a first time.
+
+        // This is a quick shortcut in case if s_writerDelegates changed while we generated the value.
+        // It helps to avoid cloning dictionary in a number of cases. 
+        if (writerDelegates != s_writerDelegates) continue;
+
+        // Clone the dictionary, update the clone, and try to replace the s_writerDelegates.
+        var updatedWriterDelegates = new Dictionary<Type, Delegate>(writerDelegates as IDictionary<Type, Delegate>);
+        updatedWriterDelegates.Add(valueType, newDelegate);
+        Interlocked.CompareExchange(ref s_writerDelegates, updatedWriterDelegates, writerDelegates);
+      }
+    }
+  }
+
+  static class JSValueWriterOf<T>
+  {
+    public static WriteValueDelegate<T> WriteValue = JSValueWriter.GetWriteValueDelegate<T>();
   }
 }
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/JSValueWriterGenerator.cs b/vnext/Microsoft.ReactNative.SharedManaged/JSValueWriterGenerator.cs
new file mode 100644
index 00000000000..bcc70b12680
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/JSValueWriterGenerator.cs
@@ -0,0 +1,268 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.ReactNative.Bridge;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using static Microsoft.ReactNative.Managed.JSValueGenerator;
+using static System.Linq.Expressions.Expression;
+
+namespace Microsoft.ReactNative.Managed
+{
+  static class JSValueWriterGenerator
+  {
+    private static readonly Lazy<KeyValuePair<Type, MethodInfo>[]> s_allMethods;
+    private static readonly Lazy<IReadOnlyDictionary<Type, MethodInfo>> s_nonGenericMethods;
+    private static readonly Lazy<IReadOnlyDictionary<Type, SortedList<Type, MethodInfo>>> s_genericMethods;
+
+    static JSValueWriterGenerator()
+    {
+      // Get all extension WriteValue methods for IJSValueWriter.
+      // The first parameter must be IJSValueWriter.
+      // The second parameter must be not a generic parameter T.
+      // This is to avoid endless recursion because WriteValue with generic parameter T
+      // is the one who calls the JSValueWriterGenerator.
+      s_allMethods = new Lazy<KeyValuePair<Type, MethodInfo>[]>(() =>
+      {
+        var extensionMethods =
+          from type in typeof(JSValueWriter).GetTypeInfo().Assembly.GetTypes()
+          let typeInfo = type.GetTypeInfo()
+          where typeInfo.IsSealed && !typeInfo.IsGenericType && !typeInfo.IsNested
+          from member in type.GetMember(nameof(JSValueWriter.WriteValue), BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic)
+          let method = member as MethodInfo
+          where (method != null) && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+          let parameters = method.GetParameters()
+          where parameters.Length == 2
+            && parameters[0].ParameterType == typeof(IJSValueWriter)
+          let dataType = parameters[1].ParameterType
+          where !dataType.IsByRef && !dataType.IsGenericParameter
+          select new KeyValuePair<Type, MethodInfo>(dataType, method);
+        return extensionMethods.ToArray();
+      });
+
+      // Get all non-generic WriteValue extension methods.
+      // They are easy to match and we can put them in a dictionary.
+      s_nonGenericMethods = new Lazy<IReadOnlyDictionary<Type, MethodInfo>>(() =>
+        s_allMethods.Value.Where(p => !p.Value.IsGenericMethod).ToDictionary(p => p.Key, p => p.Value));
+
+      // Get all generic WriteValue extension methods.
+      // Group them by generic type definitions and sort them by having more specific methods getting first.
+      // The matching for generic types is more complicated: we first match the generic type definition,
+      // and then walk the sorted list and try to match types one by one.
+      // Note that the parameter could be an array of generic type. The array is not a generic type. 
+      s_genericMethods = new Lazy<IReadOnlyDictionary<Type, SortedList<Type, MethodInfo>>>(() =>
+      {
+        var genericMethods =
+          from pair in s_allMethods.Value
+          where pair.Value.IsGenericMethod
+          let type = pair.Key
+          let keyType = type.GetTypeInfo().IsGenericType ? type.GetGenericTypeDefinition()
+            : type.IsArray ? typeof(Array)
+            : throw new InvalidOperationException($"Unsupported argument type {type}")
+          group pair by keyType into g
+          select new KeyValuePair<Type, SortedList<Type, MethodInfo>>(
+            g.Key, new SortedList<Type, MethodInfo>(
+              g.ToDictionary(p => p.Key, p => p.Value), GenericTypeComparer.Default));
+        return genericMethods.ToDictionary(p => p.Key, p => p.Value);
+      });
+    }
+
+    public static MethodInfo WriteValueOf(Type typeArg)
+    {
+      var readValueNoParamMethod =
+        from member in typeof(JSValueWriter).GetMember(
+          nameof(JSValueWriter.WriteValue), BindingFlags.Static | BindingFlags.Public)
+        let method = member as MethodInfo
+        where method != null
+          && method.IsGenericMethod
+          && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+        let parameters = method.GetParameters()
+        where parameters.Length == 2
+          && parameters[0].ParameterType == typeof(IJSValueWriter)
+          && parameters[1].ParameterType.IsGenericParameter
+        select method;
+      return readValueNoParamMethod.First().MakeGenericMethod(typeArg);
+    }
+
+    public static MethodInfo WriteArgsOf(params Type[] typeArgs)
+    {
+      var writeArgsMethod =
+        from member in typeof(JSValueWriter).GetMember(
+          nameof(JSValueWriter.WriteArgs), BindingFlags.Static | BindingFlags.Public)
+        let method = member as MethodInfo
+        let isGeneric = method.IsGenericMethod
+        where method != null
+          && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+        let parameters = method.GetParameters()
+        where parameters.Length == typeArgs.Length + 1
+          && parameters[0].ParameterType == typeof(IJSValueWriter)
+        select isGeneric ? method.MakeGenericMethod(typeArgs) : method;
+      return writeArgsMethod.First();
+    }
+
+    public static MethodInfo WriteErrorOf(Type typeArg)
+    {
+      var writeErrorMethod =
+        from member in typeof(JSValueWriter).GetMember(
+          nameof(JSValueWriter.WriteError), BindingFlags.Static | BindingFlags.Public)
+        let method = member as MethodInfo
+        let isGeneric = method.IsGenericMethod
+        where method != null
+          && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+        let parameters = method.GetParameters()
+        where parameters.Length == 2
+          && parameters[0].ParameterType == typeof(IJSValueWriter)
+        select method.MakeGenericMethod(typeArg);
+      return writeErrorMethod.First();
+    }
+
+    private static MethodInfo MethodOf(string methodName, params Type[] typeArgs) =>
+      typeof(JSValueWriterGenerator).GetMethod(methodName).MakeGenericMethod(typeArgs);
+
+    static TypeWrapper WriteValueDelegateOf(Type typeArg) =>
+      new TypeWrapper(typeof(WriteValueDelegate<>).MakeGenericType(typeArg));
+
+    static MethodInfo WriteObjectPropertyOf(Type typeArg)
+    {
+      var writeObjectProperty =
+        from member in typeof(JSValueWriter).GetMember(
+          nameof(JSValueWriter.WriteObjectProperty), BindingFlags.Static | BindingFlags.Public)
+        let method = member as MethodInfo
+        where method != null
+          && method.IsGenericMethod
+          && method.IsDefined(typeof(ExtensionAttribute), inherit: false)
+        let parameters = method.GetParameters()
+        where parameters.Length == 3
+        && parameters[0].ParameterType == typeof(IJSValueWriter)
+        && parameters[1].ParameterType == typeof(string)
+        select method;
+      return writeObjectProperty.First().MakeGenericMethod(typeArg);
+    }
+
+    static MethodInfo WriteObjectBegin => typeof(IJSValueWriter).GetMethod(nameof(IJSValueWriter.WriteObjectBegin));
+    static MethodInfo WriteObjectEnd => typeof(IJSValueWriter).GetMethod(nameof(IJSValueWriter.WriteObjectEnd));
+    static MethodInfo WriteNull => typeof(IJSValueWriter).GetMethod(nameof(IJSValueWriter.WriteNull));
+
+    public static Delegate GenerateWriteValueDelegate(Type valueType)
+    {
+      return GenerateWriteValueFromExtension(valueType)
+        ?? GenerateWriteValueFromGenericExtension(valueType)
+        ?? GenerateWriteValueForEnum(valueType)
+        ?? GenerateWriteValueForClass(valueType)
+        ?? throw new Exception($"Cannot generate WriteValue delegate for type {valueType}");
+    }
+
+    // Creates a delegate from the WriteValue non-generic extension method
+    private static Delegate GenerateWriteValueFromExtension(Type valueType)
+    {
+      if (s_nonGenericMethods.Value.TryGetValue(valueType, out MethodInfo methodInfo))
+      {
+        return methodInfo.CreateDelegate(typeof(WriteValueDelegate<>).MakeGenericType(valueType));
+      }
+
+      return null;
+    }
+
+    private static Delegate GenerateWriteValueFromGenericExtension(Type valueType)
+    {
+      var keyType = valueType.GetTypeInfo().IsGenericType ? valueType.GetGenericTypeDefinition()
+        : valueType.IsArray ? typeof(Array)
+        : null;
+
+      if (keyType != null
+        && s_genericMethods.Value.TryGetValue(keyType, out SortedList<Type, MethodInfo> candidateMethods))
+      {
+        foreach (var candidateMethod in candidateMethods)
+        {
+          var genericType = candidateMethod.Key;
+          var methodInfo = candidateMethod.Value;
+          var genericArgs = methodInfo.GetGenericArguments();
+          if (TryMatchGenericType(valueType, genericType, genericArgs, out Type[] typeArgs))
+          {
+            var genericMethod = methodInfo.MakeGenericMethod(typeArgs);
+            return genericMethod.CreateDelegate(typeof(WriteValueDelegate<>).MakeGenericType(valueType));
+          }
+        }
+      }
+
+      return null;
+    }
+
+    // It cannot be an extension method because it would conflict with the generic
+    // extension method that uses T value type.
+    public static void WriteEnum<TEnum>(IJSValueWriter writer, TEnum value) where TEnum : Enum
+    {
+      writer.WriteValue((int)(object)value);
+    }
+
+    private static Delegate GenerateWriteValueForEnum(Type valueType)
+    {
+      // Creates a delegate from the WriteEnum method
+      return valueType.GetTypeInfo().IsEnum
+        ? MethodOf(nameof(WriteEnum), valueType).CreateDelegate(typeof(WriteValueDelegate<>).MakeGenericType(valueType))
+        : null;
+    }
+
+    private static Delegate GenerateWriteValueForClass(Type valueType)
+    {
+      // Generate code that looks like:
+      //
+      // (IJSValueWriter writer, Type value) =>
+      // {
+      //   if (value != null) // we do not check it for structs
+      //   {
+      //     writer.WriteObjectBegin();
+      //     writer.WriteObjectProperty("Field1", value.Field1);
+      //     writer.WriteObjectProperty("Field2", value.Field2);
+      //     writer.WriteObjectProperty("Prop1", value.Prop1);
+      //     writer.WriteObjectProperty("Prop2", value.Prop2);
+      //     writer.WriteObjectEnd();
+      //   }
+      //   else
+      //   {
+      //     writer.WriteNull();
+      //   }
+      // }
+
+      var valueTypeInfo = valueType.GetTypeInfo();
+      bool isStruct = valueTypeInfo.IsValueType && !valueTypeInfo.IsEnum;
+      bool isClass = valueTypeInfo.IsClass;
+      if (isStruct || isClass)
+      {
+        var fields =
+          from field in valueType.GetFields(BindingFlags.Public | BindingFlags.Instance)
+          where !field.IsInitOnly
+          select new { field.Name, Type = field.FieldType };
+        var properties =
+          from property in valueType.GetProperties(BindingFlags.Public | BindingFlags.Instance)
+          let propertySetter = property.SetMethod
+          where propertySetter.IsPublic
+          select new { property.Name, Type = property.PropertyType };
+        var members = fields.Concat(properties).ToArray();
+
+        return WriteValueDelegateOf(valueType).CompileLambda(
+          Parameter(typeof(IJSValueWriter), out var writer),
+          Parameter(valueType, out var value),
+          isStruct
+            ? Block(
+                writer.Call(WriteObjectBegin),
+                Block(members.Select(member =>
+                  writer.CallExt(WriteObjectPropertyOf(member.Type), Constant(member.Name), value.Property(member.Name)))),
+                writer.Call(WriteObjectEnd)) as Expression
+            : IfThenElse(NotEqual(value, Constant(null)),
+                ifTrue: Block(
+                  writer.Call(WriteObjectBegin),
+                  Block(members.Select(member =>
+                    writer.CallExt(WriteObjectPropertyOf(member.Type), Constant(member.Name), value.Property(member.Name)))),
+                  writer.Call(WriteObjectEnd)),
+                ifFalse: writer.Call(WriteNull)));
+      }
+
+      return null;
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.projitems b/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.projitems
index bfb612018eb..865bcb22519 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.projitems
+++ b/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.projitems
@@ -10,8 +10,17 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)AttributedViewManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IJSValueTreeReader.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IReactPromise.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JSValue.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JSValueGenerator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)JSValueReader.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JSValueReaderGenerator.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JSValueTreeReader.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JSValueTreeWriter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)JSValueWriter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)JSValueWriterGenerator.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)OneOf.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ReactAttributes.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ReactCallback.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ReactConstantInfo.cs" />
@@ -25,6 +34,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ReactModuleInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ReactPackageProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ReactPackageBuilderExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ReactPromise.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ReactSyncMethodInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewManagerAttributes.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewManagerEvent.cs" />
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/OneOf.cs b/vnext/Microsoft.ReactNative.SharedManaged/OneOf.cs
new file mode 100644
index 00000000000..fc8602b8c56
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/OneOf.cs
@@ -0,0 +1,268 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// OneOf is a class that is similar to C++ std::variant.
+// Due to the Winmdexp.exe we cannot name all cases of this class OneOf<...>.
+// It gives this error: error WME1065: Type names cannot differ only by case.
+
+namespace Microsoft.ReactNative.Managed
+{
+  struct OneOf1<T1>
+  {
+    public OneOf1(T1 value)
+    {
+      Value = value;
+    }
+
+    public static implicit operator OneOf1<T1>(T1 value) => new OneOf1<T1>(value);
+
+    public object Value { get; }
+
+    public bool TryGet<T>(out T value)
+    {
+      bool result = (Value != null && typeof(T) == Value.GetType());
+      value = result ? (T)Value : default;
+      return result;
+    }
+  }
+
+  struct OneOf2<T1, T2>
+  {
+    public OneOf2(T1 value)
+    {
+      Value = value;
+    }
+
+    public OneOf2(T2 value)
+    {
+      Value = value;
+    }
+
+    public static implicit operator OneOf2<T1, T2>(T1 value) => new OneOf2<T1, T2>(value);
+    public static implicit operator OneOf2<T1, T2>(T2 value) => new OneOf2<T1, T2>(value);
+
+    public object Value { get; }
+
+    public bool TryGet<T>(out T value)
+    {
+      bool result = (Value != null && typeof(T) == Value.GetType());
+      value = result ? (T)Value : default;
+      return result;
+    }
+  }
+
+  struct OneOf3<T1, T2, T3>
+  {
+    public OneOf3(T1 value)
+    {
+      Value = value;
+    }
+
+    public OneOf3(T2 value)
+    {
+      Value = value;
+    }
+
+    public OneOf3(T3 value)
+    {
+      Value = value;
+    }
+
+    public static implicit operator OneOf3<T1, T2, T3>(T1 value) => new OneOf3<T1, T2, T3>(value);
+    public static implicit operator OneOf3<T1, T2, T3>(T2 value) => new OneOf3<T1, T2, T3>(value);
+    public static implicit operator OneOf3<T1, T2, T3>(T3 value) => new OneOf3<T1, T2, T3>(value);
+
+    public object Value { get; }
+
+    public bool TryGet<T>(out T value)
+    {
+      bool result = (Value != null && typeof(T) == Value.GetType());
+      value = result ? (T)Value : default;
+      return result;
+    }
+  }
+
+  struct OneOf4<T1, T2, T3, T4>
+  {
+    public OneOf4(T1 value)
+    {
+      Value = value;
+    }
+
+    public OneOf4(T2 value)
+    {
+      Value = value;
+    }
+
+    public OneOf4(T3 value)
+    {
+      Value = value;
+    }
+
+    public OneOf4(T4 value)
+    {
+      Value = value;
+    }
+
+    public static implicit operator OneOf4<T1, T2, T3, T4>(T1 value) => new OneOf4<T1, T2, T3, T4>(value);
+    public static implicit operator OneOf4<T1, T2, T3, T4>(T2 value) => new OneOf4<T1, T2, T3, T4>(value);
+    public static implicit operator OneOf4<T1, T2, T3, T4>(T3 value) => new OneOf4<T1, T2, T3, T4>(value);
+    public static implicit operator OneOf4<T1, T2, T3, T4>(T4 value) => new OneOf4<T1, T2, T3, T4>(value);
+
+    public object Value { get; }
+
+    public bool TryGet<T>(out T value)
+    {
+      bool result = (Value != null && typeof(T) == Value.GetType());
+      value = result ? (T)Value : default;
+      return result;
+    }
+  }
+
+  struct OneOf5<T1, T2, T3, T4, T5>
+  {
+    public OneOf5(T1 value)
+    {
+      Value = value;
+    }
+
+    public OneOf5(T2 value)
+    {
+      Value = value;
+    }
+
+    public OneOf5(T3 value)
+    {
+      Value = value;
+    }
+
+    public OneOf5(T4 value)
+    {
+      Value = value;
+    }
+
+    public OneOf5(T5 value)
+    {
+      Value = value;
+    }
+
+    public static implicit operator OneOf5<T1, T2, T3, T4, T5>(T1 value) => new OneOf5<T1, T2, T3, T4, T5>(value);
+    public static implicit operator OneOf5<T1, T2, T3, T4, T5>(T2 value) => new OneOf5<T1, T2, T3, T4, T5>(value);
+    public static implicit operator OneOf5<T1, T2, T3, T4, T5>(T3 value) => new OneOf5<T1, T2, T3, T4, T5>(value);
+    public static implicit operator OneOf5<T1, T2, T3, T4, T5>(T4 value) => new OneOf5<T1, T2, T3, T4, T5>(value);
+    public static implicit operator OneOf5<T1, T2, T3, T4, T5>(T5 value) => new OneOf5<T1, T2, T3, T4, T5>(value);
+
+    public object Value { get; }
+
+    public bool TryGet<T>(out T value)
+    {
+      bool result = (Value != null && typeof(T) == Value.GetType());
+      value = result ? (T)Value : default;
+      return result;
+    }
+  }
+
+  struct OneOf6<T1, T2, T3, T4, T5, T6>
+  {
+    public OneOf6(T1 value)
+    {
+      Value = value;
+    }
+
+    public OneOf6(T2 value)
+    {
+      Value = value;
+    }
+
+    public OneOf6(T3 value)
+    {
+      Value = value;
+    }
+
+    public OneOf6(T4 value)
+    {
+      Value = value;
+    }
+
+    public OneOf6(T5 value)
+    {
+      Value = value;
+    }
+
+    public OneOf6(T6 value)
+    {
+      Value = value;
+    }
+
+    public static implicit operator OneOf6<T1, T2, T3, T4, T5, T6>(T1 value) => new OneOf6<T1, T2, T3, T4, T5, T6>(value);
+    public static implicit operator OneOf6<T1, T2, T3, T4, T5, T6>(T2 value) => new OneOf6<T1, T2, T3, T4, T5, T6>(value);
+    public static implicit operator OneOf6<T1, T2, T3, T4, T5, T6>(T3 value) => new OneOf6<T1, T2, T3, T4, T5, T6>(value);
+    public static implicit operator OneOf6<T1, T2, T3, T4, T5, T6>(T4 value) => new OneOf6<T1, T2, T3, T4, T5, T6>(value);
+    public static implicit operator OneOf6<T1, T2, T3, T4, T5, T6>(T5 value) => new OneOf6<T1, T2, T3, T4, T5, T6>(value);
+    public static implicit operator OneOf6<T1, T2, T3, T4, T5, T6>(T6 value) => new OneOf6<T1, T2, T3, T4, T5, T6>(value);
+
+    public object Value { get; }
+
+    public bool TryGet<T>(out T value)
+    {
+      bool result = (Value != null && typeof(T) == Value.GetType());
+      value = result ? (T)Value : default;
+      return result;
+    }
+  }
+
+  struct OneOf7<T1, T2, T3, T4, T5, T6, T7>
+  {
+    public OneOf7(T1 value)
+    {
+      Value = value;
+    }
+
+    public OneOf7(T2 value)
+    {
+      Value = value;
+    }
+
+    public OneOf7(T3 value)
+    {
+      Value = value;
+    }
+
+    public OneOf7(T4 value)
+    {
+      Value = value;
+    }
+
+    public OneOf7(T5 value)
+    {
+      Value = value;
+    }
+
+    public OneOf7(T6 value)
+    {
+      Value = value;
+    }
+
+    public OneOf7(T7 value)
+    {
+      Value = value;
+    }
+
+    public static implicit operator OneOf7<T1, T2, T3, T4, T5, T6, T7>(T1 value) => new OneOf7<T1, T2, T3, T4, T5, T6, T7>(value);
+    public static implicit operator OneOf7<T1, T2, T3, T4, T5, T6, T7>(T2 value) => new OneOf7<T1, T2, T3, T4, T5, T6, T7>(value);
+    public static implicit operator OneOf7<T1, T2, T3, T4, T5, T6, T7>(T3 value) => new OneOf7<T1, T2, T3, T4, T5, T6, T7>(value);
+    public static implicit operator OneOf7<T1, T2, T3, T4, T5, T6, T7>(T4 value) => new OneOf7<T1, T2, T3, T4, T5, T6, T7>(value);
+    public static implicit operator OneOf7<T1, T2, T3, T4, T5, T6, T7>(T5 value) => new OneOf7<T1, T2, T3, T4, T5, T6, T7>(value);
+    public static implicit operator OneOf7<T1, T2, T3, T4, T5, T6, T7>(T6 value) => new OneOf7<T1, T2, T3, T4, T5, T6, T7>(value);
+    public static implicit operator OneOf7<T1, T2, T3, T4, T5, T6, T7>(T7 value) => new OneOf7<T1, T2, T3, T4, T5, T6, T7>(value);
+
+    public object Value { get; }
+
+    public bool TryGet<T>(out T value)
+    {
+      bool result = (Value != null && typeof(T) == Value.GetType());
+      value = result ? (T)Value : default;
+      return result;
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactAttributes.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactAttributes.cs
index 431788907d8..7028f224e56 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactAttributes.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactAttributes.cs
@@ -57,7 +57,7 @@ public ReactSyncMethodAttribute(string methodName = null)
     public string MethodName { get; private set; }
   }
 
-  [AttributeUsage(AttributeTargets.Property)]
+  [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
   class ReactEventAttribute : Attribute
   {
     public ReactEventAttribute(string eventName = null)
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantInfo.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantInfo.cs
index 4f2dfbb1120..72b4014ef94 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantInfo.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantInfo.cs
@@ -3,9 +3,11 @@
 
 using Microsoft.ReactNative.Bridge;
 using System;
-using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
+using static Microsoft.ReactNative.Managed.JSValueGenerator;
+using static Microsoft.ReactNative.Managed.JSValueWriterGenerator;
+using static System.Linq.Expressions.Expression;
 
 namespace Microsoft.ReactNative.Managed
 {
@@ -14,41 +16,47 @@ class ReactConstantInfo
     public ReactConstantInfo(PropertyInfo propertyInfo, ReactConstantAttribute constantAttribute)
     {
       ConstantName = constantAttribute.ConstantName ?? propertyInfo.Name;
-      ConstantImpl = new Lazy<ReactConstantImpl>(() => MakePropertyConstant(propertyInfo), LazyThreadSafetyMode.PublicationOnly);
+      ConstantImpl = new Lazy<ReactConstantImpl>(() => MakeConstant(propertyInfo), LazyThreadSafetyMode.PublicationOnly);
     }
 
     public ReactConstantInfo(FieldInfo fieldInfo, ReactConstantAttribute constantAttribute)
     {
       ConstantName = constantAttribute.ConstantName ?? fieldInfo.Name;
-      ConstantImpl = new Lazy<ReactConstantImpl>(() => MakeFieldConstant(fieldInfo), LazyThreadSafetyMode.PublicationOnly);
+      ConstantImpl = new Lazy<ReactConstantImpl>(() => MakeConstant(fieldInfo), LazyThreadSafetyMode.PublicationOnly);
     }
 
-    private ReactConstantImpl MakePropertyConstant(PropertyInfo propertyInfo)
+    private ReactConstantImpl MakeConstant(PropertyInfo propertyInfo)
     {
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression writerParameter = Expression.Parameter(typeof(IJSValueWriter), "writer");
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueWriter outputWriter) =>
+      // {
+      //   outputWriter.WriteValue((module as MyModule).constantProperty);
+      // };
 
       bool isStatic = propertyInfo.GetGetMethod().IsStatic;
-      Type propertyType = propertyInfo.PropertyType;
-      var constantProperty = Expression.Property(isStatic ? null : Expression.Convert(moduleParameter, propertyInfo.DeclaringType), propertyInfo);
-      var writeValueCall = Expression.Call(null, JSValueWriter.GetWriteValueMethod(propertyType), writerParameter, constantProperty);
-      var lambda = Expression.Lambda<ReactConstantImpl>(writeValueCall, moduleParameter, writerParameter);
-
-      return lambda.Compile();
+      return CompileLambda<ReactConstantImpl>(
+        Parameter(typeof(object), out var module),
+        Parameter(typeof(IJSValueWriter), out var outputWriter),
+          outputWriter.CallExt(WriteValueOf(propertyInfo.PropertyType),
+            Property(isStatic ? null : module.CastTo(propertyInfo.DeclaringType), propertyInfo)));
     }
 
-    private ReactConstantImpl MakeFieldConstant(FieldInfo fieldInfo)
+    private ReactConstantImpl MakeConstant(FieldInfo fieldInfo)
     {
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression writerParameter = Expression.Parameter(typeof(IJSValueWriter), "writer");
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueWriter outputWriter) =>
+      // {
+      //   outputWriter.WriteValue((module as MyModule).constantField);
+      // });
 
       bool isStatic = fieldInfo.IsStatic;
-      Type fieldType = fieldInfo.FieldType;
-      var constantField = Expression.Field(isStatic ? null : Expression.Convert(moduleParameter, fieldInfo.DeclaringType), fieldInfo);
-      var writeValueCall = Expression.Call(null, JSValueWriter.GetWriteValueMethod(fieldType), writerParameter, constantField);
-      var lambda = Expression.Lambda<ReactConstantImpl>(writeValueCall, moduleParameter, writerParameter);
-
-      return lambda.Compile();
+      return CompileLambda<ReactConstantImpl>(
+        Parameter(typeof(object), out var module),
+        Parameter(typeof(IJSValueWriter), out var outputWriter),
+          outputWriter.CallExt(WriteValueOf(fieldInfo.FieldType),
+            Field(isStatic ? null : module.CastTo(fieldInfo.DeclaringType), fieldInfo)));
     }
 
     public delegate void ReactConstantImpl(object module, IJSValueWriter writer);
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProvider.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProvider.cs
index 4326e5cafce..238bcf19718 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProvider.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProvider.cs
@@ -14,7 +14,7 @@ public ReactConstantProvider(IJSValueWriter writer)
 
     public void Add<T>(string constantName, T value)
     {
-      m_writer.WriteProperty(constantName, value);
+      m_writer.WriteObjectProperty(constantName, value);
     }
 
     private IJSValueWriter m_writer;
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProviderInfo.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProviderInfo.cs
index c4bc0a0b0fd..3c63b592c1b 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProviderInfo.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactConstantProviderInfo.cs
@@ -3,38 +3,41 @@
 
 using Microsoft.ReactNative.Bridge;
 using System;
-using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
-using ReflectionMethodInfo = System.Reflection.MethodInfo;
+using static Microsoft.ReactNative.Managed.JSValueGenerator;
+using static System.Linq.Expressions.Expression;
 
 namespace Microsoft.ReactNative.Managed
 {
   class ReactConstantProviderInfo
   {
-    public ReactConstantProviderInfo(ReflectionMethodInfo methodInfo)
+    public ReactConstantProviderInfo(MethodInfo methodInfo)
     {
-      ConstantProviderImpl = new Lazy<ReactConstantProviderImpl>(() => MakeConstantProvider(methodInfo), LazyThreadSafetyMode.PublicationOnly);
-    }
-
-    private ReactConstantProviderImpl MakeConstantProvider(ReflectionMethodInfo methodInfo)
-    {
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression constantProviderParameter = Expression.Parameter(typeof(ReactConstantProvider), "constantProvider");
-
       ParameterInfo[] parameters = methodInfo.GetParameters();
       if (parameters.Length != 1 || parameters[0].ParameterType != typeof(ReactConstantProvider))
       {
         throw new ArgumentException($"Constant provider method must have one parameter of ReactConstantProvider type."
-            + $" Module: {methodInfo.DeclaringType.FullName} {methodInfo.Name}");
+          + $" Module: {methodInfo.DeclaringType.FullName} Method: {methodInfo.Name}");
       }
 
-      bool isStatic = methodInfo.IsStatic;
+      ConstantProviderImpl = new Lazy<ReactConstantProviderImpl>(() => MakeConstantProvider(methodInfo), LazyThreadSafetyMode.PublicationOnly);
+    }
 
-      var constantProviderCall = Expression.Call(isStatic ? null : Expression.Convert(moduleParameter, methodInfo.DeclaringType), methodInfo, constantProviderParameter);
-      var lambda = Expression.Lambda<ReactConstantProviderImpl>(constantProviderCall, moduleParameter, constantProviderParameter);
+    private ReactConstantProviderImpl MakeConstantProvider(MethodInfo methodInfo)
+    {
+      // Generate code that looks like:
+      //
+      // (object module, ReactConstantProvider constantProvider) =>
+      // {
+      //   (module as MyModule).constantProviderMethod(constantProvider);
+      // });
 
-      return lambda.Compile();
+      bool isStatic = methodInfo.IsStatic;
+      return CompileLambda<ReactConstantProviderImpl>(
+        Parameter(typeof(object), out var module),
+        Parameter(typeof(ReactConstantProvider), out var constantProvider),
+        Call(isStatic ? null : module.CastTo(methodInfo.DeclaringType), methodInfo, constantProvider));
     }
 
     public delegate void ReactConstantProviderImpl(object module, ReactConstantProvider constantProvider);
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactEvent.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactEvent.cs
index 14dc4f6e24b..1e90340c824 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactEvent.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactEvent.cs
@@ -1,7 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.ReactNative.Bridge;
+
 namespace Microsoft.ReactNative.Managed
 {
+  // The ReactEvent<T> makes it explicit that a field is an event.
+  // Though, it is perfectly fine to use Action<T>, or any other delegate with the same signature.
   delegate void ReactEvent<T>(T value);
+
+  // A helper class to initialize event handlers.
+  // See the ReactEventInfo.MakeEvent for usage.
+  static class ReactEventHelper
+  {
+    public static ReactArgWriter ArgWriter<T>(T arg) => (IJSValueWriter writer) => writer.WriteValue(arg);
+  }
 }
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactEventInfo.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactEventInfo.cs
index 0f415bbd17a..11017c33afb 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactEventInfo.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactEventInfo.cs
@@ -3,10 +3,10 @@
 
 using Microsoft.ReactNative.Bridge;
 using System;
-using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
-using ReflectionMethodInfo = System.Reflection.MethodInfo;
+using static Microsoft.ReactNative.Managed.JSValueGenerator;
+using static System.Linq.Expressions.Expression;
 
 namespace Microsoft.ReactNative.Managed
 {
@@ -15,56 +15,70 @@ class ReactEventInfo
     public ReactEventInfo(PropertyInfo propertyInfo, ReactEventAttribute eventAttribute)
     {
       EventName = eventAttribute.EventName ?? propertyInfo.Name;
+      var eventArgType = GetEventArgType(propertyInfo.PropertyType,
+        formatError: message => $"{message} Module: {propertyInfo.DeclaringType.Name}, Field: {propertyInfo.Name}");
+      EventImpl = new Lazy<ReactEventImpl>(() => MakeEvent(propertyInfo, eventArgType), LazyThreadSafetyMode.PublicationOnly);
+    }
+
+    public ReactEventInfo(FieldInfo fieldInfo, ReactEventAttribute eventAttribute)
+    {
+      EventName = eventAttribute.EventName ?? fieldInfo.Name;
+      var eventArgType = GetEventArgType(fieldInfo.FieldType,
+        formatError: message => $"{message} Module: {fieldInfo.DeclaringType.Name}, Field: {fieldInfo.Name}");
+      EventImpl = new Lazy<ReactEventImpl>(() => MakeEvent(fieldInfo, eventArgType), LazyThreadSafetyMode.PublicationOnly);
+    }
 
-      Type propertyType = propertyInfo.PropertyType;
-      if (!typeof(Delegate).IsAssignableFrom(propertyType))
+    private static Type GetEventArgType(Type eventType, Func<string, string> formatError)
+    {
+      if (!typeof(Delegate).IsAssignableFrom(eventType))
       {
-        throw new ArgumentException("React event must be a delegate", propertyInfo.Name);
+        throw new InvalidOperationException(formatError("React event must be a delegate."));
       }
-      ReflectionMethodInfo eventDelegateMethod = propertyType.GetMethod("Invoke");
+
+      MethodInfo eventDelegateMethod = eventType.GetMethod("Invoke");
       ParameterInfo[] parameters = eventDelegateMethod.GetParameters();
       if (parameters.Length != 1)
       {
-        throw new ArgumentException($"React event delegate must have one parameter. Module: {propertyInfo.DeclaringType.FullName}, Event: {propertyInfo.Name}");
+        throw new InvalidOperationException(formatError("React event delegate must have one parameter."));
       }
-      EventImpl = new Lazy<ReactEventImpl>(() => MakeEvent(propertyInfo, parameters[0]), LazyThreadSafetyMode.PublicationOnly);
+
+      return parameters[0].ParameterType;
     }
 
-    private ReactEventImpl MakeEvent(PropertyInfo propertyInfo, ParameterInfo parameter)
+    private ReactEventImpl MakeEvent(PropertyInfo propertyInfo, Type eventArgType)
     {
-      // We need to create a delegate that can assign correct delegate to the event property.
-      // This is the shape of the generated code:
-      //
-      //(object module, RaiseEvent raiseEvent) =>
-      //{
-      //  ((MyModule)module).eventProperty = (ArgType arg) =>
-      //  {
-      //    raiseEvent((IJSValueWriter argWriter) => WriteValue(argWriter, arg));
-      //  };
-      //});
+      // Generate code that looks like:
       //
+      // (object module, ReactEventHandler eventHandler) =>
+      // {
+      //   (module as MyModule).eventProperty = (ArgType arg) => eventHandler(ReactEvent.ArgWriter(arg));
+      // });
 
-      // Input parameters for generated lambda
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression raiseEventParameter = Expression.Parameter(typeof(ReactEventHandler), "eventHandler");
-
-      // Create a lambda to be passed to raiseEvent
-      ParameterExpression argParameter = Expression.Parameter(parameter.ParameterType, "arg");
-      ParameterExpression argWriterParameter = Expression.Parameter(typeof(IJSValueWriter), "argWriter");
-      var writeValueCall = Expression.Call(null, JSValueWriter.GetWriteValueMethod(parameter.ParameterType), argWriterParameter, argParameter);
-      var eventHandlerLambda = Expression.Lambda<ReactArgWriter>(writeValueCall, argWriterParameter);
-
-      // Create a lambda that we assign to the event property
-      var raiseEventCall = Expression.Invoke(raiseEventParameter, eventHandlerLambda);
-      var eventLambda = Expression.Lambda(propertyInfo.PropertyType, raiseEventCall, argParameter);
+      return CompileLambda<ReactEventImpl>(
+        Parameter(typeof(object), out var module),
+        Parameter(typeof(ReactEventHandler), out var eventHandler),
+        module.CastTo(propertyInfo.DeclaringType).SetProperty(propertyInfo,
+          AutoLambda(propertyInfo.PropertyType,
+            Parameter(eventArgType, out var arg),
+            eventHandler.Invoke(Call(ArgWriterOf(eventArgType), arg)))));
+    }
 
-      // Create lambda that we return and which assigns the event property
-      var eventProperty = Expression.Property(Expression.Convert(moduleParameter, propertyInfo.DeclaringType), propertyInfo);
-      var eventPropertyAssignment = Expression.Assign(eventProperty, eventLambda);
-      var lambda = Expression.Lambda<ReactEventImpl>(eventPropertyAssignment, moduleParameter, raiseEventParameter);
+    private ReactEventImpl MakeEvent(FieldInfo fieldInfo, Type eventArgType)
+    {
+      // Generate code that looks like:
+      //
+      // (object module, ReactEventHandler eventHandler) =>
+      // {
+      //   (module as MyModule).eventField = (ArgType arg) => eventHandler(ReactEvent.ArgWriter(arg));
+      // });
 
-      // Compile and return the lambda
-      return lambda.Compile();
+      return CompileLambda<ReactEventImpl>(
+        Parameter(typeof(object), out var module),
+        Parameter(typeof(ReactEventHandler), out var eventHandler),
+        module.CastTo(fieldInfo.DeclaringType).SetField(fieldInfo,
+          AutoLambda(fieldInfo.FieldType,
+            Parameter(eventArgType, out var arg),
+            eventHandler.Invoke(Call(ArgWriterOf(eventArgType), arg)))));
     }
 
     public delegate void ReactEventImpl(object module, ReactEventHandler eventHandler);
@@ -75,10 +89,11 @@ private ReactEventImpl MakeEvent(PropertyInfo propertyInfo, ParameterInfo parame
 
     public void AddToModuleBuilder(IReactModuleBuilder moduleBuilder, object module)
     {
-      moduleBuilder.AddEventHandlerSetter(EventName, (ReactEventHandler eventHandler) =>
-      {
-        EventImpl.Value(module, eventHandler);
-      });
+      moduleBuilder.AddEventHandlerSetter(EventName,
+        (ReactEventHandler eventHandler) => EventImpl.Value(module, eventHandler));
     }
+
+    static MethodInfo ArgWriterOf(Type typeArg) =>
+      typeof(ReactEventHelper).GetMethod(nameof(ReactEventHelper.ArgWriter)).MakeGenericMethod(typeArg);
   }
 }
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactMethodInfo.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactMethodInfo.cs
index e72b54bb78b..72a802372d3 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactMethodInfo.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactMethodInfo.cs
@@ -2,304 +2,204 @@
 // Licensed under the MIT License.
 
 using Microsoft.ReactNative.Bridge;
-using Microsoft.ReactNative.Managed.Linq;
 using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
-using ReflectionMethodInfo = System.Reflection.MethodInfo;
+using static Microsoft.ReactNative.Managed.JSValueGenerator;
+using static Microsoft.ReactNative.Managed.JSValueReaderGenerator;
+using static Microsoft.ReactNative.Managed.JSValueWriterGenerator;
+using static System.Linq.Expressions.Expression;
 
 namespace Microsoft.ReactNative.Managed
 {
   class ReactMethodInfo
   {
-    public ReactMethodInfo(ReflectionMethodInfo methodInfo, ReactMethodAttribute methodAttribute)
+    public ReactMethodInfo(MethodInfo methodInfo, ReactMethodAttribute methodAttribute)
     {
       MethodName = methodAttribute.MethodName ?? methodInfo.Name;
 
       Type returnType = methodInfo.ReturnType;
       ParameterInfo[] parameters = methodInfo.GetParameters();
-      if (returnType != typeof(void))
-      {
-        MethodReturnType = MethodReturnType.Callback;
-        MethodImpl = new Lazy<ReactMethodImpl>(() => MakeReturningMethod(methodInfo, returnType, parameters), LazyThreadSafetyMode.PublicationOnly);
-      }
-      else
+      Type lastParameterType = parameters.Length > 0 ? parameters[parameters.Length - 1].ParameterType : null;
+      Type secondToLastParameterType = parameters.Length > 1 ? parameters[parameters.Length - 2].ParameterType : null;
+      Func<ReactMethodImpl> createMethod;
+
+      bool isPromise(Type type)
       {
-        if (parameters.Length > 0 && typeof(Delegate).IsAssignableFrom(parameters[parameters.Length - 1].ParameterType))
+        var typeInfo = type?.GetTypeInfo();
+        if (typeInfo != null && typeInfo.IsGenericType)
         {
-          if (parameters.Length > 1 && typeof(Delegate).IsAssignableFrom(parameters[parameters.Length - 2].ParameterType))
-          {
-            MethodReturnType = MethodReturnType.Promise;
-            MethodImpl = new Lazy<ReactMethodImpl>(() => MakePromiseMethod(methodInfo, parameters), LazyThreadSafetyMode.PublicationOnly);
-          }
-          else
+          var genericArgs = type.GetGenericArguments();
+          if (genericArgs.Length == 1)
           {
-            MethodReturnType = MethodReturnType.Callback;
-            MethodImpl = new Lazy<ReactMethodImpl>(() => MakeCallbackMethod(methodInfo, parameters), LazyThreadSafetyMode.PublicationOnly);
+            return typeof(IReactPromise<>).MakeGenericType(genericArgs).IsAssignableFrom(type);
           }
         }
-        else
-        {
-          MethodReturnType = MethodReturnType.Void;
-          MethodImpl = new Lazy<ReactMethodImpl>(() => MakeFireAndForgetMethod(methodInfo, parameters), LazyThreadSafetyMode.PublicationOnly);
-        }
-      }
-    }
-
-    private ReactMethodImpl MakeFireAndForgetMethod(ReflectionMethodInfo methodInfo, ParameterInfo[] parameters)
-    {
-      // Input parameters for generated lambda
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression inputReaderParameter = Expression.Parameter(typeof(IJSValueReader), "inputReader");
-      ParameterExpression outputWriterParameter = Expression.Parameter(typeof(IJSValueWriter), "outputWriter");
-      ParameterExpression resolveParameter = Expression.Parameter(typeof(MethodResultCallback), "resolve");
-      ParameterExpression rejectParameter = Expression.Parameter(typeof(MethodResultCallback), "reject");
-
-      // Input variables to read from inputReader
-      ParameterExpression[] inputVariables = new ParameterExpression[parameters.Length];
-      for (int i = 0; i < inputVariables.Length; ++i)
-      {
-        inputVariables[i] = Expression.Variable(parameters[i].ParameterType, parameters[i].Name);
+        return false;
       }
 
-      // Statements of the generated lambda
-      List<Expression> statements = new List<Expression>();
+      bool isCallback(Type type) => type != null && typeof(Delegate).IsAssignableFrom(type);
 
-      // Generate code to read input variables from the inputReader
-      var callReadNext = Expression.Call(inputReaderParameter, typeof(IJSValueReader).GetMethod("ReadNext"));
-      statements.Add(callReadNext);
-      foreach (ParameterExpression variable in inputVariables)
+      if (returnType != typeof(void))
       {
-        statements.Add(callReadNext);
-        statements.Add(Expression.Call(null, JSValueReader.GetReadValueMethod(variable.Type), inputReaderParameter, variable));
+        MethodReturnType = MethodReturnType.Callback;
+        createMethod = () => MakeReturningMethod(methodInfo, returnType, parameters);
       }
-
-      // Generate code to call the method
-      statements.Add(Expression.Call(
-          Expression.Convert(moduleParameter, methodInfo.DeclaringType),
-          methodInfo,
-          inputVariables));
-
-      // Generate the lambda to return
-      var lambda = Expression.Lambda<ReactMethodImpl>(
-          Expression.Block(inputVariables, statements),
-          moduleParameter, inputReaderParameter, outputWriterParameter, resolveParameter, rejectParameter);
-
-      // Compile and return the lambda
-      return lambda.Compile();
-    }
-
-    private ReactMethodImpl MakeCallbackMethod(ReflectionMethodInfo methodInfo, ParameterInfo[] parameters)
-    {
-      // The last variable is a delegate
-
-      // Input parameters for generated lambda
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression inputReaderParameter = Expression.Parameter(typeof(IJSValueReader), "inputReader");
-      ParameterExpression outputWriterParameter = Expression.Parameter(typeof(IJSValueWriter), "outputWriter");
-      ParameterExpression resolveParameter = Expression.Parameter(typeof(MethodResultCallback), "resolve");
-      ParameterExpression rejectParameter = Expression.Parameter(typeof(MethodResultCallback), "reject");
-
-      // Input variables to read from inputReader
-      ParameterExpression[] inputVariables = new ParameterExpression[parameters.Length - 1];
-      for (int i = 0; i < inputVariables.Length; ++i)
+      else if (isPromise(lastParameterType))
       {
-        inputVariables[i] = Expression.Variable(parameters[i].ParameterType, parameters[i].Name);
+        MethodReturnType = MethodReturnType.Promise;
+        createMethod = () => MakePromiseMethod(methodInfo, parameters);
       }
-
-      // Generate the resolve delegate
-      var inputResolveParameter = parameters[parameters.Length - 1];
-      var resolveMethodInfo = inputResolveParameter.ParameterType.GetMethod("Invoke");
-      ParameterInfo[] resolveMethodParameters = resolveMethodInfo.GetParameters();
-      if (resolveMethodParameters.Length != 1)
+      else if (isCallback(lastParameterType))
       {
-        throw new ArgumentException($"Resolve callback type must have one parameter. Method: {MethodName}, Parameter: {inputResolveParameter.Name}");
+        if (isCallback(secondToLastParameterType))
+        {
+          MethodReturnType = MethodReturnType.TwoCallbacks;
+          createMethod = () => MakeTwoCallbacksMethod(methodInfo, parameters);
+        }
+        else
+        {
+          MethodReturnType = MethodReturnType.Callback;
+          createMethod = () => MakeCallbackMethod(methodInfo, parameters);
+        }
       }
-      Type resolveParameterType = resolveMethodParameters[0].ParameterType;
-      ParameterExpression resolveLambdaParameter = Expression.Parameter(resolveParameterType, "value");
-
-      List<Expression> resolveStatements = new List<Expression>();
-      resolveStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayBegin")));
-      resolveStatements.Add(Expression.Call(null, JSValueWriter.GetWriteValueMethod(resolveParameterType), outputWriterParameter, resolveLambdaParameter));
-      resolveStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayEnd")));
-      resolveStatements.Add(Expression.Invoke(resolveParameter, outputWriterParameter));
-      var resolveLambda = Expression.Lambda(inputResolveParameter.ParameterType, Expression.Block(resolveStatements), resolveLambdaParameter);
-
-      // Statements of the generated lambda
-      List<Expression> statements = new List<Expression>();
-
-      // Generate code to read input variables from the inputReader
-      var callReadNext = Expression.Call(inputReaderParameter, typeof(IJSValueReader).GetMethod("ReadNext"));
-      statements.Add(callReadNext);
-      foreach (ParameterExpression variable in inputVariables)
+      else
       {
-        statements.Add(callReadNext);
-        statements.Add(Expression.Call(null, JSValueReader.GetReadValueMethod(variable.Type), inputReaderParameter, variable));
+        MethodReturnType = MethodReturnType.Void;
+        createMethod = () => MakeFireAndForgetMethod(methodInfo, parameters);
       }
 
-      // Generate code to call the method
-      statements.Add(Expression.Call(
-          Expression.Convert(moduleParameter, methodInfo.DeclaringType),
-          methodInfo,
-          (inputVariables as IEnumerable<Expression>).Append(resolveLambda)));
-
-      // Generate the lambda to return
-      var lambda = Expression.Lambda<ReactMethodImpl>(
-          Expression.Block(inputVariables, statements),
-          moduleParameter, inputReaderParameter, outputWriterParameter, resolveParameter, rejectParameter);
-
-      // Compile and return the lambda
-      return lambda.Compile();
+      MethodImpl = new Lazy<ReactMethodImpl>(createMethod, LazyThreadSafetyMode.PublicationOnly);
     }
 
-    private ReactMethodImpl MakePromiseMethod(ReflectionMethodInfo methodInfo, ParameterInfo[] parameters)
+    static VariableWrapper[] MethodParameters(
+      out VariableWrapper module,
+      out VariableWrapper inputReader,
+      out VariableWrapper outputWriter,
+      out VariableWrapper resolve,
+      out VariableWrapper reject)
     {
-      // The last two variables are delegates
-
-      // Input parameters for generated lambda
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression inputReaderParameter = Expression.Parameter(typeof(IJSValueReader), "inputReader");
-      ParameterExpression outputWriterParameter = Expression.Parameter(typeof(IJSValueWriter), "outputWriter");
-      ParameterExpression resolveParameter = Expression.Parameter(typeof(MethodResultCallback), "resolve");
-      ParameterExpression rejectParameter = Expression.Parameter(typeof(MethodResultCallback), "reject");
-
-      // Input variables to read from inputReader
-      ParameterExpression[] inputVariables = new ParameterExpression[parameters.Length - 2];
-      for (int i = 0; i < inputVariables.Length; ++i)
-      {
-        inputVariables[i] = Expression.Variable(parameters[i].ParameterType, parameters[i].Name);
-      }
-
-      // Generate the resolve delegate
-      var inputResolveParameter = parameters[parameters.Length - 2];
-      var resolveMethodInfo = inputResolveParameter.ParameterType.GetMethod("Invoke");
-      ParameterInfo[] resolveMethodParameters = resolveMethodInfo.GetParameters();
-      if (resolveMethodParameters.Length != 1)
-      {
-        throw new ArgumentException($"Resolve callback type must have one parameter. Method: {MethodName}, Parameter: {inputResolveParameter.Name}");
-      }
-      Type resolveParameterType = resolveMethodParameters[0].ParameterType;
-      ParameterExpression resolveLambdaParameter = Expression.Parameter(resolveParameterType, "value");
-
-      List<Expression> resolveStatements = new List<Expression>();
-      resolveStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayBegin")));
-      resolveStatements.Add(Expression.Call(null, JSValueWriter.GetWriteValueMethod(resolveParameterType), outputWriterParameter, resolveLambdaParameter));
-      resolveStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayEnd")));
-      resolveStatements.Add(Expression.Invoke(resolveParameter, outputWriterParameter));
-      var resolveLambda = Expression.Lambda(inputResolveParameter.ParameterType, Expression.Block(resolveStatements), resolveLambdaParameter);
-
-      // Generate the reject delegate
-      var inputRejectParameter = parameters[parameters.Length - 1];
-      var rejectMethodInfo = inputRejectParameter.ParameterType.GetMethod("Invoke");
-      ParameterInfo[] rejectMethodParameters = rejectMethodInfo.GetParameters();
-      if (rejectMethodParameters.Length != 1)
-      {
-        throw new ArgumentException($"Reject callback type must have one parameter. Method: {MethodName}, Parameter: {inputRejectParameter.Name}");
-      }
-      Type rejectParameterType = rejectMethodParameters[0].ParameterType;
-      ParameterExpression rejectLambdaParameter = Expression.Parameter(rejectParameterType, "error");
-
-      List<Expression> rejectStatements = new List<Expression>();
-      rejectStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayBegin")));
-      if (rejectLambdaParameter.Type == typeof(string))
-      {
-        rejectStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteObjectBegin")));
-        rejectStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WritePropertyName"), Expression.Constant("message")));
-        rejectStatements.Add(Expression.Call(null, JSValueWriter.GetWriteValueMethod(rejectParameterType), outputWriterParameter, rejectLambdaParameter));
-        rejectStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteObjectEnd")));
-      }
-      else
-      {
-        rejectStatements.Add(Expression.Call(null, JSValueWriter.GetWriteValueMethod(rejectParameterType), outputWriterParameter, rejectLambdaParameter));
-      }
-      rejectStatements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayEnd")));
-      rejectStatements.Add(Expression.Invoke(rejectParameter, outputWriterParameter));
-      var rejectLambda = Expression.Lambda(inputRejectParameter.ParameterType, Expression.Block(rejectStatements), rejectLambdaParameter);
-
-      // Statements of the generated lambda
-      List<Expression> statements = new List<Expression>();
-
-      // Generate code to read input variables from the inputReader
-      var callReadNext = Expression.Call(inputReaderParameter, typeof(IJSValueReader).GetMethod("ReadNext"));
-      statements.Add(callReadNext);
-      foreach (ParameterExpression variable in inputVariables)
-      {
-        statements.Add(callReadNext);
-        statements.Add(Expression.Call(null, JSValueReader.GetReadValueMethod(variable.Type), inputReaderParameter, variable));
-      }
-
-      // Generate code to call the method
-      statements.Add(Expression.Call(
-          Expression.Convert(moduleParameter, methodInfo.DeclaringType),
-          methodInfo,
-          (inputVariables as IEnumerable<Expression>).Append(resolveLambda).Append(rejectLambda)));
+      var result = new VariableWrapper[5];
+      result[0] = Parameter(typeof(object), out module);
+      result[1] = Parameter(typeof(IJSValueReader), out inputReader);
+      result[2] = Parameter(typeof(IJSValueWriter), out outputWriter);
+      result[3] = Parameter(typeof(MethodResultCallback), out resolve);
+      result[4] = Parameter(typeof(MethodResultCallback), out reject);
+      return result;
+    }
 
-      // Generate the lambda to return
-      var lambda = Expression.Lambda<ReactMethodImpl>(
-          Expression.Block(inputVariables, statements),
-          moduleParameter, inputReaderParameter, outputWriterParameter, resolveParameter, rejectParameter);
+    static ConstructorInfo ReactPromiseCtorOf(Type type) =>
+      typeof(ReactPromise<>).MakeGenericType(type).GetConstructor(new Type[] {
+        typeof(IJSValueWriter), typeof(MethodResultCallback), typeof(MethodResultCallback) });
 
-      // Compile and return the lambda
-      return lambda.Compile();
+    private ReactMethodImpl MakeFireAndForgetMethod(MethodInfo methodInfo, ParameterInfo[] parameters)
+    {
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueReader inputReader, IJSValueWriter outputWriter,
+      //    MethodResultCallback resolve, MethodResultCallback reject) =>
+      // {
+      //   inputReader.ReadArgs(out ArgType0 arg0, out ArgType1 arg1);
+      //   (module as ModuleType).Method(arg0, arg1);
+      // }
+
+      return CompileLambda<ReactMethodImpl>(
+        MethodParameters(out var module, out var inputReader, out _, out _, out _),
+        MethodArgs(parameters, out var argTypes, out var args),
+        inputReader.CallExt(ReadArgsOf(argTypes), args),
+        module.CastTo(methodInfo.DeclaringType).Call(methodInfo, args));
     }
 
-    private ReactMethodImpl MakeReturningMethod(ReflectionMethodInfo methodInfo, Type returnType, ParameterInfo[] parameters)
+    private ReactMethodImpl MakeCallbackMethod(MethodInfo methodInfo, ParameterInfo[] parameters)
     {
-      // It is like the MakeCallbackMethod but callback is not passed as a parameter.
-
-      // Input parameters for generated lambda
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression inputReaderParameter = Expression.Parameter(typeof(IJSValueReader), "inputReader");
-      ParameterExpression outputWriterParameter = Expression.Parameter(typeof(IJSValueWriter), "outputWriter");
-      ParameterExpression resolveParameter = Expression.Parameter(typeof(MethodResultCallback), "resolve");
-      ParameterExpression rejectParameter = Expression.Parameter(typeof(MethodResultCallback), "reject");
-
-      // Input variables to read from inputReader
-      ParameterExpression[] inputVariables = new ParameterExpression[parameters.Length];
-      for (int i = 0; i < parameters.Length; ++i)
-      {
-        inputVariables[i] = Expression.Variable(parameters[i].ParameterType, parameters[i].Name);
-      }
-
-      // The result variable to store method call result
-      var resultVariable = Expression.Variable(returnType);
-
-      // Statements of the generated lambda
-      List<Expression> statements = new List<Expression>();
-
-      // Generate code to read input variables from the inputReader
-      var callReadNext = Expression.Call(inputReaderParameter, typeof(IJSValueReader).GetMethod("ReadNext"));
-      statements.Add(callReadNext);
-      foreach (ParameterExpression variable in inputVariables)
-      {
-        statements.Add(callReadNext);
-        statements.Add(Expression.Call(null, JSValueReader.GetReadValueMethod(variable.Type), inputReaderParameter, variable));
-      }
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueReader inputReader, IJSValueWriter outputWriter,
+      //    MethodResultCallback resolve, MethodResultCallback reject) =>
+      // {
+      //   inputReader.ReadArgs(out ArgType0 arg0, out ArgType1 arg1);
+      //   (module as ModuleType).Method(arg0, arg1,
+      //     result => resolve(outputWriter.WriteArgs(result)));
+      // }
+
+      // The last parameter in parameters is a 'resolve' delegate
+      return CompileLambda<ReactMethodImpl>(
+        MethodParameters(out var module, out var inputReader, out var outputWriter, out var resolve, out _),
+        MethodArgs(parameters, out var argTypes, out var args,
+          out var resolveCallbackType, out var resolveArgType),
+        inputReader.CallExt(ReadArgsOf(argTypes), args),
+        module.CastTo(methodInfo.DeclaringType).Call(methodInfo, args,
+          AutoLambda(resolveCallbackType, Parameter(resolveArgType, out var result),
+            resolve.Invoke(outputWriter.CallExt(WriteArgsOf(resolveArgType), result)))));
+    }
 
-      // Generate code to call the method
-      statements.Add(Expression.Assign(resultVariable,
-          Expression.Call(
-              Expression.Convert(moduleParameter, methodInfo.DeclaringType),
-              methodInfo,
-              inputVariables)));
+    private ReactMethodImpl MakeTwoCallbacksMethod(MethodInfo methodInfo, ParameterInfo[] parameters)
+    {
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueReader inputReader, IJSValueWriter outputWriter,
+      //    MethodResultCallback resolve, MethodResultCallback reject) =>
+      // {
+      //   inputReader.ReadArgs(out ArgType0 arg0, out ArgType1 arg1);
+      //   (module as ModuleType).Method(arg0, arg1,
+      //     result => resolve(outputWriter.WriteArgs(result)),
+      //     error => reject(outputWriter.WriteError(error)));
+      // }
+
+      // The last two parameters in parameters are resolve and reject delegates
+      return CompileLambda<ReactMethodImpl>(
+        MethodParameters(out var module, out var inputReader, out var outputWriter, out var resolve, out var reject),
+        MethodArgs(parameters, out var argTypes, out var args,
+          out var resolveCallbackType, out var resolveArgType,
+          out var rejectCallbackType, out var rejectArgType),
+        inputReader.CallExt(ReadArgsOf(argTypes), args),
+        module.CastTo(methodInfo.DeclaringType).Call(methodInfo, args,
+          AutoLambda(resolveCallbackType, Parameter(resolveArgType, out var result),
+            resolve.Invoke(outputWriter.CallExt(WriteArgsOf(resolveArgType), result))),
+          AutoLambda(rejectCallbackType, Parameter(rejectArgType, out var error),
+            reject.Invoke(outputWriter.CallExt(WriteErrorOf(rejectArgType), error)))));
+    }
 
-      // Generate code to write result to outputWriter
-      statements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayBegin")));
-      statements.Add(Expression.Call(null, JSValueWriter.GetWriteValueMethod(resultVariable.Type), outputWriterParameter, resultVariable));
-      statements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayEnd")));
 
-      // Generate code to call resolve callback
-      statements.Add(Expression.Invoke(resolveParameter, outputWriterParameter));
+    private ReactMethodImpl MakePromiseMethod(MethodInfo methodInfo, ParameterInfo[] parameters)
+    {
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueReader inputReader, IJSValueWriter outputWriter,
+      //    MethodResultCallback resolve, MethodResultCallback reject) =>
+      // {
+      //   inputReader.ReadArgs(out ArgType0 arg0, out ArgType1 arg1);
+      //   (module as ModuleType).Method(arg0, arg1,
+      //     new ReactPromise<TValue>(outputWriter, resolve, reject));
+      // }
+
+      // The last two parameters in parameters are resolve and reject delegates
+      return CompileLambda<ReactMethodImpl>(
+        MethodParameters(out var module, out var inputReader, out var outputWriter, out var resolve, out var reject),
+        MethodArgs(parameters, out var argTypes, out var args, out var promiseResultType),
+        inputReader.CallExt(ReadArgsOf(argTypes), args),
+        module.CastTo(methodInfo.DeclaringType).Call(methodInfo, args,
+          New(ReactPromiseCtorOf(promiseResultType), outputWriter, resolve, reject)));
+    }
 
-      // Generate the lambda to return
-      var lambda = Expression.Lambda<ReactMethodImpl>(
-          Expression.Block(inputVariables.Append(resultVariable), statements),
-          moduleParameter, inputReaderParameter, outputWriterParameter, resolveParameter, rejectParameter);
+    private ReactMethodImpl MakeReturningMethod(MethodInfo methodInfo, Type returnType, ParameterInfo[] parameters)
+    {
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueReader inputReader, IJSValueWriter outputWriter,
+      //    MethodResultCallback resolve, MethodResultCallback reject) =>
+      // {
+      //   inputReader.ReadArgs(out ArgType0 arg0, out ArgType1 arg1);
+      //   resolve(outputWriter.WriteArgs((module as ModuleType).Method(arg0, arg1)));
+      // }
 
-      // Compile and return the lambda
-      return lambda.Compile();
+      // It is like the MakeCallbackMethod but callback is not passed as a parameter.
+      return CompileLambda<ReactMethodImpl>(
+        MethodParameters(out var module, out var inputReader, out var outputWriter, out var resolve, out _),
+        MethodArgs(parameters, out var argTypes, out var args),
+        inputReader.CallExt(ReadArgsOf(argTypes), args),
+        resolve.Invoke(outputWriter.CallExt(WriteArgsOf(returnType),
+          module.CastTo(methodInfo.DeclaringType).Call(methodInfo, args))));
     }
 
     public delegate void ReactMethodImpl(
@@ -309,11 +209,11 @@ public delegate void ReactMethodImpl(
         MethodResultCallback resolve,
         MethodResultCallback reject);
 
-    public string MethodName { get; private set; }
+    public string MethodName { get; }
 
-    public MethodReturnType MethodReturnType { get; private set; }
+    public MethodReturnType MethodReturnType { get; }
 
-    public Lazy<ReactMethodImpl> MethodImpl { get; private set; }
+    public Lazy<ReactMethodImpl> MethodImpl { get; }
 
     public void AddToModuleBuilder(IReactModuleBuilder moduleBuilder, object module)
     {
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactModuleInfo.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactModuleInfo.cs
index cc60d1f3204..bf07ca75fa9 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactModuleInfo.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactModuleInfo.cs
@@ -4,6 +4,7 @@
 using Microsoft.ReactNative.Bridge;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 
@@ -119,61 +120,46 @@ private List<ReactSyncMethodInfo> InitSyncMethodInfos()
 
     private List<ReactEventInfo> InitEventInfos()
     {
-      var result = new List<ReactEventInfo>();
-      foreach (var propertyInfo in ModuleType.GetProperties())
-      {
-        var eventAttribute = propertyInfo.GetCustomAttribute<ReactEventAttribute>();
-        if (eventAttribute != null)
-        {
-          var eventInfo = new ReactEventInfo(propertyInfo, eventAttribute);
-          result.Add(eventInfo);
-        }
-      }
-
-      return result;
+      var fieldEvents =
+        from field in ModuleType.GetFields(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
+        let eventAttribute = field.GetCustomAttribute<ReactEventAttribute>()
+        where eventAttribute != null && !field.IsInitOnly
+        select new ReactEventInfo(field, eventAttribute);
+      var propertyEvents =
+        from property in ModuleType.GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
+        let eventAttribute = property.GetCustomAttribute<ReactEventAttribute>()
+        where eventAttribute != null
+        let propertySetter = property.SetMethod
+        where propertySetter != null && propertySetter.IsPublic
+        select new ReactEventInfo(property, eventAttribute);
+      return fieldEvents.Concat(propertyEvents).ToList();
     }
 
     private List<ReactConstantInfo> InitConstantInfos()
     {
-      var result = new List<ReactConstantInfo>();
-      foreach (var propertyInfo in ModuleType.GetProperties())
-      {
-        var constantAttribute = propertyInfo.GetCustomAttribute<ReactConstantAttribute>();
-        if (constantAttribute != null)
-        {
-          var constantInfo = new ReactConstantInfo(propertyInfo, constantAttribute);
-          result.Add(constantInfo);
-        }
-      }
-
-      foreach (var fieldInfo in ModuleType.GetFields())
-      {
-        var constantAttribute = fieldInfo.GetCustomAttribute<ReactConstantAttribute>();
-        if (constantAttribute != null)
-        {
-          var constantInfo = new ReactConstantInfo(fieldInfo, constantAttribute);
-          result.Add(constantInfo);
-        }
-      }
-
-      return result;
+      var fieldConstants =
+        from field in ModuleType.GetFields(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
+        let constantAttribute = field.GetCustomAttribute<ReactConstantAttribute>()
+        where constantAttribute != null
+        let constantInfo = new ReactConstantInfo(field, constantAttribute)
+        select constantInfo;
+      var propertyEvents =
+        from property in ModuleType.GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
+        let constantAttribute = property.GetCustomAttribute<ReactConstantAttribute>()
+        where constantAttribute != null
+        let constantInfo = new ReactConstantInfo(property, constantAttribute)
+        select constantInfo;
+      return fieldConstants.Concat(propertyEvents).ToList();
     }
 
     private List<ReactConstantProviderInfo> InitConstantProviderInfos()
     {
-      var result = new List<ReactConstantProviderInfo>();
-
-      foreach (var methodInfo in ModuleType.GetMethods())
-      {
-        var constantProviderAttribute = methodInfo.GetCustomAttribute<ReactConstantProviderAttribute>();
-        if (constantProviderAttribute != null)
-        {
-          var constantInfo = new ReactConstantProviderInfo(methodInfo);
-          result.Add(constantInfo);
-        }
-      }
-
-      return result;
+      var constantProviders =
+        from method in ModuleType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static)
+        let constantProviderAttribute = method.GetCustomAttribute<ReactConstantProviderAttribute>()
+        where constantProviderAttribute != null
+        select new ReactConstantProviderInfo(method);
+      return constantProviders.ToList();
     }
 
     public string ModuleName { get; private set; }
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactPackageBuilderExtensions.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactPackageBuilderExtensions.cs
index 8ade68020f9..4688ad3feee 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactPackageBuilderExtensions.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactPackageBuilderExtensions.cs
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Microsoft.ReactNative.Bridge;
 using System;
 using System.Linq;
 using System.Reflection;
 
-using Microsoft.ReactNative.Bridge;
-
 namespace Microsoft.ReactNative.Managed
 {
   static class ReactPackageBuilderExtensions
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactPromise.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactPromise.cs
new file mode 100644
index 00000000000..bf808cbe4fb
--- /dev/null
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactPromise.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// The code is adopted from Facebook's ReactNative implementation for Java.
+// It is changed to be more C#-like, but we kept some original comments.
+// Below is the original Facebook's copyright notice:
+//
+//
+// Copyright (c) Facebook, Inc. and its affiliates.
+//
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+using Microsoft.ReactNative.Bridge;
+using System.Collections.Generic;
+
+namespace Microsoft.ReactNative.Managed
+{
+  // Implementation of IReactPromise that represents a JavaScript Promise
+  // which can be passed to the native module as a method parameter.
+  //
+  // Methods with ReactMethodAttribute that use an IReactPromise as the last parameter
+  // will be marked as "promise" and will return a promise when invoked from JavaScript.
+  class ReactPromise<T> : IReactPromise<T>
+  {
+    private static readonly string ErrorDefaultCode = "EUNSPECIFIED";
+    private static readonly string ErrorDefaultMessage = "Error not specified.";
+
+    // Keys for m_reject's Error object
+    private static readonly string ErrorMapKeyCode = "code";
+    private static readonly string ErrorMapKeyMessage = "message";
+    private static readonly string ErrorMapKeyUserInfo = "userInfo";
+    private static readonly string ErrorMapKeyNativeStack = "nativeStackWindows";
+
+    private IJSValueWriter m_writer;
+    private MethodResultCallback m_resolve;
+    private MethodResultCallback m_reject;
+
+    public ReactPromise(IJSValueWriter writer, MethodResultCallback resolve, MethodResultCallback reject)
+    {
+      m_writer = writer;
+      m_resolve = resolve;
+      m_reject = reject;
+    }
+
+    //  Successfully resolve the ReactPromise with an optional value.
+    public void Resolve(T value)
+    {
+      if (m_resolve != null)
+      {
+        m_writer.WriteArgs(value);
+        m_resolve(m_writer);
+        Clear();
+      }
+    }
+
+    // Reject the ReactPromise and report an error.
+    public void Reject(ReactError error)
+    {
+      if (m_reject == null)
+      {
+        Clear();
+        return;
+      }
+
+      var errorInfo = new Dictionary<string, JSValue>
+      {
+        [ErrorMapKeyCode] = new JSValue(error?.Code ?? ErrorDefaultCode),
+        [ErrorMapKeyMessage] = new JSValue(error?.Message ?? error?.Exception?.Message ?? ErrorDefaultMessage),
+
+        // For consistency with iOS ensure userInfo key exists, even if we null it.
+        // iOS: /React/Base/RCTUtils.m -> RCTJSErrorFromCodeMessageAndNSError
+        [ErrorMapKeyUserInfo] = (error?.UserInfo != null) ? new JSValue(error.UserInfo) : new JSValue(),
+
+        // Attach a nativeStackWindows string if an exception was passed.
+        // This matches iOS behavior - iOS adds a `nativeStackIOS` property
+        // iOS: /React/Base/RCTUtils.m -> RCTJSErrorFromCodeMessageAndNSError
+        [ErrorMapKeyNativeStack] = new JSValue(error?.Exception?.StackTrace ?? "")
+      };
+
+      m_writer.WriteArgs(errorInfo);
+      m_reject(m_writer);
+      Clear();
+    }
+
+    private void Clear()
+    {
+      m_resolve = null;
+      m_reject = null;
+      m_writer = null;
+    }
+  }
+}
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ReactSyncMethodInfo.cs b/vnext/Microsoft.ReactNative.SharedManaged/ReactSyncMethodInfo.cs
index 2a395673ad6..86de8b61a66 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ReactSyncMethodInfo.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ReactSyncMethodInfo.cs
@@ -2,79 +2,45 @@
 // Licensed under the MIT License.
 
 using Microsoft.ReactNative.Bridge;
-using Microsoft.ReactNative.Managed.Linq;
 using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
-using ReflectionMethodInfo = System.Reflection.MethodInfo;
+using static Microsoft.ReactNative.Managed.JSValueGenerator;
+using static Microsoft.ReactNative.Managed.JSValueReaderGenerator;
+using static Microsoft.ReactNative.Managed.JSValueWriterGenerator;
+using static System.Linq.Expressions.Expression;
 
 namespace Microsoft.ReactNative.Managed
 {
   class ReactSyncMethodInfo
   {
-    public ReactSyncMethodInfo(ReflectionMethodInfo methodInfo, ReactSyncMethodAttribute methodAttribute)
+    public ReactSyncMethodInfo(MethodInfo methodInfo, ReactSyncMethodAttribute methodAttribute)
     {
       MethodName = methodAttribute.MethodName ?? methodInfo.Name;
       MethodImpl = new Lazy<ReactSyncMethodImpl>(() => MakeMethod(methodInfo), LazyThreadSafetyMode.PublicationOnly);
     }
 
-    private ReactSyncMethodImpl MakeMethod(ReflectionMethodInfo methodInfo)
+    private ReactSyncMethodImpl MakeMethod(MethodInfo methodInfo)
     {
-      // Input parameters for generated lambda
-      ParameterExpression moduleParameter = Expression.Parameter(typeof(object), "module");
-      ParameterExpression inputReaderParameter = Expression.Parameter(typeof(IJSValueReader), "inputReader");
-      ParameterExpression outputWriterParameter = Expression.Parameter(typeof(IJSValueWriter), "outputWriter");
-
-      // Input variables to read from inputReader
-      ParameterInfo[] parameters = methodInfo.GetParameters();
-      ParameterExpression[] inputVariables = new ParameterExpression[parameters.Length];
-      for (int i = 0; i < parameters.Length; ++i)
-      {
-        inputVariables[i] = Expression.Variable(parameters[i].ParameterType, parameters[i].Name);
-      }
-
-      // The result variable to store method call result
-      var resultVariable = Expression.Variable(methodInfo.ReturnType);
-
-      // Statements of the generated lambda
-      List<Expression> statements = new List<Expression>();
-
-      // Generate code to read input variables from the inputReader
-      var callReadNext = Expression.Call(inputReaderParameter, typeof(IJSValueReader).GetMethod("ReadNext"));
-      statements.Add(callReadNext);
-      foreach (ParameterExpression variable in inputVariables)
-      {
-        statements.Add(callReadNext);
-        statements.Add(Expression.Call(null, JSValueReader.GetReadValueMethod(variable.Type), inputReaderParameter, variable));
-      }
-
-      // Generate code to call the method
-      statements.Add(Expression.Assign(resultVariable,
-          Expression.Call(
-              Expression.Convert(moduleParameter, methodInfo.DeclaringType),
-              methodInfo,
-              inputVariables)));
-
-      // Generate code to write result to outputWriter
-      statements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayBegin")));
-      statements.Add(Expression.Call(null, JSValueWriter.GetWriteValueMethod(resultVariable.Type), outputWriterParameter, resultVariable));
-      statements.Add(Expression.Call(outputWriterParameter, typeof(IJSValueWriter).GetMethod("WriteArrayEnd")));
-
-      // Generate the lambda to return
-      var lambda = Expression.Lambda<ReactSyncMethodImpl>(
-          Expression.Block(inputVariables.Append(resultVariable), statements),
-          moduleParameter, inputReaderParameter, outputWriterParameter);
-
-      // Compile and return the lambda
-      return lambda.Compile();
+      // Generate code that looks like:
+      //
+      // (object module, IJSValueReader inputReader, IJSValueWriter outputWriter) =>
+      // {
+      //   inputReader.ReadArgs(out ArgType0 arg0, out ArgType1 arg1)
+      //   outputWriter.WriteArgs((module as ModuleType).SyncMethod(arg0, arg1));
+      // }
+
+      return CompileLambda<ReactSyncMethodImpl>(
+        Parameter(typeof(object), out var module),
+        Parameter(typeof(IJSValueReader), out var inputReader),
+        Parameter(typeof(IJSValueWriter), out var outputWriter),
+        MethodArgs(methodInfo.GetParameters(), out var argTypes, out var args),
+        inputReader.CallExt(ReadArgsOf(argTypes), args),
+        outputWriter.CallExt(WriteArgsOf(methodInfo.ReturnType),
+          module.CastTo(methodInfo.DeclaringType).Call(methodInfo, args)));
     }
 
-    public delegate void ReactSyncMethodImpl(
-        object module,
-        IJSValueReader inputReader,
-        IJSValueWriter outputWriter);
+    public delegate void ReactSyncMethodImpl(object module, IJSValueReader inputReader, IJSValueWriter outputWriter);
 
     public string MethodName { get; private set; }
 
diff --git a/vnext/Microsoft.ReactNative.SharedManaged/ViewManagerAttributes.cs b/vnext/Microsoft.ReactNative.SharedManaged/ViewManagerAttributes.cs
index 9b3db54901d..38cb37fbd95 100644
--- a/vnext/Microsoft.ReactNative.SharedManaged/ViewManagerAttributes.cs
+++ b/vnext/Microsoft.ReactNative.SharedManaged/ViewManagerAttributes.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
-
 using Microsoft.ReactNative.Bridge;
+using System;
 
 namespace Microsoft.ReactNative.Managed
 {
diff --git a/vnext/Microsoft.ReactNative/DynamicReader.cpp b/vnext/Microsoft.ReactNative/DynamicReader.cpp
index 944ceba1a31..209b1589014 100644
--- a/vnext/Microsoft.ReactNative/DynamicReader.cpp
+++ b/vnext/Microsoft.ReactNative/DynamicReader.cpp
@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "DynamicReader.h"
-#include "Crash.h"
 
 namespace winrt::Microsoft::ReactNative::Bridge {
 
@@ -11,172 +10,137 @@ namespace winrt::Microsoft::ReactNative::Bridge {
 // DynamicReader implementation
 //===========================================================================
 
-DynamicReader::DynamicReader(const folly::dynamic &root) noexcept : m_root{&root} {}
+/*static*/ DynamicReader::StackEntry DynamicReader::StackEntry::ObjectProperty(
+    const folly::dynamic *value,
+    const folly::dynamic::const_item_iterator &property) noexcept {
+  StackEntry entry;
+  entry.Value = value;
+  entry.Property = property;
+  return entry;
+}
 
-JSValueReaderState DynamicReader::ReadNext() noexcept {
-  switch (m_state) {
-    case JSValueReaderState::Error: {
-      // The Error state is the initial state if m_root is not null.
-      if (!m_stack.empty() && !m_root) {
-        return JSValueReaderState::Error;
-      }
+/*static*/ DynamicReader::StackEntry DynamicReader::StackEntry::ArrayItem(
+    const folly::dynamic *value,
+    const folly::dynamic::const_iterator &item) noexcept {
+  StackEntry entry;
+  entry.Value = value;
+  entry.Item = item;
+  return entry;
+}
+
+DynamicReader::DynamicReader(const folly::dynamic &root) noexcept : m_current{&root} {}
+
+JSValueType DynamicReader::ValueType() noexcept {
+  switch (m_current->type()) {
+    case folly::dynamic::Type::NULLT:
+      return JSValueType::Null;
+    case folly::dynamic::Type::ARRAY:
+      return JSValueType::Array;
+    case folly::dynamic::Type::BOOL:
+      return JSValueType::Boolean;
+    case folly::dynamic::Type::DOUBLE:
+      return JSValueType::Double;
+    case folly::dynamic::Type::INT64:
+      return JSValueType::Int64;
+    case folly::dynamic::Type::OBJECT:
+      return JSValueType::Object;
+    case folly::dynamic::Type::STRING:
+      return JSValueType::String;
+    default:
+      return JSValueType::Null;
+  }
+}
 
-      folly::dynamic::Type type = m_root->type();
-      if (type == folly::dynamic::Type::OBJECT) {
-        m_stack.emplace_back(m_root);
-        return m_state = JSValueReaderState::ObjectBegin;
-      } else if (type == folly::dynamic::Type::ARRAY) {
-        m_stack.emplace_back(m_root);
-        return m_state = JSValueReaderState::ArrayBegin;
+bool DynamicReader::GetNextObjectProperty(hstring &propertyName) noexcept {
+  if (!m_isIterating) {
+    if (m_current->type() == folly::dynamic::Type::OBJECT) {
+      const auto &properties = m_current->items();
+      const auto &property = properties.begin();
+      if (property != properties.end()) {
+        m_stack.push_back(StackEntry::ObjectProperty(m_current, property));
+        SetCurrentValue(&(property->second));
+        propertyName = to_hstring(property->first.asString());
+        return true;
       } else {
-        return JSValueReaderState::Error;
+        m_isIterating = !m_stack.empty();
       }
     }
-    case JSValueReaderState::ObjectBegin: {
-      auto &entry = m_stack.back();
-      const auto &obj = entry.Value->items();
-      entry.Property = obj.begin();
-      if (entry.Property != obj.end()) {
-        return m_state = JSValueReaderState::PropertyName;
+  } else if (!m_stack.empty()) {
+    auto &entry = m_stack.back();
+    if (entry.Value->type() == folly::dynamic::Type::OBJECT) {
+      auto &property = entry.Property.value();
+      if (++property != entry.Value->items().end()) {
+        SetCurrentValue(&(property->second));
+        propertyName = to_hstring(property->first.asString());
+        return true;
       } else {
-        return m_state = JSValueReaderState::ObjectEnd;
+        m_current = entry.Value;
+        m_stack.pop_back();
+        m_isIterating = !m_stack.empty();
       }
     }
-    case JSValueReaderState::ArrayBegin: {
-      VerifyElseCrash(!m_stack.empty());
-      auto &entry = m_stack.back();
-      const auto &arr = *entry.Value;
-      entry.Item = arr.begin();
-      if (entry.Item != arr.end()) {
-        return ReadValue(&*entry.Item);
+  }
+
+  propertyName = to_hstring(L"");
+  return false;
+}
+
+bool DynamicReader::GetNextArrayItem() noexcept {
+  if (!m_isIterating) {
+    if (m_current->type() == folly::dynamic::Type::ARRAY) {
+      const auto &item = m_current->begin();
+      if (item != m_current->end()) {
+        m_stack.push_back(StackEntry::ArrayItem(m_current, item));
+        SetCurrentValue(&*item);
+        return true;
       } else {
-        return m_state = JSValueReaderState::ArrayEnd;
+        m_isIterating = !m_stack.empty();
       }
     }
-    case JSValueReaderState::PropertyName: {
-      VerifyElseCrash(!m_stack.empty());
-      auto &entry = m_stack.back();
-      const auto &obj = entry.Value->items();
-      if (entry.Property != obj.end()) {
-        return ReadValue(&(entry.Property.value()->second));
+  } else if (!m_stack.empty()) {
+    auto &entry = m_stack.back();
+    if (entry.Value->type() == folly::dynamic::Type::ARRAY) {
+      if (++entry.Item != entry.Value->end()) {
+        SetCurrentValue(&*entry.Item);
+        return true;
       } else {
-        return m_state = JSValueReaderState::Error;
-      }
-    }
-    case JSValueReaderState::ObjectEnd:
-    case JSValueReaderState::ArrayEnd:
-    case JSValueReaderState::NullValue:
-    case JSValueReaderState::BooleanValue:
-    case JSValueReaderState::Int64Value:
-    case JSValueReaderState::DoubleValue:
-    case JSValueReaderState::StringValue: {
-      VerifyElseCrash(!m_stack.empty());
-      m_stack.pop_back();
-      if (m_stack.empty()) {
-        return m_state = JSValueReaderState::Error;
-      }
-
-      auto &entry = m_stack.back();
-      folly::dynamic::Type type = entry.Value->type();
-      if (type == folly::dynamic::OBJECT) {
-        auto objIter = entry.Property.value();
-        entry.Property = ++objIter;
-        if (objIter != entry.Value->items().end()) {
-          return m_state = JSValueReaderState::PropertyName;
-        } else {
-          return m_state = JSValueReaderState::ObjectEnd;
-        }
-      } else if (type == folly::dynamic::ARRAY) {
-        if (++entry.Item != entry.Value->end()) {
-          return ReadValue(&*entry.Item);
-        } else {
-          return m_state = JSValueReaderState::ArrayEnd;
-        }
+        m_current = entry.Value;
+        m_stack.pop_back();
+        m_isIterating = !m_stack.empty();
       }
     }
-    default:
-      return m_state = JSValueReaderState::Error;
   }
+
+  return false;
 }
 
-JSValueReaderState DynamicReader::ReadValue(const folly::dynamic *value) noexcept {
-  m_stack.emplace_back(value);
+void DynamicReader::SetCurrentValue(const folly::dynamic *value) noexcept {
+  m_current = value;
   switch (value->type()) {
-    case folly::dynamic::Type::NULLT:
-      return m_state = JSValueReaderState::NullValue;
-    case folly::dynamic::Type::BOOL:
-      return m_state = JSValueReaderState::BooleanValue;
-    case folly::dynamic::Type::INT64:
-      return m_state = JSValueReaderState::Int64Value;
-    case folly::dynamic::Type::DOUBLE:
-      return m_state = JSValueReaderState::DoubleValue;
-    case folly::dynamic::Type::STRING:
-      return m_state = JSValueReaderState::StringValue;
     case folly::dynamic::Type::OBJECT:
-      return m_state = JSValueReaderState::ObjectBegin;
     case folly::dynamic::Type::ARRAY:
-      return m_state = JSValueReaderState::ArrayBegin;
+      m_isIterating = false;
+      break;
     default:
-      return m_state = JSValueReaderState::Error;
+      m_isIterating = true;
+      break;
   }
 }
 
-_Success_(return ) bool DynamicReader::TryGetBoolean(_Out_ bool &value) noexcept {
-  if (m_state == JSValueReaderState::BooleanValue) {
-    VerifyElseCrash(!m_stack.empty());
-    value = m_stack.back().Value->asBool();
-    return true;
-  }
-
-  value = false;
-  return false;
+hstring DynamicReader::GetString() noexcept {
+  return to_hstring((m_current->type() == folly::dynamic::Type::STRING) ? m_current->getString() : "");
 }
 
-_Success_(return ) bool DynamicReader::TryGetInt64(_Out_ int64_t &value) noexcept {
-  if (m_state == JSValueReaderState::Int64Value) {
-    VerifyElseCrash(!m_stack.empty());
-    value = m_stack.back().Value->asInt();
-    return true;
-  } else if (m_state == JSValueReaderState::DoubleValue) {
-    VerifyElseCrash(!m_stack.empty());
-    value = static_cast<int64_t>(m_stack.back().Value->asDouble());
-    return true;
-  }
-
-  value = 0;
-  return false;
+bool DynamicReader::GetBoolean() noexcept {
+  return (m_current->type() == folly::dynamic::Type::BOOL) ? m_current->getBool() : false;
 }
 
-_Success_(return ) bool DynamicReader::TryGetDouble(_Out_ double &value) noexcept {
-  if (m_state == JSValueReaderState::DoubleValue) {
-    VerifyElseCrash(!m_stack.empty());
-    value = m_stack.back().Value->asDouble();
-    return true;
-  } else if (m_state == JSValueReaderState::Int64Value) {
-    VerifyElseCrash(!m_stack.empty());
-    value = static_cast<double>(m_stack.back().Value->asInt());
-    return true;
-  }
-
-  value = 0;
-  return false;
+int64_t DynamicReader::GetInt64() noexcept {
+  return (m_current->type() == folly::dynamic::Type::INT64) ? m_current->getInt() : 0;
 }
 
-_Success_(return ) bool DynamicReader::TryGetString(winrt::hstring &value) noexcept {
-  if (m_state == JSValueReaderState::StringValue) {
-    VerifyElseCrash(!m_stack.empty());
-    const std::string &str = m_stack.back().Value->asString();
-    value = winrt::to_hstring(str);
-    return true;
-  } else if (m_state == JSValueReaderState::PropertyName) {
-    VerifyElseCrash(!m_stack.empty());
-    const std::string &str = m_stack.back().Property.value()->first.getString();
-    value = winrt::to_hstring(str);
-    return true;
-  }
-
-  value = L"";
-  return false;
+double DynamicReader::GetDouble() noexcept {
+  return (m_current->type() == folly::dynamic::Type::DOUBLE) ? m_current->getDouble() : 0;
 }
 
 } // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative/DynamicReader.h b/vnext/Microsoft.ReactNative/DynamicReader.h
index fb233f9d623..c17ea2f58b2 100644
--- a/vnext/Microsoft.ReactNative/DynamicReader.h
+++ b/vnext/Microsoft.ReactNative/DynamicReader.h
@@ -1,27 +1,31 @@
-#pragma once
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#pragma once
+
 #include "folly/dynamic.h"
 #include "winrt/Microsoft.ReactNative.Bridge.h"
 
 namespace winrt::Microsoft::ReactNative::Bridge {
 
-struct DynamicReader : winrt::implements<DynamicReader, winrt::Microsoft::ReactNative::Bridge::IJSValueReader> {
+struct DynamicReader : implements<DynamicReader, IJSValueReader> {
   DynamicReader(const folly::dynamic &root) noexcept;
 
  public: // IJSValueReader
-  winrt::Microsoft::ReactNative::Bridge::JSValueReaderState ReadNext() noexcept;
-  _Success_(return ) bool TryGetBoolean(_Out_ bool &value) noexcept;
-  _Success_(return ) bool TryGetInt64(_Out_ int64_t &value) noexcept;
-  _Success_(return ) bool TryGetDouble(_Out_ double &value) noexcept;
-  _Success_(return ) bool TryGetString(winrt::hstring &value) noexcept;
+  JSValueType ValueType() noexcept;
+  bool GetNextObjectProperty(hstring &propertyName) noexcept;
+  bool GetNextArrayItem() noexcept;
+  hstring GetString() noexcept;
+  bool GetBoolean() noexcept;
+  int64_t GetInt64() noexcept;
+  double GetDouble() noexcept;
 
  private:
   struct StackEntry {
-    StackEntry(const folly::dynamic *value) noexcept : Value{value} {}
-
-    ~StackEntry() noexcept {}
+    static StackEntry ObjectProperty(
+        const folly::dynamic *value,
+        const folly::dynamic::const_item_iterator &property) noexcept;
+    static StackEntry ArrayItem(const folly::dynamic *value, const folly::dynamic::const_iterator &item) noexcept;
 
     const folly::dynamic *Value{nullptr};
     folly::dynamic::const_iterator Item;
@@ -29,15 +33,12 @@ struct DynamicReader : winrt::implements<DynamicReader, winrt::Microsoft::ReactN
   };
 
  private:
-  winrt::Microsoft::ReactNative::Bridge::JSValueReaderState ReadValue(const folly::dynamic *value) noexcept;
-  static std::u16string Utf8ToUtf16(const char *value, size_t size) noexcept;
+  void SetCurrentValue(const folly::dynamic *value) noexcept;
 
  private:
-  const folly::dynamic *m_root;
-  winrt::Microsoft::ReactNative::Bridge::JSValueReaderState m_state{
-      winrt::Microsoft::ReactNative::Bridge::JSValueReaderState::Error};
+  const folly::dynamic *m_current{nullptr};
+  bool m_isIterating{false};
   std::vector<StackEntry> m_stack;
-  std::u16string m_u16str; // Used for strings converted to UTF16
 };
 
 } // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative/DynamicWriter.cpp b/vnext/Microsoft.ReactNative/DynamicWriter.cpp
index da967d32187..6083ec9a6d2 100644
--- a/vnext/Microsoft.ReactNative/DynamicWriter.cpp
+++ b/vnext/Microsoft.ReactNative/DynamicWriter.cpp
@@ -3,6 +3,7 @@
 
 #include "pch.h"
 #include "DynamicWriter.h"
+#include "Crash.h"
 
 namespace winrt::Microsoft::ReactNative::Bridge {
 
@@ -14,56 +15,54 @@ folly::dynamic DynamicWriter::TakeValue() noexcept {
   return std::move(m_result);
 }
 
-bool DynamicWriter::WriteNull() noexcept {
-  return WriteValue(folly::dynamic{});
+void DynamicWriter::WriteNull() noexcept {
+  WriteValue(folly::dynamic{});
 }
 
-bool DynamicWriter::WriteBoolean(bool value) noexcept {
-  return WriteValue(folly::dynamic{value});
+void DynamicWriter::WriteBoolean(bool value) noexcept {
+  WriteValue(folly::dynamic{value});
 }
 
-bool DynamicWriter::WriteInt64(int64_t value) noexcept {
-  return WriteValue(folly::dynamic{value});
+void DynamicWriter::WriteInt64(int64_t value) noexcept {
+  WriteValue(folly::dynamic{value});
 }
 
-bool DynamicWriter::WriteDouble(double value) noexcept {
-  return WriteValue(folly::dynamic{value});
+void DynamicWriter::WriteDouble(double value) noexcept {
+  WriteValue(folly::dynamic{value});
 }
 
-bool DynamicWriter::WriteString(const winrt::hstring &value) noexcept {
-  return WriteValue(folly::dynamic{winrt::to_string(value)});
+void DynamicWriter::WriteString(const winrt::hstring &value) noexcept {
+  WriteValue(folly::dynamic{winrt::to_string(value)});
 }
 
-bool DynamicWriter::WriteObjectBegin() noexcept {
+void DynamicWriter::WriteObjectBegin() noexcept {
   if (m_state == State::PropertyValue) {
     m_stack.push_back(StackEntry{m_state, std::move(m_dynamic), std::move(m_propertyName)});
   } else if (m_state == State::Array) {
     m_stack.push_back(StackEntry{m_state, std::move(m_dynamic)});
   } else if (m_state != State::Start) {
-    return false;
+    VerifyElseCrash(false);
   }
 
   m_dynamic = folly::dynamic::object();
   m_state = State::PropertyName;
-
-  return true;
 }
 
-bool DynamicWriter::WritePropertyName(const winrt::hstring &name) noexcept {
+void DynamicWriter::WritePropertyName(const winrt::hstring &name) noexcept {
   if (m_state == State::PropertyName) {
     m_propertyName = winrt::to_string(name);
     m_state = State::PropertyValue;
-    return true;
+  } else {
+    VerifyElseCrash(false);
   }
-
-  return false;
 }
 
-bool DynamicWriter::WriteObjectEnd() noexcept {
+void DynamicWriter::WriteObjectEnd() noexcept {
   if (m_state == State::PropertyName) {
     if (m_stack.empty()) {
       m_result = std::move(m_dynamic);
       m_state = State::Finish;
+      return;
     } else {
       StackEntry &entry = m_stack.back();
       if (entry.State == State::PropertyValue) {
@@ -71,39 +70,39 @@ bool DynamicWriter::WriteObjectEnd() noexcept {
         m_dynamic = std::move(entry.Dynamic);
         m_state = State::PropertyName;
         m_stack.pop_back();
-        return true;
+        return;
       } else if (entry.State == State::Array) {
         entry.Dynamic.push_back(std::move(m_dynamic));
         m_dynamic = std::move(entry.Dynamic);
         m_state = State::Array;
         m_stack.pop_back();
-        return true;
+        return;
       }
     }
   }
 
-  return false;
+  VerifyElseCrash(false);
 }
 
-bool DynamicWriter::WriteArrayBegin() noexcept {
+void DynamicWriter::WriteArrayBegin() noexcept {
   if (m_state == State::PropertyValue) {
     m_stack.push_back(StackEntry{m_state, std::move(m_dynamic), std::move(m_propertyName)});
   } else if (m_state == State::Array) {
     m_stack.push_back(StackEntry{m_state, std::move(m_dynamic)});
   } else if (m_state != State::Start) {
-    return false;
+    VerifyElseCrash(false);
   }
 
   m_dynamic = folly::dynamic::array();
   m_state = State::Array;
-  return true;
 }
 
-bool DynamicWriter::WriteArrayEnd() noexcept {
+void DynamicWriter::WriteArrayEnd() noexcept {
   if (m_state == State::Array) {
     if (m_stack.empty()) {
       m_result = std::move(m_dynamic);
       m_state = State::Finish;
+      return;
     } else {
       StackEntry &entry = m_stack.back();
       if (entry.State == State::PropertyValue) {
@@ -111,31 +110,29 @@ bool DynamicWriter::WriteArrayEnd() noexcept {
         m_dynamic = std::move(entry.Dynamic);
         m_state = State::PropertyName;
         m_stack.pop_back();
-        return true;
+        return;
       } else if (entry.State == State::Array) {
         entry.Dynamic.push_back(std::move(m_dynamic));
         m_dynamic = std::move(entry.Dynamic);
         m_state = State::Array;
         m_stack.pop_back();
-        return true;
+        return;
       }
     }
   }
 
-  return false;
+  VerifyElseCrash(false);
 }
 
-bool DynamicWriter::WriteValue(folly::dynamic &&value) noexcept {
+void DynamicWriter::WriteValue(folly::dynamic &&value) noexcept {
   if (m_state == State::PropertyValue) {
     m_dynamic[std::move(m_propertyName)] = std::move(value);
     m_state = State::PropertyName;
-    return true;
   } else if (m_state == State::Array) {
     m_dynamic.push_back(std::move(value));
-    return true;
+  } else {
+    VerifyElseCrash(false);
   }
-
-  return false;
 }
 
 } // namespace winrt::Microsoft::ReactNative::Bridge
diff --git a/vnext/Microsoft.ReactNative/DynamicWriter.h b/vnext/Microsoft.ReactNative/DynamicWriter.h
index 7cfb298a01f..685ed717c33 100644
--- a/vnext/Microsoft.ReactNative/DynamicWriter.h
+++ b/vnext/Microsoft.ReactNative/DynamicWriter.h
@@ -11,16 +11,16 @@ struct DynamicWriter : winrt::implements<DynamicWriter, winrt::Microsoft::ReactN
   folly::dynamic TakeValue() noexcept;
 
  public: // IJSValueWriter
-  bool WriteNull() noexcept;
-  bool WriteBoolean(bool value) noexcept;
-  bool WriteInt64(int64_t value) noexcept;
-  bool WriteDouble(double value) noexcept;
-  bool WriteString(const winrt::hstring &value) noexcept;
-  bool WriteObjectBegin() noexcept;
-  bool WritePropertyName(const winrt::hstring &name) noexcept;
-  bool WriteObjectEnd() noexcept;
-  bool WriteArrayBegin() noexcept;
-  bool WriteArrayEnd() noexcept;
+  void WriteNull() noexcept;
+  void WriteBoolean(bool value) noexcept;
+  void WriteInt64(int64_t value) noexcept;
+  void WriteDouble(double value) noexcept;
+  void WriteString(const winrt::hstring &value) noexcept;
+  void WriteObjectBegin() noexcept;
+  void WritePropertyName(const winrt::hstring &name) noexcept;
+  void WriteObjectEnd() noexcept;
+  void WriteArrayBegin() noexcept;
+  void WriteArrayEnd() noexcept;
 
  private:
   enum struct State { Start, PropertyName, PropertyValue, Array, Finish };
@@ -37,7 +37,7 @@ struct DynamicWriter : winrt::implements<DynamicWriter, winrt::Microsoft::ReactN
   };
 
  private:
-  bool WriteValue(folly::dynamic &&value) noexcept;
+  void WriteValue(folly::dynamic &&value) noexcept;
 
  private:
   State m_state{State::Start};
diff --git a/vnext/Microsoft.ReactNative/IBoxedValue.idl b/vnext/Microsoft.ReactNative/IBoxedValue.idl
new file mode 100644
index 00000000000..fb3a7230cf0
--- /dev/null
+++ b/vnext/Microsoft.ReactNative/IBoxedValue.idl
@@ -0,0 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Microsoft.ReactNative.Bridge {
+  interface IBoxedValue {
+    Int64 GetPtr();
+  };
+} // namespace Microsoft.ReactNative.Bridge
diff --git a/vnext/Microsoft.ReactNative/IJSValueReader.idl b/vnext/Microsoft.ReactNative/IJSValueReader.idl
index d79943119a3..b9a92719fd9 100644
--- a/vnext/Microsoft.ReactNative/IJSValueReader.idl
+++ b/vnext/Microsoft.ReactNative/IJSValueReader.idl
@@ -2,25 +2,25 @@
 // Licensed under the MIT License.
 
 namespace Microsoft.ReactNative.Bridge {
-  enum JSValueReaderState {
-    Error,
-    ObjectBegin,
-    ObjectEnd,
-    ArrayBegin,
-    ArrayEnd,
-    PropertyName,
-    NullValue,
-    BooleanValue,
-    Int64Value,
-    DoubleValue,
-    StringValue,
+  enum JSValueType {
+    Null,
+    Object,
+    Array,
+    String,
+    Boolean,
+    Int64,
+    Double,
   };
 
   interface IJSValueReader {
-    JSValueReaderState ReadNext();
-    Boolean TryGetBoolean(out Boolean value);
-    Boolean TryGetInt64(out Int64 value);
-    Boolean TryGetDouble(out Double value);
-    Boolean TryGetString(out String value);
+    JSValueType ValueType {
+      get;
+    };
+    Boolean GetNextObjectProperty(out String propertyName);
+    Boolean GetNextArrayItem();
+    String GetString();
+    Boolean GetBoolean();
+    Int64 GetInt64();
+    Double GetDouble();
   };
 } // namespace Microsoft.ReactNative.Bridge
diff --git a/vnext/Microsoft.ReactNative/IJSValueWriter.idl b/vnext/Microsoft.ReactNative/IJSValueWriter.idl
index b1025745877..4800d469df7 100644
--- a/vnext/Microsoft.ReactNative/IJSValueWriter.idl
+++ b/vnext/Microsoft.ReactNative/IJSValueWriter.idl
@@ -3,15 +3,15 @@
 
 namespace Microsoft.ReactNative.Bridge {
   interface IJSValueWriter {
-    Boolean WriteNull();
-    Boolean WriteBoolean(Boolean value);
-    Boolean WriteInt64(Int64 value);
-    Boolean WriteDouble(Double value);
-    Boolean WriteString(String value);
-    Boolean WriteObjectBegin();
-    Boolean WritePropertyName(String name);
-    Boolean WriteObjectEnd();
-    Boolean WriteArrayBegin();
-    Boolean WriteArrayEnd();
+    void WriteNull();
+    void WriteBoolean(Boolean value);
+    void WriteInt64(Int64 value);
+    void WriteDouble(Double value);
+    void WriteString(String value);
+    void WriteObjectBegin();
+    void WritePropertyName(String name);
+    void WriteObjectEnd();
+    void WriteArrayBegin();
+    void WriteArrayEnd();
   };
 } // namespace Microsoft.ReactNative.Bridge
diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
index f3ba92dfd66..01fd1ea67be 100644
--- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
+++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
@@ -63,8 +63,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
+  <ImportGroup Label="Shared" />
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -115,10 +114,10 @@
       <DependentUpon>IJSValueWriter.idl</DependentUpon>
     </ClInclude>
     <ClInclude Include="HResult.h" />
-    <ClInclude Include="LifecycleState.h" />
     <ClInclude Include="IReactModuleBuilder.h">
       <DependentUpon>IReactModuleBuilder.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="LifecycleState.h" />
     <ClInclude Include="NativeModulesProvider.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="ReactApplication.h">
@@ -218,6 +217,7 @@
   </ItemGroup>
   <ItemGroup>
     <Midl Include="IBackgroundEventListener.idl" />
+    <Midl Include="IBoxedValue.idl" />
     <Midl Include="IJSValueReader.idl" />
     <Midl Include="IJSValueWriter.idl" />
     <Midl Include="ILifecycleEventListener.idl" />
diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj
index 3f42c4f89bf..1acfef2b912 100644
--- a/vnext/Test/React.Windows.Test.vcxproj
+++ b/vnext/Test/React.Windows.Test.vcxproj
@@ -68,13 +68,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets" Condition="Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" />
-    <Import Project="..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets" Condition="Exists('..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" />
+    <Import Project="$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets" Condition="Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets'))" />
-    <Error Condition="!Exists('..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/vnext/local-cli/generator-windows/templates/cpp/src/ReactPackageProvider.cpp b/vnext/local-cli/generator-windows/templates/cpp/src/ReactPackageProvider.cpp
index 29374dee755..3bb3696d39d 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/src/ReactPackageProvider.cpp
+++ b/vnext/local-cli/generator-windows/templates/cpp/src/ReactPackageProvider.cpp
@@ -5,7 +5,6 @@
 
 // clang-format off
 
-using namespace Microsoft::ReactNative;
 using namespace winrt::Microsoft::ReactNative::Bridge;
 
 namespace winrt::<%=ns%>::implementation