558 files changed, 294 insertions, 67 deletions

diff --git a/NorthstarDedicatedTest/ExploitFixes.cpp b/NorthstarDLL/ExploitFixes.cpp
index 154091df..154091df 100644
--- a/NorthstarDedicatedTest/ExploitFixes.cpp
+++ b/NorthstarDLL/ExploitFixes.cpp
diff --git a/NorthstarDedicatedTest/ExploitFixes.h b/NorthstarDLL/ExploitFixes.h
index ae30a899..ae30a899 100644
--- a/NorthstarDedicatedTest/ExploitFixes.h
+++ b/NorthstarDLL/ExploitFixes.h
diff --git a/NorthstarDedicatedTest/ExploitFixes_UTF8Parser.h b/NorthstarDLL/ExploitFixes_UTF8Parser.h
index 41242655..41242655 100644
--- a/NorthstarDedicatedTest/ExploitFixes_UTF8Parser.h
+++ b/NorthstarDLL/ExploitFixes_UTF8Parser.h
diff --git a/NorthstarDedicatedTest/NSMem.h b/NorthstarDLL/NSMem.h
index 74df3a84..74df3a84 100644
--- a/NorthstarDedicatedTest/NSMem.h
+++ b/NorthstarDLL/NSMem.h
diff --git a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj b/NorthstarDLL/NorthstarDLL.vcxproj
index 5b8a7607..f17ac7ab 100644
--- a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj
+++ b/NorthstarDLL/NorthstarDLL.vcxproj
@@ -16,7 +16,7 @@
     <ProjectGuid>{cfad2623-064f-453c-8196-79ee10292e32}</ProjectGuid>
     <RootNamespace>NorthstarDedicatedTest</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>Northstar</ProjectName>
+    <ProjectName>NorthstarDLL</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -47,9 +47,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>Northstar</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>Northstar</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -552,7 +554,6 @@
     <ClInclude Include="sourceconsole.h" />
     <ClInclude Include="sourceinterface.h" />
     <ClInclude Include="squirrel.h" />
-    <ClInclude Include="state.h" />
     <ClInclude Include="ExploitFixes.h" />
     <ClInclude Include="ExploitFixes_UTF8Parser.h" />
     <ClInclude Include="NSMem.h" />
diff --git a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters b/NorthstarDLL/NorthstarDLL.vcxproj.filters
index 10bbced8..b14e0ce8 100644
--- a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters
+++ b/NorthstarDLL/NorthstarDLL.vcxproj.filters
@@ -148,6 +148,12 @@
     <Filter Include="Header Files\Shared\Console">
       <UniqueIdentifier>{bf0769d8-40fd-4701-85e9-7ed94aab2283}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Shared\Filesystem">
+      <UniqueIdentifier>{d8a83b5e-9a23-4124-824f-eab37880cb08}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Shared\Filesystem">
+      <UniqueIdentifier>{ee3ba13a-3061-41d7-981d-328ac2596fd2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h">
@@ -564,9 +570,6 @@
     <ClInclude Include="include\rapidjson\msinttypes\stdint.h">
       <Filter>Header Files\include\rapidjson\msinttypes</Filter>
     </ClInclude>
-    <ClInclude Include="filesystem.h">
-      <Filter>Header Files\Shared</Filter>
-    </ClInclude>
     <ClInclude Include="scriptsrson.h">
       <Filter>Header Files\Shared\Mods\Compiled</Filter>
     </ClInclude>
@@ -1398,9 +1401,6 @@
     <ClInclude Include="include\libcurl\include\curl\urlapi.h">
       <Filter>Header Files\include\libcurl</Filter>
     </ClInclude>
-    <ClInclude Include="rpakfilesystem.h">
-      <Filter>Header Files\Shared</Filter>
-    </ClInclude>
     <ClInclude Include="bansystem.h">
       <Filter>Header Files\Server\Authentication</Filter>
     </ClInclude>
@@ -1428,9 +1428,6 @@
     <ClInclude Include="plugins.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="state.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="plugin_abi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1485,6 +1482,12 @@
     <ClInclude Include="crashhandler.h">
       <Filter>Header Files\Shared</Filter>
     </ClInclude>
+    <ClInclude Include="filesystem.h">
+      <Filter>Header Files\Shared\Filesystem</Filter>
+    </ClInclude>
+    <ClInclude Include="rpakfilesystem.h">
+      <Filter>Header Files\Shared\Filesystem</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -1511,9 +1514,6 @@
     <ClCompile Include="sigscanning.cpp">
       <Filter>Source Files\Shared\Hooks</Filter>
     </ClCompile>
-    <ClCompile Include="logging.cpp">
-      <Filter>Source Files\Shared</Filter>
-    </ClCompile>
     <ClCompile Include="sourceinterface.cpp">
       <Filter>Source Files\Shared</Filter>
     </ClCompile>
@@ -1526,9 +1526,6 @@
     <ClCompile Include="modmanager.cpp">
       <Filter>Source Files\Shared\Mods</Filter>
     </ClCompile>
-    <ClCompile Include="filesystem.cpp">
-      <Filter>Source Files\Shared</Filter>
-    </ClCompile>
     <ClCompile Include="scriptsrson.cpp">
       <Filter>Source Files\Shared\Mods\Compiled Assets</Filter>
     </ClCompile>
@@ -1571,9 +1568,6 @@
     <ClCompile Include="miscserverfixes.cpp">
       <Filter>Source Files\Server</Filter>
     </ClCompile>
-    <ClCompile Include="rpakfilesystem.cpp">
-      <Filter>Source Files\Shared</Filter>
-    </ClCompile>
     <ClCompile Include="bansystem.cpp">
       <Filter>Source Files\Server\Authentication</Filter>
     </ClCompile>
@@ -1676,6 +1670,15 @@
     <ClCompile Include="crashhandler.cpp">
       <Filter>Source Files\Shared</Filter>
     </ClCompile>
+    <ClCompile Include="logging.cpp">
+      <Filter>Source Files\Shared\Console</Filter>
+    </ClCompile>
+    <ClCompile Include="filesystem.cpp">
+      <Filter>Source Files\Shared\Filesystem</Filter>
+    </ClCompile>
+    <ClCompile Include="rpakfilesystem.cpp">
+      <Filter>Source Files\Shared\Filesystem</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MASM Include="audio_asm.asm">
diff --git a/NorthstarDedicatedTest/audio.cpp b/NorthstarDLL/audio.cpp
index 6f47786f..6f47786f 100644
--- a/NorthstarDedicatedTest/audio.cpp
+++ b/NorthstarDLL/audio.cpp
diff --git a/NorthstarDedicatedTest/audio.h b/NorthstarDLL/audio.h
index 98da2fa1..98da2fa1 100644
--- a/NorthstarDedicatedTest/audio.h
+++ b/NorthstarDLL/audio.h
diff --git a/NorthstarDedicatedTest/audio_asm.asm b/NorthstarDLL/audio_asm.asm
index 4c527f9d..4c527f9d 100644
--- a/NorthstarDedicatedTest/audio_asm.asm
+++ b/NorthstarDLL/audio_asm.asm
diff --git a/NorthstarDedicatedTest/bansystem.cpp b/NorthstarDLL/bansystem.cpp
index 08115998..08115998 100644
--- a/NorthstarDedicatedTest/bansystem.cpp
+++ b/NorthstarDLL/bansystem.cpp
diff --git a/NorthstarDedicatedTest/bansystem.h b/NorthstarDLL/bansystem.h
index 8080da91..8080da91 100644
--- a/NorthstarDedicatedTest/bansystem.h
+++ b/NorthstarDLL/bansystem.h
diff --git a/NorthstarDedicatedTest/bitbuf.h b/NorthstarDLL/bitbuf.h
index 8e8e216f..8e8e216f 100644
--- a/NorthstarDedicatedTest/bitbuf.h
+++ b/NorthstarDLL/bitbuf.h
diff --git a/NorthstarDedicatedTest/bits.cpp b/NorthstarDLL/bits.cpp
index 014899f2..014899f2 100644
--- a/NorthstarDedicatedTest/bits.cpp
+++ b/NorthstarDLL/bits.cpp
diff --git a/NorthstarDedicatedTest/bits.h b/NorthstarDLL/bits.h
index 0532a9bd..0532a9bd 100644
--- a/NorthstarDedicatedTest/bits.h
+++ b/NorthstarDLL/bits.h
diff --git a/NorthstarDedicatedTest/buildainfile.cpp b/NorthstarDLL/buildainfile.cpp
index a80185e5..a80185e5 100644
--- a/NorthstarDedicatedTest/buildainfile.cpp
+++ b/NorthstarDLL/buildainfile.cpp
diff --git a/NorthstarDedicatedTest/chatcommand.cpp b/NorthstarDLL/chatcommand.cpp
index 86060a91..86060a91 100644
--- a/NorthstarDedicatedTest/chatcommand.cpp
+++ b/NorthstarDLL/chatcommand.cpp
diff --git a/NorthstarDedicatedTest/clientauthhooks.cpp b/NorthstarDLL/clientauthhooks.cpp
index 7463028b..7463028b 100644
--- a/NorthstarDedicatedTest/clientauthhooks.cpp
+++ b/NorthstarDLL/clientauthhooks.cpp
diff --git a/NorthstarDedicatedTest/clientchathooks.cpp b/NorthstarDLL/clientchathooks.cpp
index f778c6ee..f778c6ee 100644
--- a/NorthstarDedicatedTest/clientchathooks.cpp
+++ b/NorthstarDLL/clientchathooks.cpp
diff --git a/NorthstarDedicatedTest/clientruihooks.cpp b/NorthstarDLL/clientruihooks.cpp
index 5fb0b348..5fb0b348 100644
--- a/NorthstarDedicatedTest/clientruihooks.cpp
+++ b/NorthstarDLL/clientruihooks.cpp
diff --git a/NorthstarDedicatedTest/clientvideooverrides.cpp b/NorthstarDLL/clientvideooverrides.cpp
index 0bc6bb06..0bc6bb06 100644
--- a/NorthstarDedicatedTest/clientvideooverrides.cpp
+++ b/NorthstarDLL/clientvideooverrides.cpp
diff --git a/NorthstarDedicatedTest/color.h b/NorthstarDLL/color.h
index e2c1ebba..e2c1ebba 100644
--- a/NorthstarDedicatedTest/color.h
+++ b/NorthstarDLL/color.h
diff --git a/NorthstarDedicatedTest/concommand.cpp b/NorthstarDLL/concommand.cpp
index fddad088..fddad088 100644
--- a/NorthstarDedicatedTest/concommand.cpp
+++ b/NorthstarDLL/concommand.cpp
diff --git a/NorthstarDedicatedTest/concommand.h b/NorthstarDLL/concommand.h
index a02604f2..a02604f2 100644
--- a/NorthstarDedicatedTest/concommand.h
+++ b/NorthstarDLL/concommand.h
diff --git a/NorthstarDedicatedTest/configurables.cpp b/NorthstarDLL/configurables.cpp
index 389e6e0b..389e6e0b 100644
--- a/NorthstarDedicatedTest/configurables.cpp
+++ b/NorthstarDLL/configurables.cpp
diff --git a/NorthstarDedicatedTest/configurables.h b/NorthstarDLL/configurables.h
index cc98e15e..cc98e15e 100644
--- a/NorthstarDedicatedTest/configurables.h
+++ b/NorthstarDLL/configurables.h
diff --git a/NorthstarDedicatedTest/convar.cpp b/NorthstarDLL/convar.cpp
index 1b2e0679..1b2e0679 100644
--- a/NorthstarDedicatedTest/convar.cpp
+++ b/NorthstarDLL/convar.cpp
diff --git a/NorthstarDedicatedTest/convar.h b/NorthstarDLL/convar.h
index c39151b7..e7fb5397 100644
--- a/NorthstarDedicatedTest/convar.h
+++ b/NorthstarDLL/convar.h
@@ -58,17 +58,23 @@
 			  // ClientCommand/NET_StringCmd/CBaseClientState::ProcessStringCmd.
 #define FCVAR_SERVER_CANNOT_QUERY                                                                                                          \
 	(1 << 29) // If this is set, then the server is not allowed to query this cvar's value (via IServerPluginHelpers::StartQueryCvarValue).
+
+// !!!NOTE!!! : this is likely incorrect, there are multiple concommands that the vanilla game registers with this flag that 100% should not be remotely executable
+// i.e. multiple commands that only exist on client (screenshot, joystick_initialize)
+// we now use FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS in all places this flag was previously used
 #define FCVAR_CLIENTCMD_CAN_EXECUTE                                                                                                        \
 	(1 << 30) // IVEngineClient::ClientCmd is allowed to execute this command.
 			  // Note: IVEngineClient::ClientCmd_Unrestricted can run any client command.
 
 #define FCVAR_ACCESSIBLE_FROM_THREADS (1 << 25) // used as a debugging tool necessary to check material system thread convars
+
+// TODO: could be cool to repurpose these for northstar use somehow?
 // #define FCVAR_AVAILABLE			(1<<26)
 // #define FCVAR_AVAILABLE			(1<<27)
 // #define FCVAR_AVAILABLE			(1<<31)
 
 // flag => string stuff
-const std::map<int, const char*> g_PrintCommandFlags = {
+const std::multimap<int, const char*> g_PrintCommandFlags = {
 	{FCVAR_UNREGISTERED, "UNREGISTERED"},
 	{FCVAR_DEVELOPMENTONLY, "DEVELOPMENTONLY"},
 	{FCVAR_GAMEDLL, "GAMEDLL"},
@@ -79,8 +85,12 @@ const std::map<int, const char*> g_PrintCommandFlags = {
 	{FCVAR_ARCHIVE, "ARCHIVE"},
 	{FCVAR_NOTIFY, "NOTIFY"},
 	{FCVAR_USERINFO, "USERINFO"},
+
+	// TODO: PRINTABLEONLY and GAMEDLL_FOR_REMOTE_CLIENTS are both 1<<10, one is for vars and one is for commands
+	// this fucking sucks i think
 	{FCVAR_PRINTABLEONLY, "PRINTABLEONLY"},
 	{FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS, "GAMEDLL_FOR_REMOTE_CLIENTS"},
+
 	{FCVAR_UNLOGGED, "UNLOGGED"},
 	{FCVAR_NEVER_AS_STRING, "NEVER_AS_STRING"},
 	{FCVAR_REPLICATED, "REPLICATED"},
@@ -97,7 +107,7 @@ const std::map<int, const char*> g_PrintCommandFlags = {
 	{FCVAR_ARCHIVE_PLAYERPROFILE, "ARCHIVE_PLAYERPROFILE"},
 	{FCVAR_SERVER_CAN_EXECUTE, "SERVER_CAN_EXECUTE"},
 	{FCVAR_SERVER_CANNOT_QUERY, "SERVER_CANNOT_QUERY"},
-	{FCVAR_CLIENTCMD_CAN_EXECUTE, "CLIENTCMD_CAN_EXECUTE"},
+	{FCVAR_CLIENTCMD_CAN_EXECUTE, "UNKNOWN"}, 
 	{FCVAR_ACCESSIBLE_FROM_THREADS, "ACCESSIBLE_FROM_THREADS"}
 };
 
diff --git a/NorthstarDedicatedTest/crashhandler.cpp b/NorthstarDLL/crashhandler.cpp
index 90091883..90091883 100644
--- a/NorthstarDedicatedTest/crashhandler.cpp
+++ b/NorthstarDLL/crashhandler.cpp
diff --git a/NorthstarDedicatedTest/crashhandler.h b/NorthstarDLL/crashhandler.h
index 510372d2..510372d2 100644
--- a/NorthstarDedicatedTest/crashhandler.h
+++ b/NorthstarDLL/crashhandler.h
diff --git a/NorthstarDedicatedTest/cvar.cpp b/NorthstarDLL/cvar.cpp
index 787790be..787790be 100644
--- a/NorthstarDedicatedTest/cvar.cpp
+++ b/NorthstarDLL/cvar.cpp
diff --git a/NorthstarDedicatedTest/cvar.h b/NorthstarDLL/cvar.h
index ead30d3e..ead30d3e 100644
--- a/NorthstarDedicatedTest/cvar.h
+++ b/NorthstarDLL/cvar.h
diff --git a/NorthstarDedicatedTest/debugoverlay.cpp b/NorthstarDLL/debugoverlay.cpp
index e6601223..e6601223 100644
--- a/NorthstarDedicatedTest/debugoverlay.cpp
+++ b/NorthstarDLL/debugoverlay.cpp
diff --git a/NorthstarDedicatedTest/dedicated.cpp b/NorthstarDLL/dedicated.cpp
index 4aa1b072..4aa1b072 100644
--- a/NorthstarDedicatedTest/dedicated.cpp
+++ b/NorthstarDLL/dedicated.cpp
diff --git a/NorthstarDedicatedTest/dedicated.h b/NorthstarDLL/dedicated.h
index 82806763..82806763 100644
--- a/NorthstarDedicatedTest/dedicated.h
+++ b/NorthstarDLL/dedicated.h
diff --git a/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp b/NorthstarDLL/dedicatedmaterialsystem.cpp
index 3f1bf323..3f1bf323 100644
--- a/NorthstarDedicatedTest/dedicatedmaterialsystem.cpp
+++ b/NorthstarDLL/dedicatedmaterialsystem.cpp
diff --git a/NorthstarDedicatedTest/demofixes.cpp b/NorthstarDLL/demofixes.cpp
index ff06ae12..ff06ae12 100644
--- a/NorthstarDedicatedTest/demofixes.cpp
+++ b/NorthstarDLL/demofixes.cpp
diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDLL/dllmain.cpp
index e27cd529..e27cd529 100644
--- a/NorthstarDedicatedTest/dllmain.cpp
+++ b/NorthstarDLL/dllmain.cpp
diff --git a/NorthstarDedicatedTest/filesystem.cpp b/NorthstarDLL/filesystem.cpp
index a879b40e..a879b40e 100644
--- a/NorthstarDedicatedTest/filesystem.cpp
+++ b/NorthstarDLL/filesystem.cpp
diff --git a/NorthstarDedicatedTest/filesystem.h b/NorthstarDLL/filesystem.h
index abfdd14b..abfdd14b 100644
--- a/NorthstarDedicatedTest/filesystem.h
+++ b/NorthstarDLL/filesystem.h
diff --git a/NorthstarDedicatedTest/hooks.cpp b/NorthstarDLL/hooks.cpp
index 2b117178..2b117178 100644
--- a/NorthstarDedicatedTest/hooks.cpp
+++ b/NorthstarDLL/hooks.cpp
diff --git a/NorthstarDedicatedTest/hooks.h b/NorthstarDLL/hooks.h
index ba1bca3b..9bb4766d 100644
--- a/NorthstarDedicatedTest/hooks.h
+++ b/NorthstarDLL/hooks.h
@@ -229,25 +229,25 @@ class __autohook
 // hook a function at a given offset from a dll to be dispatched with AUTOHOOK_DISPATCH()
 #define AUTOHOOK(name, addrString, type, callingConvention, args, func) \
 namespace { \
-	type(*callingConvention name) args; \
-	type callingConvention CONCAT2(__autohookfunc, name) args func \
-	__autohook CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), __STR(addrString), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \
+type(*callingConvention name) args; \
+type callingConvention CONCAT2(__autohookfunc, name) args func \
+__autohook CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), __STR(addrString), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \
 } \
 
 // hook a function at a given absolute constant address to be dispatched with AUTOHOOK_DISPATCH()
 #define AUTOHOOK_ABSOLUTEADDR(name, addr, type, callingConvention, args, func) \
 namespace { \
-	type(*callingConvention name) args; \
-	type callingConvention CONCAT2(__autohookfunc, name) args func \
-	__autohook CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), addr, (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \
+type(*callingConvention name) args; \
+type callingConvention CONCAT2(__autohookfunc, name) args func \
+__autohook CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), addr, (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \
 } \
 
 // hook a function at a given module and exported function to be dispatched with AUTOHOOK_DISPATCH()
 #define AUTOHOOK_PROCADDRESS(name, moduleName, procName, type, callingConvention, args, func) \
 namespace { \
-	type(*callingConvention name) args; \
-	type callingConvention CONCAT2(__autohookfunc, name) args func \
-	__autohook CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), __STR(moduleName), __STR(procName), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \
+type(*callingConvention name) args; \
+type callingConvention CONCAT2(__autohookfunc, name) args func \
+__autohook CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), __STR(moduleName), __STR(procName), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name)); \
 } \
 
 class ManualHook
@@ -268,13 +268,13 @@ class ManualHook
 // hook a function to be dispatched manually later
 #define HOOK(varName, originalFunc, type, callingConvention, args, func) \
 namespace { \
-	type(*callingConvention originalFunc) args; \
-	type callingConvention CONCAT2(__manualhookfunc, varName) args func \
+type(*callingConvention originalFunc) args; \
+type callingConvention CONCAT2(__manualhookfunc, varName) args func \
 } \
 ManualHook varName = ManualHook(__STR(varName), (LPVOID*)&originalFunc, (LPVOID)CONCAT2(__manualhookfunc, varName)); \
 
 #define HOOK_NOORIG(varName, type, callingConvention, args, func) \
 namespace { \
-	type callingConvention CONCAT2(__manualhookfunc, varName) args func \
+type callingConvention CONCAT2(__manualhookfunc, varName) args func \
 } \
 ManualHook varName = ManualHook(__STR(varName), (LPVOID)CONCAT2(__manualhookfunc, varName)); \
\ No newline at end of file
diff --git a/NorthstarDedicatedTest/hookutils.cpp b/NorthstarDLL/hookutils.cpp
index f5df3996..f5df3996 100644
--- a/NorthstarDedicatedTest/hookutils.cpp
+++ b/NorthstarDLL/hookutils.cpp
diff --git a/NorthstarDedicatedTest/hookutils.h b/NorthstarDLL/hookutils.h
index a3846b51..a3846b51 100644
--- a/NorthstarDedicatedTest/hookutils.h
+++ b/NorthstarDLL/hookutils.h
diff --git a/NorthstarDedicatedTest/host.cpp b/NorthstarDLL/host.cpp
index 5221395a..a1cb65ff 100644
--- a/NorthstarDedicatedTest/host.cpp
+++ b/NorthstarDLL/host.cpp
@@ -50,8 +50,8 @@ void,, (bool bDedicated),
 	R2::g_pCVar->FindCommand("disconnect")->m_nFlags |= FCVAR_SERVER_CAN_EXECUTE;
 
 	// make clients able to run status and ping
-	R2::g_pCVar->FindCommand("status")->m_nFlags |= FCVAR_CLIENTCMD_CAN_EXECUTE;
-	R2::g_pCVar->FindCommand("ping")->m_nFlags |= FCVAR_CLIENTCMD_CAN_EXECUTE;
+	R2::g_pCVar->FindCommand("status")->m_nFlags |= FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS;
+	R2::g_pCVar->FindCommand("ping")->m_nFlags |= FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS;
 
 	// need to initialise these after host_init since they do stuff to preexisting concommands/convars without being client/server specific
 	InitialiseCommandPrint();
diff --git a/NorthstarDedicatedTest/hoststate.cpp b/NorthstarDLL/hoststate.cpp
index c3663a42..c3663a42 100644
--- a/NorthstarDedicatedTest/hoststate.cpp
+++ b/NorthstarDLL/hoststate.cpp
diff --git a/NorthstarDedicatedTest/hoststate.h b/NorthstarDLL/hoststate.h
index a77385ef..a77385ef 100644
--- a/NorthstarDedicatedTest/hoststate.h
+++ b/NorthstarDLL/hoststate.h
diff --git a/NorthstarDedicatedTest/include/MinHook.h b/NorthstarDLL/include/MinHook.h
index 15c0a875..15c0a875 100644
--- a/NorthstarDedicatedTest/include/MinHook.h
+++ b/NorthstarDLL/include/MinHook.h
diff --git a/NorthstarDedicatedTest/include/MinHook.x64.lib b/NorthstarDLL/include/MinHook.x64.lib
index 213df08f..213df08f 100644
--- a/NorthstarDedicatedTest/include/MinHook.x64.lib
+++ b/NorthstarDLL/include/MinHook.x64.lib
diff --git a/NorthstarDedicatedTest/include/crypto/__DECC_INCLUDE_EPILOGUE.H b/NorthstarDLL/include/crypto/__DECC_INCLUDE_EPILOGUE.H
index e57c0eab..e57c0eab 100644
--- a/NorthstarDedicatedTest/include/crypto/__DECC_INCLUDE_EPILOGUE.H
+++ b/NorthstarDLL/include/crypto/__DECC_INCLUDE_EPILOGUE.H
diff --git a/NorthstarDedicatedTest/include/crypto/__DECC_INCLUDE_PROLOGUE.H b/NorthstarDLL/include/crypto/__DECC_INCLUDE_PROLOGUE.H
index a0139575..a0139575 100644
--- a/NorthstarDedicatedTest/include/crypto/__DECC_INCLUDE_PROLOGUE.H
+++ b/NorthstarDLL/include/crypto/__DECC_INCLUDE_PROLOGUE.H
diff --git a/NorthstarDedicatedTest/include/crypto/aes_platform.h b/NorthstarDLL/include/crypto/aes_platform.h
index e95ad5aa..e95ad5aa 100644
--- a/NorthstarDedicatedTest/include/crypto/aes_platform.h
+++ b/NorthstarDLL/include/crypto/aes_platform.h
diff --git a/NorthstarDedicatedTest/include/crypto/aria.h b/NorthstarDLL/include/crypto/aria.h
index 21a9932e..21a9932e 100644
--- a/NorthstarDedicatedTest/include/crypto/aria.h
+++ b/NorthstarDLL/include/crypto/aria.h
diff --git a/NorthstarDedicatedTest/include/crypto/asn1.h b/NorthstarDLL/include/crypto/asn1.h
index ec76ae6f..ec76ae6f 100644
--- a/NorthstarDedicatedTest/include/crypto/asn1.h
+++ b/NorthstarDLL/include/crypto/asn1.h
diff --git a/NorthstarDedicatedTest/include/crypto/asn1_dsa.h b/NorthstarDLL/include/crypto/asn1_dsa.h
index 3eadb9ec..3eadb9ec 100644
--- a/NorthstarDedicatedTest/include/crypto/asn1_dsa.h
+++ b/NorthstarDLL/include/crypto/asn1_dsa.h
diff --git a/NorthstarDedicatedTest/include/crypto/asn1err.h b/NorthstarDLL/include/crypto/asn1err.h
index 6441386b..6441386b 100644
--- a/NorthstarDedicatedTest/include/crypto/asn1err.h
+++ b/NorthstarDLL/include/crypto/asn1err.h
diff --git a/NorthstarDedicatedTest/include/crypto/async.h b/NorthstarDLL/include/crypto/async.h
index 7bc0dbb6..7bc0dbb6 100644
--- a/NorthstarDedicatedTest/include/crypto/async.h
+++ b/NorthstarDLL/include/crypto/async.h
diff --git a/NorthstarDedicatedTest/include/crypto/asyncerr.h b/NorthstarDLL/include/crypto/asyncerr.h
index 574e0af7..574e0af7 100644
--- a/NorthstarDedicatedTest/include/crypto/asyncerr.h
+++ b/NorthstarDLL/include/crypto/asyncerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/bioerr.h b/NorthstarDLL/include/crypto/bioerr.h
index a0c06099..a0c06099 100644
--- a/NorthstarDedicatedTest/include/crypto/bioerr.h
+++ b/NorthstarDLL/include/crypto/bioerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/bn.h b/NorthstarDLL/include/crypto/bn.h
index cf69bea8..cf69bea8 100644
--- a/NorthstarDedicatedTest/include/crypto/bn.h
+++ b/NorthstarDLL/include/crypto/bn.h
diff --git a/NorthstarDedicatedTest/include/crypto/bn_conf.h b/NorthstarDLL/include/crypto/bn_conf.h
index a6f73d4a..a6f73d4a 100644
--- a/NorthstarDedicatedTest/include/crypto/bn_conf.h
+++ b/NorthstarDLL/include/crypto/bn_conf.h
diff --git a/NorthstarDedicatedTest/include/crypto/bn_conf.h.in b/NorthstarDLL/include/crypto/bn_conf.h.in
index dbc901b1..dbc901b1 100644
--- a/NorthstarDedicatedTest/include/crypto/bn_conf.h.in
+++ b/NorthstarDLL/include/crypto/bn_conf.h.in
diff --git a/NorthstarDedicatedTest/include/crypto/bn_dh.h b/NorthstarDLL/include/crypto/bn_dh.h
index 6d12c20e..6d12c20e 100644
--- a/NorthstarDedicatedTest/include/crypto/bn_dh.h
+++ b/NorthstarDLL/include/crypto/bn_dh.h
diff --git a/NorthstarDedicatedTest/include/crypto/bn_srp.h b/NorthstarDLL/include/crypto/bn_srp.h
index 00b160aa..00b160aa 100644
--- a/NorthstarDedicatedTest/include/crypto/bn_srp.h
+++ b/NorthstarDLL/include/crypto/bn_srp.h
diff --git a/NorthstarDedicatedTest/include/crypto/bnerr.h b/NorthstarDLL/include/crypto/bnerr.h
index 7282c915..7282c915 100644
--- a/NorthstarDedicatedTest/include/crypto/bnerr.h
+++ b/NorthstarDLL/include/crypto/bnerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/buffererr.h b/NorthstarDLL/include/crypto/buffererr.h
index 54976d95..54976d95 100644
--- a/NorthstarDedicatedTest/include/crypto/buffererr.h
+++ b/NorthstarDLL/include/crypto/buffererr.h
diff --git a/NorthstarDedicatedTest/include/crypto/chacha.h b/NorthstarDLL/include/crypto/chacha.h
index d29998ff..d29998ff 100644
--- a/NorthstarDedicatedTest/include/crypto/chacha.h
+++ b/NorthstarDLL/include/crypto/chacha.h
diff --git a/NorthstarDedicatedTest/include/crypto/cmll_platform.h b/NorthstarDLL/include/crypto/cmll_platform.h
index 8cadadf6..8cadadf6 100644
--- a/NorthstarDedicatedTest/include/crypto/cmll_platform.h
+++ b/NorthstarDLL/include/crypto/cmll_platform.h
diff --git a/NorthstarDedicatedTest/include/crypto/cmperr.h b/NorthstarDLL/include/crypto/cmperr.h
index ac61dd48..ac61dd48 100644
--- a/NorthstarDedicatedTest/include/crypto/cmperr.h
+++ b/NorthstarDLL/include/crypto/cmperr.h
diff --git a/NorthstarDedicatedTest/include/crypto/cmserr.h b/NorthstarDLL/include/crypto/cmserr.h
index 1de2f9c7..1de2f9c7 100644
--- a/NorthstarDedicatedTest/include/crypto/cmserr.h
+++ b/NorthstarDLL/include/crypto/cmserr.h
diff --git a/NorthstarDedicatedTest/include/crypto/comperr.h b/NorthstarDLL/include/crypto/comperr.h
index 0fd9c6de..0fd9c6de 100644
--- a/NorthstarDedicatedTest/include/crypto/comperr.h
+++ b/NorthstarDLL/include/crypto/comperr.h
diff --git a/NorthstarDedicatedTest/include/crypto/conferr.h b/NorthstarDLL/include/crypto/conferr.h
index cb367e4f..cb367e4f 100644
--- a/NorthstarDedicatedTest/include/crypto/conferr.h
+++ b/NorthstarDLL/include/crypto/conferr.h
diff --git a/NorthstarDedicatedTest/include/crypto/crmferr.h b/NorthstarDLL/include/crypto/crmferr.h
index f1a27e04..f1a27e04 100644
--- a/NorthstarDedicatedTest/include/crypto/crmferr.h
+++ b/NorthstarDLL/include/crypto/crmferr.h
diff --git a/NorthstarDedicatedTest/include/crypto/cryptlib.h b/NorthstarDLL/include/crypto/cryptlib.h
index 39a956bf..39a956bf 100644
--- a/NorthstarDedicatedTest/include/crypto/cryptlib.h
+++ b/NorthstarDLL/include/crypto/cryptlib.h
diff --git a/NorthstarDedicatedTest/include/crypto/cryptoerr.h b/NorthstarDLL/include/crypto/cryptoerr.h
index 288b87ac..288b87ac 100644
--- a/NorthstarDedicatedTest/include/crypto/cryptoerr.h
+++ b/NorthstarDLL/include/crypto/cryptoerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/cterr.h b/NorthstarDLL/include/crypto/cterr.h
index 760bc796..760bc796 100644
--- a/NorthstarDedicatedTest/include/crypto/cterr.h
+++ b/NorthstarDLL/include/crypto/cterr.h
diff --git a/NorthstarDedicatedTest/include/crypto/ctype.h b/NorthstarDLL/include/crypto/ctype.h
index a35c137e..a35c137e 100644
--- a/NorthstarDedicatedTest/include/crypto/ctype.h
+++ b/NorthstarDLL/include/crypto/ctype.h
diff --git a/NorthstarDedicatedTest/include/crypto/decoder.h b/NorthstarDLL/include/crypto/decoder.h
index cc06ef29..cc06ef29 100644
--- a/NorthstarDedicatedTest/include/crypto/decoder.h
+++ b/NorthstarDLL/include/crypto/decoder.h
diff --git a/NorthstarDedicatedTest/include/crypto/decodererr.h b/NorthstarDLL/include/crypto/decodererr.h
index d7badc43..d7badc43 100644
--- a/NorthstarDedicatedTest/include/crypto/decodererr.h
+++ b/NorthstarDLL/include/crypto/decodererr.h
diff --git a/NorthstarDedicatedTest/include/crypto/des_platform.h b/NorthstarDLL/include/crypto/des_platform.h
index 07ea1ddd..07ea1ddd 100644
--- a/NorthstarDedicatedTest/include/crypto/des_platform.h
+++ b/NorthstarDLL/include/crypto/des_platform.h
diff --git a/NorthstarDedicatedTest/include/crypto/dh.h b/NorthstarDLL/include/crypto/dh.h
index f6be4ae0..f6be4ae0 100644
--- a/NorthstarDedicatedTest/include/crypto/dh.h
+++ b/NorthstarDLL/include/crypto/dh.h
diff --git a/NorthstarDedicatedTest/include/crypto/dherr.h b/NorthstarDLL/include/crypto/dherr.h
index bb24d131..bb24d131 100644
--- a/NorthstarDedicatedTest/include/crypto/dherr.h
+++ b/NorthstarDLL/include/crypto/dherr.h
diff --git a/NorthstarDedicatedTest/include/crypto/dsa.h b/NorthstarDLL/include/crypto/dsa.h
index eedbd8c7..eedbd8c7 100644
--- a/NorthstarDedicatedTest/include/crypto/dsa.h
+++ b/NorthstarDLL/include/crypto/dsa.h
diff --git a/NorthstarDedicatedTest/include/crypto/dsaerr.h b/NorthstarDLL/include/crypto/dsaerr.h
index 9898097d..9898097d 100644
--- a/NorthstarDedicatedTest/include/crypto/dsaerr.h
+++ b/NorthstarDLL/include/crypto/dsaerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/dso_conf.h b/NorthstarDLL/include/crypto/dso_conf.h
index 99514321..99514321 100644
--- a/NorthstarDedicatedTest/include/crypto/dso_conf.h
+++ b/NorthstarDLL/include/crypto/dso_conf.h
diff --git a/NorthstarDedicatedTest/include/crypto/dso_conf.h.in b/NorthstarDLL/include/crypto/dso_conf.h.in
index 12de11ad..12de11ad 100644
--- a/NorthstarDedicatedTest/include/crypto/dso_conf.h.in
+++ b/NorthstarDLL/include/crypto/dso_conf.h.in
diff --git a/NorthstarDedicatedTest/include/crypto/ec.h b/NorthstarDLL/include/crypto/ec.h
index 62163b31..62163b31 100644
--- a/NorthstarDedicatedTest/include/crypto/ec.h
+++ b/NorthstarDLL/include/crypto/ec.h
diff --git a/NorthstarDedicatedTest/include/crypto/ecerr.h b/NorthstarDLL/include/crypto/ecerr.h
index 07b6c7aa..07b6c7aa 100644
--- a/NorthstarDedicatedTest/include/crypto/ecerr.h
+++ b/NorthstarDLL/include/crypto/ecerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/ecx.h b/NorthstarDLL/include/crypto/ecx.h
index 48b95fa5..48b95fa5 100644
--- a/NorthstarDedicatedTest/include/crypto/ecx.h
+++ b/NorthstarDLL/include/crypto/ecx.h
diff --git a/NorthstarDedicatedTest/include/crypto/encoder.h b/NorthstarDLL/include/crypto/encoder.h
index 09d445d2..09d445d2 100644
--- a/NorthstarDedicatedTest/include/crypto/encoder.h
+++ b/NorthstarDLL/include/crypto/encoder.h
diff --git a/NorthstarDedicatedTest/include/crypto/encodererr.h b/NorthstarDLL/include/crypto/encodererr.h
index 56c45823..56c45823 100644
--- a/NorthstarDedicatedTest/include/crypto/encodererr.h
+++ b/NorthstarDLL/include/crypto/encodererr.h
diff --git a/NorthstarDedicatedTest/include/crypto/engine.h b/NorthstarDLL/include/crypto/engine.h
index fac6ed09..fac6ed09 100644
--- a/NorthstarDedicatedTest/include/crypto/engine.h
+++ b/NorthstarDLL/include/crypto/engine.h
diff --git a/NorthstarDedicatedTest/include/crypto/engineerr.h b/NorthstarDLL/include/crypto/engineerr.h
index 737c841d..737c841d 100644
--- a/NorthstarDedicatedTest/include/crypto/engineerr.h
+++ b/NorthstarDLL/include/crypto/engineerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/err.h b/NorthstarDLL/include/crypto/err.h
index 15ec6fd0..15ec6fd0 100644
--- a/NorthstarDedicatedTest/include/crypto/err.h
+++ b/NorthstarDLL/include/crypto/err.h
diff --git a/NorthstarDedicatedTest/include/crypto/ess.h b/NorthstarDLL/include/crypto/ess.h
index 7acde5f8..7acde5f8 100644
--- a/NorthstarDedicatedTest/include/crypto/ess.h
+++ b/NorthstarDLL/include/crypto/ess.h
diff --git a/NorthstarDedicatedTest/include/crypto/esserr.h b/NorthstarDLL/include/crypto/esserr.h
index 8df2df11..8df2df11 100644
--- a/NorthstarDedicatedTest/include/crypto/esserr.h
+++ b/NorthstarDLL/include/crypto/esserr.h
diff --git a/NorthstarDedicatedTest/include/crypto/evp.h b/NorthstarDLL/include/crypto/evp.h
index c5d3a930..c5d3a930 100644
--- a/NorthstarDedicatedTest/include/crypto/evp.h
+++ b/NorthstarDLL/include/crypto/evp.h
diff --git a/NorthstarDedicatedTest/include/crypto/evperr.h b/NorthstarDLL/include/crypto/evperr.h
index d90ba83f..d90ba83f 100644
--- a/NorthstarDedicatedTest/include/crypto/evperr.h
+++ b/NorthstarDLL/include/crypto/evperr.h
diff --git a/NorthstarDedicatedTest/include/crypto/httperr.h b/NorthstarDLL/include/crypto/httperr.h
index 969df17b..969df17b 100644
--- a/NorthstarDedicatedTest/include/crypto/httperr.h
+++ b/NorthstarDLL/include/crypto/httperr.h
diff --git a/NorthstarDedicatedTest/include/crypto/lhash.h b/NorthstarDLL/include/crypto/lhash.h
index 0f64869f..0f64869f 100644
--- a/NorthstarDedicatedTest/include/crypto/lhash.h
+++ b/NorthstarDLL/include/crypto/lhash.h
diff --git a/NorthstarDedicatedTest/include/crypto/md32_common.h b/NorthstarDLL/include/crypto/md32_common.h
index 3b16f1b7..3b16f1b7 100644
--- a/NorthstarDedicatedTest/include/crypto/md32_common.h
+++ b/NorthstarDLL/include/crypto/md32_common.h
diff --git a/NorthstarDedicatedTest/include/crypto/modes.h b/NorthstarDLL/include/crypto/modes.h
index 19f9d859..19f9d859 100644
--- a/NorthstarDedicatedTest/include/crypto/modes.h
+++ b/NorthstarDLL/include/crypto/modes.h
diff --git a/NorthstarDedicatedTest/include/crypto/objects.h b/NorthstarDLL/include/crypto/objects.h
index f22e9287..f22e9287 100644
--- a/NorthstarDedicatedTest/include/crypto/objects.h
+++ b/NorthstarDLL/include/crypto/objects.h
diff --git a/NorthstarDedicatedTest/include/crypto/objectserr.h b/NorthstarDLL/include/crypto/objectserr.h
index ec994824..ec994824 100644
--- a/NorthstarDedicatedTest/include/crypto/objectserr.h
+++ b/NorthstarDLL/include/crypto/objectserr.h
diff --git a/NorthstarDedicatedTest/include/crypto/ocsperr.h b/NorthstarDLL/include/crypto/ocsperr.h
index f9529b2a..f9529b2a 100644
--- a/NorthstarDedicatedTest/include/crypto/ocsperr.h
+++ b/NorthstarDLL/include/crypto/ocsperr.h
diff --git a/NorthstarDedicatedTest/include/crypto/pem.h b/NorthstarDLL/include/crypto/pem.h
index 840dc18f..840dc18f 100644
--- a/NorthstarDedicatedTest/include/crypto/pem.h
+++ b/NorthstarDLL/include/crypto/pem.h
diff --git a/NorthstarDedicatedTest/include/crypto/pemerr.h b/NorthstarDLL/include/crypto/pemerr.h
index b255ff5c..b255ff5c 100644
--- a/NorthstarDedicatedTest/include/crypto/pemerr.h
+++ b/NorthstarDLL/include/crypto/pemerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/pkcs12err.h b/NorthstarDLL/include/crypto/pkcs12err.h
index 662f412e..662f412e 100644
--- a/NorthstarDedicatedTest/include/crypto/pkcs12err.h
+++ b/NorthstarDLL/include/crypto/pkcs12err.h
diff --git a/NorthstarDedicatedTest/include/crypto/pkcs7.h b/NorthstarDLL/include/crypto/pkcs7.h
index 9caa9af4..9caa9af4 100644
--- a/NorthstarDedicatedTest/include/crypto/pkcs7.h
+++ b/NorthstarDLL/include/crypto/pkcs7.h
diff --git a/NorthstarDedicatedTest/include/crypto/pkcs7err.h b/NorthstarDLL/include/crypto/pkcs7err.h
index c195190b..c195190b 100644
--- a/NorthstarDedicatedTest/include/crypto/pkcs7err.h
+++ b/NorthstarDLL/include/crypto/pkcs7err.h
diff --git a/NorthstarDedicatedTest/include/crypto/poly1305.h b/NorthstarDLL/include/crypto/poly1305.h
index ba54f3bd..ba54f3bd 100644
--- a/NorthstarDedicatedTest/include/crypto/poly1305.h
+++ b/NorthstarDLL/include/crypto/poly1305.h
diff --git a/NorthstarDedicatedTest/include/crypto/ppc_arch.h b/NorthstarDLL/include/crypto/ppc_arch.h
index 3b3ce4bf..3b3ce4bf 100644
--- a/NorthstarDedicatedTest/include/crypto/ppc_arch.h
+++ b/NorthstarDLL/include/crypto/ppc_arch.h
diff --git a/NorthstarDedicatedTest/include/crypto/punycode.h b/NorthstarDLL/include/crypto/punycode.h
index 133826d8..133826d8 100644
--- a/NorthstarDedicatedTest/include/crypto/punycode.h
+++ b/NorthstarDLL/include/crypto/punycode.h
diff --git a/NorthstarDedicatedTest/include/crypto/rand.h b/NorthstarDLL/include/crypto/rand.h
index fa3b5b2b..fa3b5b2b 100644
--- a/NorthstarDedicatedTest/include/crypto/rand.h
+++ b/NorthstarDLL/include/crypto/rand.h
diff --git a/NorthstarDedicatedTest/include/crypto/rand_pool.h b/NorthstarDLL/include/crypto/rand_pool.h
index f4d1d954..f4d1d954 100644
--- a/NorthstarDedicatedTest/include/crypto/rand_pool.h
+++ b/NorthstarDLL/include/crypto/rand_pool.h
diff --git a/NorthstarDedicatedTest/include/crypto/randerr.h b/NorthstarDLL/include/crypto/randerr.h
index 832a8b7d..832a8b7d 100644
--- a/NorthstarDedicatedTest/include/crypto/randerr.h
+++ b/NorthstarDLL/include/crypto/randerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/rsa.h b/NorthstarDLL/include/crypto/rsa.h
index 100e7ceb..100e7ceb 100644
--- a/NorthstarDedicatedTest/include/crypto/rsa.h
+++ b/NorthstarDLL/include/crypto/rsa.h
diff --git a/NorthstarDedicatedTest/include/crypto/rsaerr.h b/NorthstarDLL/include/crypto/rsaerr.h
index 9b23500b..9b23500b 100644
--- a/NorthstarDedicatedTest/include/crypto/rsaerr.h
+++ b/NorthstarDLL/include/crypto/rsaerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/security_bits.h b/NorthstarDLL/include/crypto/security_bits.h
index 58f49681..58f49681 100644
--- a/NorthstarDedicatedTest/include/crypto/security_bits.h
+++ b/NorthstarDLL/include/crypto/security_bits.h
diff --git a/NorthstarDedicatedTest/include/crypto/sha.h b/NorthstarDLL/include/crypto/sha.h
index 64305d17..64305d17 100644
--- a/NorthstarDedicatedTest/include/crypto/sha.h
+++ b/NorthstarDLL/include/crypto/sha.h
diff --git a/NorthstarDedicatedTest/include/crypto/siphash.h b/NorthstarDLL/include/crypto/siphash.h
index 0d0767fc..0d0767fc 100644
--- a/NorthstarDedicatedTest/include/crypto/siphash.h
+++ b/NorthstarDLL/include/crypto/siphash.h
diff --git a/NorthstarDedicatedTest/include/crypto/siv.h b/NorthstarDLL/include/crypto/siv.h
index 8dc58bd3..8dc58bd3 100644
--- a/NorthstarDedicatedTest/include/crypto/siv.h
+++ b/NorthstarDLL/include/crypto/siv.h
diff --git a/NorthstarDedicatedTest/include/crypto/sm2.h b/NorthstarDLL/include/crypto/sm2.h
index 9ab6c0b7..9ab6c0b7 100644
--- a/NorthstarDedicatedTest/include/crypto/sm2.h
+++ b/NorthstarDLL/include/crypto/sm2.h
diff --git a/NorthstarDedicatedTest/include/crypto/sm2err.h b/NorthstarDLL/include/crypto/sm2err.h
index 706f4d69..706f4d69 100644
--- a/NorthstarDedicatedTest/include/crypto/sm2err.h
+++ b/NorthstarDLL/include/crypto/sm2err.h
diff --git a/NorthstarDedicatedTest/include/crypto/sm4.h b/NorthstarDLL/include/crypto/sm4.h
index e21ec81c..e21ec81c 100644
--- a/NorthstarDedicatedTest/include/crypto/sm4.h
+++ b/NorthstarDLL/include/crypto/sm4.h
diff --git a/NorthstarDedicatedTest/include/crypto/sparc_arch.h b/NorthstarDLL/include/crypto/sparc_arch.h
index 447e715b..447e715b 100644
--- a/NorthstarDedicatedTest/include/crypto/sparc_arch.h
+++ b/NorthstarDLL/include/crypto/sparc_arch.h
diff --git a/NorthstarDedicatedTest/include/crypto/sparse_array.h b/NorthstarDLL/include/crypto/sparse_array.h
index 7ef74283..7ef74283 100644
--- a/NorthstarDedicatedTest/include/crypto/sparse_array.h
+++ b/NorthstarDLL/include/crypto/sparse_array.h
diff --git a/NorthstarDedicatedTest/include/crypto/store.h b/NorthstarDLL/include/crypto/store.h
index 13d2646b..13d2646b 100644
--- a/NorthstarDedicatedTest/include/crypto/store.h
+++ b/NorthstarDLL/include/crypto/store.h
diff --git a/NorthstarDedicatedTest/include/crypto/storeerr.h b/NorthstarDLL/include/crypto/storeerr.h
index c46d845f..c46d845f 100644
--- a/NorthstarDedicatedTest/include/crypto/storeerr.h
+++ b/NorthstarDLL/include/crypto/storeerr.h
diff --git a/NorthstarDedicatedTest/include/crypto/tserr.h b/NorthstarDLL/include/crypto/tserr.h
index 2f34ba31..2f34ba31 100644
--- a/NorthstarDedicatedTest/include/crypto/tserr.h
+++ b/NorthstarDLL/include/crypto/tserr.h
diff --git a/NorthstarDedicatedTest/include/crypto/types.h b/NorthstarDLL/include/crypto/types.h
index 0d814040..0d814040 100644
--- a/NorthstarDedicatedTest/include/crypto/types.h
+++ b/NorthstarDLL/include/crypto/types.h
diff --git a/NorthstarDedicatedTest/include/crypto/uierr.h b/NorthstarDLL/include/crypto/uierr.h
index 789077a8..789077a8 100644
--- a/NorthstarDedicatedTest/include/crypto/uierr.h
+++ b/NorthstarDLL/include/crypto/uierr.h
diff --git a/NorthstarDedicatedTest/include/crypto/x509.h b/NorthstarDLL/include/crypto/x509.h
index 1f00178e..1f00178e 100644
--- a/NorthstarDedicatedTest/include/crypto/x509.h
+++ b/NorthstarDLL/include/crypto/x509.h
diff --git a/NorthstarDedicatedTest/include/crypto/x509err.h b/NorthstarDLL/include/crypto/x509err.h
index 53f567d9..53f567d9 100644
--- a/NorthstarDedicatedTest/include/crypto/x509err.h
+++ b/NorthstarDLL/include/crypto/x509err.h
diff --git a/NorthstarDedicatedTest/include/crypto/x509v3err.h b/NorthstarDLL/include/crypto/x509v3err.h
index 66d3ad92..66d3ad92 100644
--- a/NorthstarDedicatedTest/include/crypto/x509v3err.h
+++ b/NorthstarDLL/include/crypto/x509v3err.h
diff --git a/NorthstarDedicatedTest/include/httplib.h b/NorthstarDLL/include/httplib.h
index 2b52f0fc..2b52f0fc 100644
--- a/NorthstarDedicatedTest/include/httplib.h
+++ b/NorthstarDLL/include/httplib.h
diff --git a/NorthstarDedicatedTest/include/internal/__DECC_INCLUDE_EPILOGUE.H b/NorthstarDLL/include/internal/__DECC_INCLUDE_EPILOGUE.H
index e57c0eab..e57c0eab 100644
--- a/NorthstarDedicatedTest/include/internal/__DECC_INCLUDE_EPILOGUE.H
+++ b/NorthstarDLL/include/internal/__DECC_INCLUDE_EPILOGUE.H
diff --git a/NorthstarDedicatedTest/include/internal/__DECC_INCLUDE_PROLOGUE.H b/NorthstarDLL/include/internal/__DECC_INCLUDE_PROLOGUE.H
index a0139575..a0139575 100644
--- a/NorthstarDedicatedTest/include/internal/__DECC_INCLUDE_PROLOGUE.H
+++ b/NorthstarDLL/include/internal/__DECC_INCLUDE_PROLOGUE.H
diff --git a/NorthstarDedicatedTest/include/internal/asn1.h b/NorthstarDLL/include/internal/asn1.h
index 3143e340..3143e340 100644
--- a/NorthstarDedicatedTest/include/internal/asn1.h
+++ b/NorthstarDLL/include/internal/asn1.h
diff --git a/NorthstarDedicatedTest/include/internal/bio.h b/NorthstarDLL/include/internal/bio.h
index 2d36a7b9..2d36a7b9 100644
--- a/NorthstarDedicatedTest/include/internal/bio.h
+++ b/NorthstarDLL/include/internal/bio.h
diff --git a/NorthstarDedicatedTest/include/internal/comp.h b/NorthstarDLL/include/internal/comp.h
index 3ad86fc7..3ad86fc7 100644
--- a/NorthstarDedicatedTest/include/internal/comp.h
+++ b/NorthstarDLL/include/internal/comp.h
diff --git a/NorthstarDedicatedTest/include/internal/conf.h b/NorthstarDLL/include/internal/conf.h
index 8c6c29cd..8c6c29cd 100644
--- a/NorthstarDedicatedTest/include/internal/conf.h
+++ b/NorthstarDLL/include/internal/conf.h
diff --git a/NorthstarDedicatedTest/include/internal/constant_time.h b/NorthstarDLL/include/internal/constant_time.h
index 0ed6f823..0ed6f823 100644
--- a/NorthstarDedicatedTest/include/internal/constant_time.h
+++ b/NorthstarDLL/include/internal/constant_time.h
diff --git a/NorthstarDedicatedTest/include/internal/core.h b/NorthstarDLL/include/internal/core.h
index d9dc4241..d9dc4241 100644
--- a/NorthstarDedicatedTest/include/internal/core.h
+++ b/NorthstarDLL/include/internal/core.h
diff --git a/NorthstarDedicatedTest/include/internal/cryptlib.h b/NorthstarDLL/include/internal/cryptlib.h
index 1291299b..1291299b 100644
--- a/NorthstarDedicatedTest/include/internal/cryptlib.h
+++ b/NorthstarDLL/include/internal/cryptlib.h
diff --git a/NorthstarDedicatedTest/include/internal/dane.h b/NorthstarDLL/include/internal/dane.h
index a3d78a7f..a3d78a7f 100644
--- a/NorthstarDedicatedTest/include/internal/dane.h
+++ b/NorthstarDLL/include/internal/dane.h
diff --git a/NorthstarDedicatedTest/include/internal/deprecated.h b/NorthstarDLL/include/internal/deprecated.h
index a313a015..a313a015 100644
--- a/NorthstarDedicatedTest/include/internal/deprecated.h
+++ b/NorthstarDLL/include/internal/deprecated.h
diff --git a/NorthstarDedicatedTest/include/internal/der.h b/NorthstarDLL/include/internal/der.h
index a3e56d0d..a3e56d0d 100644
--- a/NorthstarDedicatedTest/include/internal/der.h
+++ b/NorthstarDLL/include/internal/der.h
diff --git a/NorthstarDedicatedTest/include/internal/dso.h b/NorthstarDLL/include/internal/dso.h
index 160ddb98..160ddb98 100644
--- a/NorthstarDedicatedTest/include/internal/dso.h
+++ b/NorthstarDLL/include/internal/dso.h
diff --git a/NorthstarDedicatedTest/include/internal/dsoerr.h b/NorthstarDLL/include/internal/dsoerr.h
index b1719e83..b1719e83 100644
--- a/NorthstarDedicatedTest/include/internal/dsoerr.h
+++ b/NorthstarDLL/include/internal/dsoerr.h
diff --git a/NorthstarDedicatedTest/include/internal/endian.h b/NorthstarDLL/include/internal/endian.h
index 8b34e03e..8b34e03e 100644
--- a/NorthstarDedicatedTest/include/internal/endian.h
+++ b/NorthstarDLL/include/internal/endian.h
diff --git a/NorthstarDedicatedTest/include/internal/err.h b/NorthstarDLL/include/internal/err.h
index d8a308f0..d8a308f0 100644
--- a/NorthstarDedicatedTest/include/internal/err.h
+++ b/NorthstarDLL/include/internal/err.h
diff --git a/NorthstarDedicatedTest/include/internal/ffc.h b/NorthstarDLL/include/internal/ffc.h
index 79cb06ab..79cb06ab 100644
--- a/NorthstarDedicatedTest/include/internal/ffc.h
+++ b/NorthstarDLL/include/internal/ffc.h
diff --git a/NorthstarDedicatedTest/include/internal/ktls.h b/NorthstarDLL/include/internal/ktls.h
index 95492fd0..95492fd0 100644
--- a/NorthstarDedicatedTest/include/internal/ktls.h
+++ b/NorthstarDLL/include/internal/ktls.h
diff --git a/NorthstarDedicatedTest/include/internal/namemap.h b/NorthstarDLL/include/internal/namemap.h
index a4c60ae6..a4c60ae6 100644
--- a/NorthstarDedicatedTest/include/internal/namemap.h
+++ b/NorthstarDLL/include/internal/namemap.h
diff --git a/NorthstarDedicatedTest/include/internal/nelem.h b/NorthstarDLL/include/internal/nelem.h
index b758513b..b758513b 100644
--- a/NorthstarDedicatedTest/include/internal/nelem.h
+++ b/NorthstarDLL/include/internal/nelem.h
diff --git a/NorthstarDedicatedTest/include/internal/numbers.h b/NorthstarDLL/include/internal/numbers.h
index 4f4d3306..4f4d3306 100644
--- a/NorthstarDedicatedTest/include/internal/numbers.h
+++ b/NorthstarDLL/include/internal/numbers.h
diff --git a/NorthstarDedicatedTest/include/internal/o_dir.h b/NorthstarDLL/include/internal/o_dir.h
index add34d14..add34d14 100644
--- a/NorthstarDedicatedTest/include/internal/o_dir.h
+++ b/NorthstarDLL/include/internal/o_dir.h
diff --git a/NorthstarDedicatedTest/include/internal/packet.h b/NorthstarDLL/include/internal/packet.h
index 170997db..170997db 100644
--- a/NorthstarDedicatedTest/include/internal/packet.h
+++ b/NorthstarDLL/include/internal/packet.h
diff --git a/NorthstarDedicatedTest/include/internal/param_build_set.h b/NorthstarDLL/include/internal/param_build_set.h
index 126211b7..126211b7 100644
--- a/NorthstarDedicatedTest/include/internal/param_build_set.h
+++ b/NorthstarDLL/include/internal/param_build_set.h
diff --git a/NorthstarDedicatedTest/include/internal/passphrase.h b/NorthstarDLL/include/internal/passphrase.h
index 54d997b0..54d997b0 100644
--- a/NorthstarDedicatedTest/include/internal/passphrase.h
+++ b/NorthstarDLL/include/internal/passphrase.h
diff --git a/NorthstarDedicatedTest/include/internal/property.h b/NorthstarDLL/include/internal/property.h
index 82119745..82119745 100644
--- a/NorthstarDedicatedTest/include/internal/property.h
+++ b/NorthstarDLL/include/internal/property.h
diff --git a/NorthstarDedicatedTest/include/internal/propertyerr.h b/NorthstarDLL/include/internal/propertyerr.h
index fbee53f1..fbee53f1 100644
--- a/NorthstarDedicatedTest/include/internal/propertyerr.h
+++ b/NorthstarDLL/include/internal/propertyerr.h
diff --git a/NorthstarDedicatedTest/include/internal/provider.h b/NorthstarDLL/include/internal/provider.h
index d09829d0..d09829d0 100644
--- a/NorthstarDedicatedTest/include/internal/provider.h
+++ b/NorthstarDLL/include/internal/provider.h
diff --git a/NorthstarDedicatedTest/include/internal/refcount.h b/NorthstarDLL/include/internal/refcount.h
index 7412d62f..7412d62f 100644
--- a/NorthstarDedicatedTest/include/internal/refcount.h
+++ b/NorthstarDLL/include/internal/refcount.h
diff --git a/NorthstarDedicatedTest/include/internal/sha3.h b/NorthstarDLL/include/internal/sha3.h
index 80ad86e5..80ad86e5 100644
--- a/NorthstarDedicatedTest/include/internal/sha3.h
+++ b/NorthstarDLL/include/internal/sha3.h
diff --git a/NorthstarDedicatedTest/include/internal/sizes.h b/NorthstarDLL/include/internal/sizes.h
index f6496c81..f6496c81 100644
--- a/NorthstarDedicatedTest/include/internal/sizes.h
+++ b/NorthstarDLL/include/internal/sizes.h
diff --git a/NorthstarDedicatedTest/include/internal/sm3.h b/NorthstarDLL/include/internal/sm3.h
index db1d61f0..db1d61f0 100644
--- a/NorthstarDedicatedTest/include/internal/sm3.h
+++ b/NorthstarDLL/include/internal/sm3.h
diff --git a/NorthstarDedicatedTest/include/internal/sockets.h b/NorthstarDLL/include/internal/sockets.h
index 6e882fa6..6e882fa6 100644
--- a/NorthstarDedicatedTest/include/internal/sockets.h
+++ b/NorthstarDLL/include/internal/sockets.h
diff --git a/NorthstarDedicatedTest/include/internal/sslconf.h b/NorthstarDLL/include/internal/sslconf.h
index fd7f7e33..fd7f7e33 100644
--- a/NorthstarDedicatedTest/include/internal/sslconf.h
+++ b/NorthstarDLL/include/internal/sslconf.h
diff --git a/NorthstarDedicatedTest/include/internal/symhacks.h b/NorthstarDLL/include/internal/symhacks.h
index 33bae51e..33bae51e 100644
--- a/NorthstarDedicatedTest/include/internal/symhacks.h
+++ b/NorthstarDLL/include/internal/symhacks.h
diff --git a/NorthstarDedicatedTest/include/internal/thread_once.h b/NorthstarDLL/include/internal/thread_once.h
index d6cb2eee..d6cb2eee 100644
--- a/NorthstarDedicatedTest/include/internal/thread_once.h
+++ b/NorthstarDLL/include/internal/thread_once.h
diff --git a/NorthstarDedicatedTest/include/internal/tlsgroups.h b/NorthstarDLL/include/internal/tlsgroups.h
index 8a35ced1..8a35ced1 100644
--- a/NorthstarDedicatedTest/include/internal/tlsgroups.h
+++ b/NorthstarDLL/include/internal/tlsgroups.h
diff --git a/NorthstarDedicatedTest/include/internal/tsan_assist.h b/NorthstarDLL/include/internal/tsan_assist.h
index f8285b1d..f8285b1d 100644
--- a/NorthstarDedicatedTest/include/internal/tsan_assist.h
+++ b/NorthstarDLL/include/internal/tsan_assist.h
diff --git a/NorthstarDedicatedTest/include/internal/unicode.h b/NorthstarDLL/include/internal/unicode.h
index a6de8352..a6de8352 100644
--- a/NorthstarDedicatedTest/include/internal/unicode.h
+++ b/NorthstarDLL/include/internal/unicode.h
diff --git a/NorthstarDedicatedTest/include/libcrypto_static.lib b/NorthstarDLL/include/libcrypto_static.lib
index 26c68964..26c68964 100644
--- a/NorthstarDedicatedTest/include/libcrypto_static.lib
+++ b/NorthstarDLL/include/libcrypto_static.lib
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/curl.h b/NorthstarDLL/include/libcurl/include/curl/curl.h
index 7b69ce2d..7b69ce2d 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/curl.h
+++ b/NorthstarDLL/include/libcurl/include/curl/curl.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/curlver.h b/NorthstarDLL/include/libcurl/include/curl/curlver.h
index fe57e430..fe57e430 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/curlver.h
+++ b/NorthstarDLL/include/libcurl/include/curl/curlver.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/easy.h b/NorthstarDLL/include/libcurl/include/curl/easy.h
index 2dbfb26b..2dbfb26b 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/easy.h
+++ b/NorthstarDLL/include/libcurl/include/curl/easy.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/mprintf.h b/NorthstarDLL/include/libcurl/include/curl/mprintf.h
index 3549552d..3549552d 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/mprintf.h
+++ b/NorthstarDLL/include/libcurl/include/curl/mprintf.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/multi.h b/NorthstarDLL/include/libcurl/include/curl/multi.h
index 91cd95d3..91cd95d3 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/multi.h
+++ b/NorthstarDLL/include/libcurl/include/curl/multi.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/options.h b/NorthstarDLL/include/libcurl/include/curl/options.h
index 14373b55..14373b55 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/options.h
+++ b/NorthstarDLL/include/libcurl/include/curl/options.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/stdcheaders.h b/NorthstarDLL/include/libcurl/include/curl/stdcheaders.h
index 60596c75..60596c75 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/stdcheaders.h
+++ b/NorthstarDLL/include/libcurl/include/curl/stdcheaders.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/system.h b/NorthstarDLL/include/libcurl/include/curl/system.h
index faf8fcf8..faf8fcf8 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/system.h
+++ b/NorthstarDLL/include/libcurl/include/curl/system.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/typecheck-gcc.h b/NorthstarDLL/include/libcurl/include/curl/typecheck-gcc.h
index 9e14d8a3..9e14d8a3 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/typecheck-gcc.h
+++ b/NorthstarDLL/include/libcurl/include/curl/typecheck-gcc.h
diff --git a/NorthstarDedicatedTest/include/libcurl/include/curl/urlapi.h b/NorthstarDLL/include/libcurl/include/curl/urlapi.h
index a475f91b..a475f91b 100644
--- a/NorthstarDedicatedTest/include/libcurl/include/curl/urlapi.h
+++ b/NorthstarDLL/include/libcurl/include/curl/urlapi.h
diff --git a/NorthstarDedicatedTest/include/libcurl/lib/libcurl_a.lib b/NorthstarDLL/include/libcurl/lib/libcurl_a.lib
index f0fa49f2..f0fa49f2 100644
--- a/NorthstarDedicatedTest/include/libcurl/lib/libcurl_a.lib
+++ b/NorthstarDLL/include/libcurl/lib/libcurl_a.lib
diff --git a/NorthstarDedicatedTest/include/libssl_static.lib b/NorthstarDLL/include/libssl_static.lib
index 3411cb57..3411cb57 100644
--- a/NorthstarDedicatedTest/include/libssl_static.lib
+++ b/NorthstarDLL/include/libssl_static.lib
diff --git a/NorthstarDedicatedTest/include/openssl/__DECC_INCLUDE_EPILOGUE.H b/NorthstarDLL/include/openssl/__DECC_INCLUDE_EPILOGUE.H
index d251d0a0..d251d0a0 100644
--- a/NorthstarDedicatedTest/include/openssl/__DECC_INCLUDE_EPILOGUE.H
+++ b/NorthstarDLL/include/openssl/__DECC_INCLUDE_EPILOGUE.H
diff --git a/NorthstarDedicatedTest/include/openssl/__DECC_INCLUDE_PROLOGUE.H b/NorthstarDLL/include/openssl/__DECC_INCLUDE_PROLOGUE.H
index 91ac6b33..91ac6b33 100644
--- a/NorthstarDedicatedTest/include/openssl/__DECC_INCLUDE_PROLOGUE.H
+++ b/NorthstarDLL/include/openssl/__DECC_INCLUDE_PROLOGUE.H
diff --git a/NorthstarDedicatedTest/include/openssl/aes.h b/NorthstarDLL/include/openssl/aes.h
index d0f9dfc6..d0f9dfc6 100644
--- a/NorthstarDedicatedTest/include/openssl/aes.h
+++ b/NorthstarDLL/include/openssl/aes.h
diff --git a/NorthstarDedicatedTest/include/openssl/asn1.h b/NorthstarDLL/include/openssl/asn1.h
index aada23dc..aada23dc 100644
--- a/NorthstarDedicatedTest/include/openssl/asn1.h
+++ b/NorthstarDLL/include/openssl/asn1.h
diff --git a/NorthstarDedicatedTest/include/openssl/asn1.h.in b/NorthstarDLL/include/openssl/asn1.h.in
index 6d5094a3..6d5094a3 100644
--- a/NorthstarDedicatedTest/include/openssl/asn1.h.in
+++ b/NorthstarDLL/include/openssl/asn1.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/asn1_mac.h b/NorthstarDLL/include/openssl/asn1_mac.h
index fdcb9836..fdcb9836 100644
--- a/NorthstarDedicatedTest/include/openssl/asn1_mac.h
+++ b/NorthstarDLL/include/openssl/asn1_mac.h
diff --git a/NorthstarDedicatedTest/include/openssl/asn1err.h b/NorthstarDLL/include/openssl/asn1err.h
index d4276220..d4276220 100644
--- a/NorthstarDedicatedTest/include/openssl/asn1err.h
+++ b/NorthstarDLL/include/openssl/asn1err.h
diff --git a/NorthstarDedicatedTest/include/openssl/asn1t.h b/NorthstarDLL/include/openssl/asn1t.h
index a725c532..a725c532 100644
--- a/NorthstarDedicatedTest/include/openssl/asn1t.h
+++ b/NorthstarDLL/include/openssl/asn1t.h
diff --git a/NorthstarDedicatedTest/include/openssl/asn1t.h.in b/NorthstarDLL/include/openssl/asn1t.h.in
index b536fe51..b536fe51 100644
--- a/NorthstarDedicatedTest/include/openssl/asn1t.h.in
+++ b/NorthstarDLL/include/openssl/asn1t.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/async.h b/NorthstarDLL/include/openssl/async.h
index bc27d5db..bc27d5db 100644
--- a/NorthstarDedicatedTest/include/openssl/async.h
+++ b/NorthstarDLL/include/openssl/async.h
diff --git a/NorthstarDedicatedTest/include/openssl/asyncerr.h b/NorthstarDLL/include/openssl/asyncerr.h
index c093f7be..c093f7be 100644
--- a/NorthstarDedicatedTest/include/openssl/asyncerr.h
+++ b/NorthstarDLL/include/openssl/asyncerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/bio.h b/NorthstarDLL/include/openssl/bio.h
index 3ef0cafb..3ef0cafb 100644
--- a/NorthstarDedicatedTest/include/openssl/bio.h
+++ b/NorthstarDLL/include/openssl/bio.h
diff --git a/NorthstarDedicatedTest/include/openssl/bio.h.in b/NorthstarDLL/include/openssl/bio.h.in
index 2c65b7e1..2c65b7e1 100644
--- a/NorthstarDedicatedTest/include/openssl/bio.h.in
+++ b/NorthstarDLL/include/openssl/bio.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/bioerr.h b/NorthstarDLL/include/openssl/bioerr.h
index 787b30af..787b30af 100644
--- a/NorthstarDedicatedTest/include/openssl/bioerr.h
+++ b/NorthstarDLL/include/openssl/bioerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/blowfish.h b/NorthstarDLL/include/openssl/blowfish.h
index 667d6423..667d6423 100644
--- a/NorthstarDedicatedTest/include/openssl/blowfish.h
+++ b/NorthstarDLL/include/openssl/blowfish.h
diff --git a/NorthstarDedicatedTest/include/openssl/bn.h b/NorthstarDLL/include/openssl/bn.h
index ecd7f01b..ecd7f01b 100644
--- a/NorthstarDedicatedTest/include/openssl/bn.h
+++ b/NorthstarDLL/include/openssl/bn.h
diff --git a/NorthstarDedicatedTest/include/openssl/bnerr.h b/NorthstarDLL/include/openssl/bnerr.h
index 847d326b..847d326b 100644
--- a/NorthstarDedicatedTest/include/openssl/bnerr.h
+++ b/NorthstarDLL/include/openssl/bnerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/buffer.h b/NorthstarDLL/include/openssl/buffer.h
index 5773b986..5773b986 100644
--- a/NorthstarDedicatedTest/include/openssl/buffer.h
+++ b/NorthstarDLL/include/openssl/buffer.h
diff --git a/NorthstarDedicatedTest/include/openssl/buffererr.h b/NorthstarDLL/include/openssl/buffererr.h
index d18b1f8f..d18b1f8f 100644
--- a/NorthstarDedicatedTest/include/openssl/buffererr.h
+++ b/NorthstarDLL/include/openssl/buffererr.h
diff --git a/NorthstarDedicatedTest/include/openssl/camellia.h b/NorthstarDLL/include/openssl/camellia.h
index 88c2279e..88c2279e 100644
--- a/NorthstarDedicatedTest/include/openssl/camellia.h
+++ b/NorthstarDLL/include/openssl/camellia.h
diff --git a/NorthstarDedicatedTest/include/openssl/cast.h b/NorthstarDLL/include/openssl/cast.h
index 0bf217be..0bf217be 100644
--- a/NorthstarDedicatedTest/include/openssl/cast.h
+++ b/NorthstarDLL/include/openssl/cast.h
diff --git a/NorthstarDedicatedTest/include/openssl/cmac.h b/NorthstarDLL/include/openssl/cmac.h
index f5086183..f5086183 100644
--- a/NorthstarDedicatedTest/include/openssl/cmac.h
+++ b/NorthstarDLL/include/openssl/cmac.h
diff --git a/NorthstarDedicatedTest/include/openssl/cmp.h b/NorthstarDLL/include/openssl/cmp.h
index 7f258dc9..7f258dc9 100644
--- a/NorthstarDedicatedTest/include/openssl/cmp.h
+++ b/NorthstarDLL/include/openssl/cmp.h
diff --git a/NorthstarDedicatedTest/include/openssl/cmp.h.in b/NorthstarDLL/include/openssl/cmp.h.in
index b4734421..b4734421 100644
--- a/NorthstarDedicatedTest/include/openssl/cmp.h.in
+++ b/NorthstarDLL/include/openssl/cmp.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/cmp_util.h b/NorthstarDLL/include/openssl/cmp_util.h
index 9a168922..9a168922 100644
--- a/NorthstarDedicatedTest/include/openssl/cmp_util.h
+++ b/NorthstarDLL/include/openssl/cmp_util.h
diff --git a/NorthstarDedicatedTest/include/openssl/cmperr.h b/NorthstarDLL/include/openssl/cmperr.h
index 3a26fd0b..3a26fd0b 100644
--- a/NorthstarDedicatedTest/include/openssl/cmperr.h
+++ b/NorthstarDLL/include/openssl/cmperr.h
diff --git a/NorthstarDedicatedTest/include/openssl/cms.h b/NorthstarDLL/include/openssl/cms.h
index 5b907f2c..5b907f2c 100644
--- a/NorthstarDedicatedTest/include/openssl/cms.h
+++ b/NorthstarDLL/include/openssl/cms.h
diff --git a/NorthstarDedicatedTest/include/openssl/cms.h.in b/NorthstarDLL/include/openssl/cms.h.in
index da20ddf2..da20ddf2 100644
--- a/NorthstarDedicatedTest/include/openssl/cms.h.in
+++ b/NorthstarDLL/include/openssl/cms.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/cmserr.h b/NorthstarDLL/include/openssl/cmserr.h
index 1c4f4c79..1c4f4c79 100644
--- a/NorthstarDedicatedTest/include/openssl/cmserr.h
+++ b/NorthstarDLL/include/openssl/cmserr.h
diff --git a/NorthstarDedicatedTest/include/openssl/comp.h b/NorthstarDLL/include/openssl/comp.h
index 06ff5810..06ff5810 100644
--- a/NorthstarDedicatedTest/include/openssl/comp.h
+++ b/NorthstarDLL/include/openssl/comp.h
diff --git a/NorthstarDedicatedTest/include/openssl/comperr.h b/NorthstarDLL/include/openssl/comperr.h
index 01dd3e6b..01dd3e6b 100644
--- a/NorthstarDedicatedTest/include/openssl/comperr.h
+++ b/NorthstarDLL/include/openssl/comperr.h
diff --git a/NorthstarDedicatedTest/include/openssl/conf.h b/NorthstarDLL/include/openssl/conf.h
index 07793f17..07793f17 100644
--- a/NorthstarDedicatedTest/include/openssl/conf.h
+++ b/NorthstarDLL/include/openssl/conf.h
diff --git a/NorthstarDedicatedTest/include/openssl/conf.h.in b/NorthstarDLL/include/openssl/conf.h.in
index b0bd579a..b0bd579a 100644
--- a/NorthstarDedicatedTest/include/openssl/conf.h.in
+++ b/NorthstarDLL/include/openssl/conf.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/conf_api.h b/NorthstarDLL/include/openssl/conf_api.h
index ed67d577..ed67d577 100644
--- a/NorthstarDedicatedTest/include/openssl/conf_api.h
+++ b/NorthstarDLL/include/openssl/conf_api.h
diff --git a/NorthstarDedicatedTest/include/openssl/conferr.h b/NorthstarDLL/include/openssl/conferr.h
index 496e2e1e..496e2e1e 100644
--- a/NorthstarDedicatedTest/include/openssl/conferr.h
+++ b/NorthstarDLL/include/openssl/conferr.h
diff --git a/NorthstarDedicatedTest/include/openssl/configuration.h b/NorthstarDLL/include/openssl/configuration.h
index d9662edd..d9662edd 100644
--- a/NorthstarDedicatedTest/include/openssl/configuration.h
+++ b/NorthstarDLL/include/openssl/configuration.h
diff --git a/NorthstarDedicatedTest/include/openssl/configuration.h.in b/NorthstarDLL/include/openssl/configuration.h.in
index b84dc1df..b84dc1df 100644
--- a/NorthstarDedicatedTest/include/openssl/configuration.h.in
+++ b/NorthstarDLL/include/openssl/configuration.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/conftypes.h b/NorthstarDLL/include/openssl/conftypes.h
index 17cefaa4..17cefaa4 100644
--- a/NorthstarDedicatedTest/include/openssl/conftypes.h
+++ b/NorthstarDLL/include/openssl/conftypes.h
diff --git a/NorthstarDedicatedTest/include/openssl/core.h b/NorthstarDLL/include/openssl/core.h
index 9683ac70..9683ac70 100644
--- a/NorthstarDedicatedTest/include/openssl/core.h
+++ b/NorthstarDLL/include/openssl/core.h
diff --git a/NorthstarDedicatedTest/include/openssl/core_dispatch.h b/NorthstarDLL/include/openssl/core_dispatch.h
index 99fcda00..99fcda00 100644
--- a/NorthstarDedicatedTest/include/openssl/core_dispatch.h
+++ b/NorthstarDLL/include/openssl/core_dispatch.h
diff --git a/NorthstarDedicatedTest/include/openssl/core_names.h b/NorthstarDLL/include/openssl/core_names.h
index b549dae9..b549dae9 100644
--- a/NorthstarDedicatedTest/include/openssl/core_names.h
+++ b/NorthstarDLL/include/openssl/core_names.h
diff --git a/NorthstarDedicatedTest/include/openssl/core_object.h b/NorthstarDLL/include/openssl/core_object.h
index 62ccf39d..62ccf39d 100644
--- a/NorthstarDedicatedTest/include/openssl/core_object.h
+++ b/NorthstarDLL/include/openssl/core_object.h
diff --git a/NorthstarDedicatedTest/include/openssl/crmf.h b/NorthstarDLL/include/openssl/crmf.h
index b2a82edb..b2a82edb 100644
--- a/NorthstarDedicatedTest/include/openssl/crmf.h
+++ b/NorthstarDLL/include/openssl/crmf.h
diff --git a/NorthstarDedicatedTest/include/openssl/crmf.h.in b/NorthstarDLL/include/openssl/crmf.h.in
index 4d37ea6d..4d37ea6d 100644
--- a/NorthstarDedicatedTest/include/openssl/crmf.h.in
+++ b/NorthstarDLL/include/openssl/crmf.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/crmferr.h b/NorthstarDLL/include/openssl/crmferr.h
index b242b922..b242b922 100644
--- a/NorthstarDedicatedTest/include/openssl/crmferr.h
+++ b/NorthstarDLL/include/openssl/crmferr.h
diff --git a/NorthstarDedicatedTest/include/openssl/crypto.h b/NorthstarDLL/include/openssl/crypto.h
index ef327f20..ef327f20 100644
--- a/NorthstarDedicatedTest/include/openssl/crypto.h
+++ b/NorthstarDLL/include/openssl/crypto.h
diff --git a/NorthstarDedicatedTest/include/openssl/crypto.h.in b/NorthstarDLL/include/openssl/crypto.h.in
index 724e2ca5..724e2ca5 100644
--- a/NorthstarDedicatedTest/include/openssl/crypto.h.in
+++ b/NorthstarDLL/include/openssl/crypto.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/cryptoerr.h b/NorthstarDLL/include/openssl/cryptoerr.h
index c6a04d9b..c6a04d9b 100644
--- a/NorthstarDedicatedTest/include/openssl/cryptoerr.h
+++ b/NorthstarDLL/include/openssl/cryptoerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/cryptoerr_legacy.h b/NorthstarDLL/include/openssl/cryptoerr_legacy.h
index ccab33a5..ccab33a5 100644
--- a/NorthstarDedicatedTest/include/openssl/cryptoerr_legacy.h
+++ b/NorthstarDLL/include/openssl/cryptoerr_legacy.h
diff --git a/NorthstarDedicatedTest/include/openssl/ct.h b/NorthstarDLL/include/openssl/ct.h
index 06c41b70..06c41b70 100644
--- a/NorthstarDedicatedTest/include/openssl/ct.h
+++ b/NorthstarDLL/include/openssl/ct.h
diff --git a/NorthstarDedicatedTest/include/openssl/ct.h.in b/NorthstarDLL/include/openssl/ct.h.in
index 16086b33..16086b33 100644
--- a/NorthstarDedicatedTest/include/openssl/ct.h.in
+++ b/NorthstarDLL/include/openssl/ct.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/cterr.h b/NorthstarDLL/include/openssl/cterr.h
index 935d32d8..935d32d8 100644
--- a/NorthstarDedicatedTest/include/openssl/cterr.h
+++ b/NorthstarDLL/include/openssl/cterr.h
diff --git a/NorthstarDedicatedTest/include/openssl/decoder.h b/NorthstarDLL/include/openssl/decoder.h
index d4ee2cf4..d4ee2cf4 100644
--- a/NorthstarDedicatedTest/include/openssl/decoder.h
+++ b/NorthstarDLL/include/openssl/decoder.h
diff --git a/NorthstarDedicatedTest/include/openssl/decodererr.h b/NorthstarDLL/include/openssl/decodererr.h
index 4212a38b..4212a38b 100644
--- a/NorthstarDedicatedTest/include/openssl/decodererr.h
+++ b/NorthstarDLL/include/openssl/decodererr.h
diff --git a/NorthstarDedicatedTest/include/openssl/des.h b/NorthstarDLL/include/openssl/des.h
index 09798a61..09798a61 100644
--- a/NorthstarDedicatedTest/include/openssl/des.h
+++ b/NorthstarDLL/include/openssl/des.h
diff --git a/NorthstarDedicatedTest/include/openssl/dh.h b/NorthstarDLL/include/openssl/dh.h
index b97871ec..b97871ec 100644
--- a/NorthstarDedicatedTest/include/openssl/dh.h
+++ b/NorthstarDLL/include/openssl/dh.h
diff --git a/NorthstarDedicatedTest/include/openssl/dherr.h b/NorthstarDLL/include/openssl/dherr.h
index 5d2a762a..5d2a762a 100644
--- a/NorthstarDedicatedTest/include/openssl/dherr.h
+++ b/NorthstarDLL/include/openssl/dherr.h
diff --git a/NorthstarDedicatedTest/include/openssl/dsa.h b/NorthstarDLL/include/openssl/dsa.h
index 5c0e4cdd..5c0e4cdd 100644
--- a/NorthstarDedicatedTest/include/openssl/dsa.h
+++ b/NorthstarDLL/include/openssl/dsa.h
diff --git a/NorthstarDedicatedTest/include/openssl/dsaerr.h b/NorthstarDLL/include/openssl/dsaerr.h
index 5f0ca8d1..5f0ca8d1 100644
--- a/NorthstarDedicatedTest/include/openssl/dsaerr.h
+++ b/NorthstarDLL/include/openssl/dsaerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/dtls1.h b/NorthstarDLL/include/openssl/dtls1.h
index 5dc6b541..5dc6b541 100644
--- a/NorthstarDedicatedTest/include/openssl/dtls1.h
+++ b/NorthstarDLL/include/openssl/dtls1.h
diff --git a/NorthstarDedicatedTest/include/openssl/e_os2.h b/NorthstarDLL/include/openssl/e_os2.h
index 67289092..67289092 100644
--- a/NorthstarDedicatedTest/include/openssl/e_os2.h
+++ b/NorthstarDLL/include/openssl/e_os2.h
diff --git a/NorthstarDedicatedTest/include/openssl/ebcdic.h b/NorthstarDLL/include/openssl/ebcdic.h
index e0ae1aa8..e0ae1aa8 100644
--- a/NorthstarDedicatedTest/include/openssl/ebcdic.h
+++ b/NorthstarDLL/include/openssl/ebcdic.h
diff --git a/NorthstarDedicatedTest/include/openssl/ec.h b/NorthstarDLL/include/openssl/ec.h
index f59b4f92..f59b4f92 100644
--- a/NorthstarDedicatedTest/include/openssl/ec.h
+++ b/NorthstarDLL/include/openssl/ec.h
diff --git a/NorthstarDedicatedTest/include/openssl/ecdh.h b/NorthstarDLL/include/openssl/ecdh.h
index 56bd4cc2..56bd4cc2 100644
--- a/NorthstarDedicatedTest/include/openssl/ecdh.h
+++ b/NorthstarDLL/include/openssl/ecdh.h
diff --git a/NorthstarDedicatedTest/include/openssl/ecdsa.h b/NorthstarDLL/include/openssl/ecdsa.h
index 56bd4cc2..56bd4cc2 100644
--- a/NorthstarDedicatedTest/include/openssl/ecdsa.h
+++ b/NorthstarDLL/include/openssl/ecdsa.h
diff --git a/NorthstarDedicatedTest/include/openssl/ecerr.h b/NorthstarDLL/include/openssl/ecerr.h
index 49088d20..49088d20 100644
--- a/NorthstarDedicatedTest/include/openssl/ecerr.h
+++ b/NorthstarDLL/include/openssl/ecerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/encoder.h b/NorthstarDLL/include/openssl/encoder.h
index c37a6f16..c37a6f16 100644
--- a/NorthstarDedicatedTest/include/openssl/encoder.h
+++ b/NorthstarDLL/include/openssl/encoder.h
diff --git a/NorthstarDedicatedTest/include/openssl/encodererr.h b/NorthstarDLL/include/openssl/encodererr.h
index 5e318b14..5e318b14 100644
--- a/NorthstarDedicatedTest/include/openssl/encodererr.h
+++ b/NorthstarDLL/include/openssl/encodererr.h
diff --git a/NorthstarDedicatedTest/include/openssl/engine.h b/NorthstarDLL/include/openssl/engine.h
index 25c3cf7c..25c3cf7c 100644
--- a/NorthstarDedicatedTest/include/openssl/engine.h
+++ b/NorthstarDLL/include/openssl/engine.h
diff --git a/NorthstarDedicatedTest/include/openssl/engineerr.h b/NorthstarDLL/include/openssl/engineerr.h
index d439b682..d439b682 100644
--- a/NorthstarDedicatedTest/include/openssl/engineerr.h
+++ b/NorthstarDLL/include/openssl/engineerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/err.h b/NorthstarDLL/include/openssl/err.h
index 3c7299db..3c7299db 100644
--- a/NorthstarDedicatedTest/include/openssl/err.h
+++ b/NorthstarDLL/include/openssl/err.h
diff --git a/NorthstarDedicatedTest/include/openssl/err.h.in b/NorthstarDLL/include/openssl/err.h.in
index 7ca0b970..7ca0b970 100644
--- a/NorthstarDedicatedTest/include/openssl/err.h.in
+++ b/NorthstarDLL/include/openssl/err.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/ess.h b/NorthstarDLL/include/openssl/ess.h
index dad596a6..dad596a6 100644
--- a/NorthstarDedicatedTest/include/openssl/ess.h
+++ b/NorthstarDLL/include/openssl/ess.h
diff --git a/NorthstarDedicatedTest/include/openssl/ess.h.in b/NorthstarDLL/include/openssl/ess.h.in
index d1a685b9..d1a685b9 100644
--- a/NorthstarDedicatedTest/include/openssl/ess.h.in
+++ b/NorthstarDLL/include/openssl/ess.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/esserr.h b/NorthstarDLL/include/openssl/esserr.h
index 165ce7c4..165ce7c4 100644
--- a/NorthstarDedicatedTest/include/openssl/esserr.h
+++ b/NorthstarDLL/include/openssl/esserr.h
diff --git a/NorthstarDedicatedTest/include/openssl/evp.h b/NorthstarDLL/include/openssl/evp.h
index 18503817..18503817 100644
--- a/NorthstarDedicatedTest/include/openssl/evp.h
+++ b/NorthstarDLL/include/openssl/evp.h
diff --git a/NorthstarDedicatedTest/include/openssl/evperr.h b/NorthstarDLL/include/openssl/evperr.h
index a5053f6c..a5053f6c 100644
--- a/NorthstarDedicatedTest/include/openssl/evperr.h
+++ b/NorthstarDLL/include/openssl/evperr.h
diff --git a/NorthstarDedicatedTest/include/openssl/fips_names.h b/NorthstarDLL/include/openssl/fips_names.h
index 0fdf5440..0fdf5440 100644
--- a/NorthstarDedicatedTest/include/openssl/fips_names.h
+++ b/NorthstarDLL/include/openssl/fips_names.h
diff --git a/NorthstarDedicatedTest/include/openssl/fipskey.h b/NorthstarDLL/include/openssl/fipskey.h
index ccc1d2f4..ccc1d2f4 100644
--- a/NorthstarDedicatedTest/include/openssl/fipskey.h
+++ b/NorthstarDLL/include/openssl/fipskey.h
diff --git a/NorthstarDedicatedTest/include/openssl/fipskey.h.in b/NorthstarDLL/include/openssl/fipskey.h.in
index 56b947e8..56b947e8 100644
--- a/NorthstarDedicatedTest/include/openssl/fipskey.h.in
+++ b/NorthstarDLL/include/openssl/fipskey.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/hmac.h b/NorthstarDLL/include/openssl/hmac.h
index f9e1bff3..f9e1bff3 100644
--- a/NorthstarDedicatedTest/include/openssl/hmac.h
+++ b/NorthstarDLL/include/openssl/hmac.h
diff --git a/NorthstarDedicatedTest/include/openssl/http.h b/NorthstarDLL/include/openssl/http.h
index f7ab2142..f7ab2142 100644
--- a/NorthstarDedicatedTest/include/openssl/http.h
+++ b/NorthstarDLL/include/openssl/http.h
diff --git a/NorthstarDedicatedTest/include/openssl/httperr.h b/NorthstarDLL/include/openssl/httperr.h
index ee089592..ee089592 100644
--- a/NorthstarDedicatedTest/include/openssl/httperr.h
+++ b/NorthstarDLL/include/openssl/httperr.h
diff --git a/NorthstarDedicatedTest/include/openssl/idea.h b/NorthstarDLL/include/openssl/idea.h
index 1f9bb3b3..1f9bb3b3 100644
--- a/NorthstarDedicatedTest/include/openssl/idea.h
+++ b/NorthstarDLL/include/openssl/idea.h
diff --git a/NorthstarDedicatedTest/include/openssl/kdf.h b/NorthstarDLL/include/openssl/kdf.h
index 0983230a..0983230a 100644
--- a/NorthstarDedicatedTest/include/openssl/kdf.h
+++ b/NorthstarDLL/include/openssl/kdf.h
diff --git a/NorthstarDedicatedTest/include/openssl/kdferr.h b/NorthstarDLL/include/openssl/kdferr.h
index 963d766d..963d766d 100644
--- a/NorthstarDedicatedTest/include/openssl/kdferr.h
+++ b/NorthstarDLL/include/openssl/kdferr.h
diff --git a/NorthstarDedicatedTest/include/openssl/lhash.h b/NorthstarDLL/include/openssl/lhash.h
index 39dd6254..39dd6254 100644
--- a/NorthstarDedicatedTest/include/openssl/lhash.h
+++ b/NorthstarDLL/include/openssl/lhash.h
diff --git a/NorthstarDedicatedTest/include/openssl/lhash.h.in b/NorthstarDLL/include/openssl/lhash.h.in
index febefa3c..febefa3c 100644
--- a/NorthstarDedicatedTest/include/openssl/lhash.h.in
+++ b/NorthstarDLL/include/openssl/lhash.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/macros.h b/NorthstarDLL/include/openssl/macros.h
index a6bc3f1f..a6bc3f1f 100644
--- a/NorthstarDedicatedTest/include/openssl/macros.h
+++ b/NorthstarDLL/include/openssl/macros.h
diff --git a/NorthstarDedicatedTest/include/openssl/md2.h b/NorthstarDLL/include/openssl/md2.h
index 5d4cb77e..5d4cb77e 100644
--- a/NorthstarDedicatedTest/include/openssl/md2.h
+++ b/NorthstarDLL/include/openssl/md2.h
diff --git a/NorthstarDedicatedTest/include/openssl/md4.h b/NorthstarDLL/include/openssl/md4.h
index 6c150a6c..6c150a6c 100644
--- a/NorthstarDedicatedTest/include/openssl/md4.h
+++ b/NorthstarDLL/include/openssl/md4.h
diff --git a/NorthstarDedicatedTest/include/openssl/md5.h b/NorthstarDLL/include/openssl/md5.h
index 77a57734..77a57734 100644
--- a/NorthstarDedicatedTest/include/openssl/md5.h
+++ b/NorthstarDLL/include/openssl/md5.h
diff --git a/NorthstarDedicatedTest/include/openssl/mdc2.h b/NorthstarDLL/include/openssl/mdc2.h
index 5a7ee289..5a7ee289 100644
--- a/NorthstarDedicatedTest/include/openssl/mdc2.h
+++ b/NorthstarDLL/include/openssl/mdc2.h
diff --git a/NorthstarDedicatedTest/include/openssl/modes.h b/NorthstarDLL/include/openssl/modes.h
index e1907991..e1907991 100644
--- a/NorthstarDedicatedTest/include/openssl/modes.h
+++ b/NorthstarDLL/include/openssl/modes.h
diff --git a/NorthstarDedicatedTest/include/openssl/obj_mac.h b/NorthstarDLL/include/openssl/obj_mac.h
index 0e860276..0e860276 100644
--- a/NorthstarDedicatedTest/include/openssl/obj_mac.h
+++ b/NorthstarDLL/include/openssl/obj_mac.h
diff --git a/NorthstarDedicatedTest/include/openssl/objects.h b/NorthstarDLL/include/openssl/objects.h
index 9ea91c27..9ea91c27 100644
--- a/NorthstarDedicatedTest/include/openssl/objects.h
+++ b/NorthstarDLL/include/openssl/objects.h
diff --git a/NorthstarDedicatedTest/include/openssl/objectserr.h b/NorthstarDLL/include/openssl/objectserr.h
index 585217f6..585217f6 100644
--- a/NorthstarDedicatedTest/include/openssl/objectserr.h
+++ b/NorthstarDLL/include/openssl/objectserr.h
diff --git a/NorthstarDedicatedTest/include/openssl/ocsp.h b/NorthstarDLL/include/openssl/ocsp.h
index 5688381e..5688381e 100644
--- a/NorthstarDedicatedTest/include/openssl/ocsp.h
+++ b/NorthstarDLL/include/openssl/ocsp.h
diff --git a/NorthstarDedicatedTest/include/openssl/ocsp.h.in b/NorthstarDLL/include/openssl/ocsp.h.in
index e2cc2716..e2cc2716 100644
--- a/NorthstarDedicatedTest/include/openssl/ocsp.h.in
+++ b/NorthstarDLL/include/openssl/ocsp.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/ocsperr.h b/NorthstarDLL/include/openssl/ocsperr.h
index 46a0523c..46a0523c 100644
--- a/NorthstarDedicatedTest/include/openssl/ocsperr.h
+++ b/NorthstarDLL/include/openssl/ocsperr.h
diff --git a/NorthstarDedicatedTest/include/openssl/opensslconf.h b/NorthstarDLL/include/openssl/opensslconf.h
index 1e83371f..1e83371f 100644
--- a/NorthstarDedicatedTest/include/openssl/opensslconf.h
+++ b/NorthstarDLL/include/openssl/opensslconf.h
diff --git a/NorthstarDedicatedTest/include/openssl/opensslv.h b/NorthstarDLL/include/openssl/opensslv.h
index 612d5aec..612d5aec 100644
--- a/NorthstarDedicatedTest/include/openssl/opensslv.h
+++ b/NorthstarDLL/include/openssl/opensslv.h
diff --git a/NorthstarDedicatedTest/include/openssl/opensslv.h.in b/NorthstarDLL/include/openssl/opensslv.h.in
index 3f47a2ac..3f47a2ac 100644
--- a/NorthstarDedicatedTest/include/openssl/opensslv.h.in
+++ b/NorthstarDLL/include/openssl/opensslv.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/ossl_typ.h b/NorthstarDLL/include/openssl/ossl_typ.h
index 82a58988..82a58988 100644
--- a/NorthstarDedicatedTest/include/openssl/ossl_typ.h
+++ b/NorthstarDLL/include/openssl/ossl_typ.h
diff --git a/NorthstarDedicatedTest/include/openssl/param_build.h b/NorthstarDLL/include/openssl/param_build.h
index f29fdb29..f29fdb29 100644
--- a/NorthstarDedicatedTest/include/openssl/param_build.h
+++ b/NorthstarDLL/include/openssl/param_build.h
diff --git a/NorthstarDedicatedTest/include/openssl/params.h b/NorthstarDLL/include/openssl/params.h
index d75eab07..d75eab07 100644
--- a/NorthstarDedicatedTest/include/openssl/params.h
+++ b/NorthstarDLL/include/openssl/params.h
diff --git a/NorthstarDedicatedTest/include/openssl/pem.h b/NorthstarDLL/include/openssl/pem.h
index 80940dfa..80940dfa 100644
--- a/NorthstarDedicatedTest/include/openssl/pem.h
+++ b/NorthstarDLL/include/openssl/pem.h
diff --git a/NorthstarDedicatedTest/include/openssl/pem2.h b/NorthstarDLL/include/openssl/pem2.h
index a8a5325b..a8a5325b 100644
--- a/NorthstarDedicatedTest/include/openssl/pem2.h
+++ b/NorthstarDLL/include/openssl/pem2.h
diff --git a/NorthstarDedicatedTest/include/openssl/pemerr.h b/NorthstarDLL/include/openssl/pemerr.h
index 18f6d9ef..18f6d9ef 100644
--- a/NorthstarDedicatedTest/include/openssl/pemerr.h
+++ b/NorthstarDLL/include/openssl/pemerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/pkcs12.h b/NorthstarDLL/include/openssl/pkcs12.h
index f0da0867..f0da0867 100644
--- a/NorthstarDedicatedTest/include/openssl/pkcs12.h
+++ b/NorthstarDLL/include/openssl/pkcs12.h
diff --git a/NorthstarDedicatedTest/include/openssl/pkcs12.h.in b/NorthstarDLL/include/openssl/pkcs12.h.in
index c98eebfb..c98eebfb 100644
--- a/NorthstarDedicatedTest/include/openssl/pkcs12.h.in
+++ b/NorthstarDLL/include/openssl/pkcs12.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/pkcs12err.h b/NorthstarDLL/include/openssl/pkcs12err.h
index 933c8329..933c8329 100644
--- a/NorthstarDedicatedTest/include/openssl/pkcs12err.h
+++ b/NorthstarDLL/include/openssl/pkcs12err.h
diff --git a/NorthstarDedicatedTest/include/openssl/pkcs7.h b/NorthstarDLL/include/openssl/pkcs7.h
index 097d2dbb..097d2dbb 100644
--- a/NorthstarDedicatedTest/include/openssl/pkcs7.h
+++ b/NorthstarDLL/include/openssl/pkcs7.h
diff --git a/NorthstarDedicatedTest/include/openssl/pkcs7.h.in b/NorthstarDLL/include/openssl/pkcs7.h.in
index f5c55a3f..f5c55a3f 100644
--- a/NorthstarDedicatedTest/include/openssl/pkcs7.h.in
+++ b/NorthstarDLL/include/openssl/pkcs7.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/pkcs7err.h b/NorthstarDLL/include/openssl/pkcs7err.h
index ceb1a501..ceb1a501 100644
--- a/NorthstarDedicatedTest/include/openssl/pkcs7err.h
+++ b/NorthstarDLL/include/openssl/pkcs7err.h
diff --git a/NorthstarDedicatedTest/include/openssl/prov_ssl.h b/NorthstarDLL/include/openssl/prov_ssl.h
index d3e0896c..d3e0896c 100644
--- a/NorthstarDedicatedTest/include/openssl/prov_ssl.h
+++ b/NorthstarDLL/include/openssl/prov_ssl.h
diff --git a/NorthstarDedicatedTest/include/openssl/proverr.h b/NorthstarDLL/include/openssl/proverr.h
index ad67a8f8..ad67a8f8 100644
--- a/NorthstarDedicatedTest/include/openssl/proverr.h
+++ b/NorthstarDLL/include/openssl/proverr.h
diff --git a/NorthstarDedicatedTest/include/openssl/provider.h b/NorthstarDLL/include/openssl/provider.h
index dc86ff58..dc86ff58 100644
--- a/NorthstarDedicatedTest/include/openssl/provider.h
+++ b/NorthstarDLL/include/openssl/provider.h
diff --git a/NorthstarDedicatedTest/include/openssl/rand.h b/NorthstarDLL/include/openssl/rand.h
index ad3054fd..ad3054fd 100644
--- a/NorthstarDedicatedTest/include/openssl/rand.h
+++ b/NorthstarDLL/include/openssl/rand.h
diff --git a/NorthstarDedicatedTest/include/openssl/randerr.h b/NorthstarDLL/include/openssl/randerr.h
index b5e08e43..b5e08e43 100644
--- a/NorthstarDedicatedTest/include/openssl/randerr.h
+++ b/NorthstarDLL/include/openssl/randerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/rc2.h b/NorthstarDLL/include/openssl/rc2.h
index ff633fd8..ff633fd8 100644
--- a/NorthstarDedicatedTest/include/openssl/rc2.h
+++ b/NorthstarDLL/include/openssl/rc2.h
diff --git a/NorthstarDedicatedTest/include/openssl/rc4.h b/NorthstarDLL/include/openssl/rc4.h
index 600b2885..600b2885 100644
--- a/NorthstarDedicatedTest/include/openssl/rc4.h
+++ b/NorthstarDLL/include/openssl/rc4.h
diff --git a/NorthstarDedicatedTest/include/openssl/rc5.h b/NorthstarDLL/include/openssl/rc5.h
index de833523..de833523 100644
--- a/NorthstarDedicatedTest/include/openssl/rc5.h
+++ b/NorthstarDLL/include/openssl/rc5.h
diff --git a/NorthstarDedicatedTest/include/openssl/ripemd.h b/NorthstarDLL/include/openssl/ripemd.h
index 900ee317..900ee317 100644
--- a/NorthstarDedicatedTest/include/openssl/ripemd.h
+++ b/NorthstarDLL/include/openssl/ripemd.h
diff --git a/NorthstarDedicatedTest/include/openssl/rsa.h b/NorthstarDLL/include/openssl/rsa.h
index a55c9727..a55c9727 100644
--- a/NorthstarDedicatedTest/include/openssl/rsa.h
+++ b/NorthstarDLL/include/openssl/rsa.h
diff --git a/NorthstarDedicatedTest/include/openssl/rsaerr.h b/NorthstarDLL/include/openssl/rsaerr.h
index c58463c7..c58463c7 100644
--- a/NorthstarDedicatedTest/include/openssl/rsaerr.h
+++ b/NorthstarDLL/include/openssl/rsaerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/safestack.h b/NorthstarDLL/include/openssl/safestack.h
index 159ccf2a..159ccf2a 100644
--- a/NorthstarDedicatedTest/include/openssl/safestack.h
+++ b/NorthstarDLL/include/openssl/safestack.h
diff --git a/NorthstarDedicatedTest/include/openssl/safestack.h.in b/NorthstarDLL/include/openssl/safestack.h.in
index 6b366079..6b366079 100644
--- a/NorthstarDedicatedTest/include/openssl/safestack.h.in
+++ b/NorthstarDLL/include/openssl/safestack.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/seed.h b/NorthstarDLL/include/openssl/seed.h
index edb218ae..edb218ae 100644
--- a/NorthstarDedicatedTest/include/openssl/seed.h
+++ b/NorthstarDLL/include/openssl/seed.h
diff --git a/NorthstarDedicatedTest/include/openssl/self_test.h b/NorthstarDLL/include/openssl/self_test.h
index 77c600a0..77c600a0 100644
--- a/NorthstarDedicatedTest/include/openssl/self_test.h
+++ b/NorthstarDLL/include/openssl/self_test.h
diff --git a/NorthstarDedicatedTest/include/openssl/sha.h b/NorthstarDLL/include/openssl/sha.h
index 6e65a040..6e65a040 100644
--- a/NorthstarDedicatedTest/include/openssl/sha.h
+++ b/NorthstarDLL/include/openssl/sha.h
diff --git a/NorthstarDedicatedTest/include/openssl/srp.h b/NorthstarDLL/include/openssl/srp.h
index a86fa5d2..a86fa5d2 100644
--- a/NorthstarDedicatedTest/include/openssl/srp.h
+++ b/NorthstarDLL/include/openssl/srp.h
diff --git a/NorthstarDedicatedTest/include/openssl/srp.h.in b/NorthstarDLL/include/openssl/srp.h.in
index dfbe845b..dfbe845b 100644
--- a/NorthstarDedicatedTest/include/openssl/srp.h.in
+++ b/NorthstarDLL/include/openssl/srp.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/srtp.h b/NorthstarDLL/include/openssl/srtp.h
index d64606e5..d64606e5 100644
--- a/NorthstarDedicatedTest/include/openssl/srtp.h
+++ b/NorthstarDLL/include/openssl/srtp.h
diff --git a/NorthstarDedicatedTest/include/openssl/ssl.h b/NorthstarDLL/include/openssl/ssl.h
index 0763a33c..0763a33c 100644
--- a/NorthstarDedicatedTest/include/openssl/ssl.h
+++ b/NorthstarDLL/include/openssl/ssl.h
diff --git a/NorthstarDedicatedTest/include/openssl/ssl.h.in b/NorthstarDLL/include/openssl/ssl.h.in
index 9c00eb3d..9c00eb3d 100644
--- a/NorthstarDedicatedTest/include/openssl/ssl.h.in
+++ b/NorthstarDLL/include/openssl/ssl.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/ssl2.h b/NorthstarDLL/include/openssl/ssl2.h
index 428ead05..428ead05 100644
--- a/NorthstarDedicatedTest/include/openssl/ssl2.h
+++ b/NorthstarDLL/include/openssl/ssl2.h
diff --git a/NorthstarDedicatedTest/include/openssl/ssl3.h b/NorthstarDLL/include/openssl/ssl3.h
index 49bd51f2..49bd51f2 100644
--- a/NorthstarDedicatedTest/include/openssl/ssl3.h
+++ b/NorthstarDLL/include/openssl/ssl3.h
diff --git a/NorthstarDedicatedTest/include/openssl/sslerr.h b/NorthstarDLL/include/openssl/sslerr.h
index a4746d70..a4746d70 100644
--- a/NorthstarDedicatedTest/include/openssl/sslerr.h
+++ b/NorthstarDLL/include/openssl/sslerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/sslerr_legacy.h b/NorthstarDLL/include/openssl/sslerr_legacy.h
index ccf6d3b3..ccf6d3b3 100644
--- a/NorthstarDedicatedTest/include/openssl/sslerr_legacy.h
+++ b/NorthstarDLL/include/openssl/sslerr_legacy.h
diff --git a/NorthstarDedicatedTest/include/openssl/stack.h b/NorthstarDLL/include/openssl/stack.h
index f0c5c547..f0c5c547 100644
--- a/NorthstarDedicatedTest/include/openssl/stack.h
+++ b/NorthstarDLL/include/openssl/stack.h
diff --git a/NorthstarDedicatedTest/include/openssl/store.h b/NorthstarDLL/include/openssl/store.h
index 3c1445e0..3c1445e0 100644
--- a/NorthstarDedicatedTest/include/openssl/store.h
+++ b/NorthstarDLL/include/openssl/store.h
diff --git a/NorthstarDedicatedTest/include/openssl/storeerr.h b/NorthstarDLL/include/openssl/storeerr.h
index 00529c88..00529c88 100644
--- a/NorthstarDedicatedTest/include/openssl/storeerr.h
+++ b/NorthstarDLL/include/openssl/storeerr.h
diff --git a/NorthstarDedicatedTest/include/openssl/symhacks.h b/NorthstarDLL/include/openssl/symhacks.h
index 816f8f99..816f8f99 100644
--- a/NorthstarDedicatedTest/include/openssl/symhacks.h
+++ b/NorthstarDLL/include/openssl/symhacks.h
diff --git a/NorthstarDedicatedTest/include/openssl/tls1.h b/NorthstarDLL/include/openssl/tls1.h
index d6e9331f..d6e9331f 100644
--- a/NorthstarDedicatedTest/include/openssl/tls1.h
+++ b/NorthstarDLL/include/openssl/tls1.h
diff --git a/NorthstarDedicatedTest/include/openssl/trace.h b/NorthstarDLL/include/openssl/trace.h
index 28200133..28200133 100644
--- a/NorthstarDedicatedTest/include/openssl/trace.h
+++ b/NorthstarDLL/include/openssl/trace.h
diff --git a/NorthstarDedicatedTest/include/openssl/ts.h b/NorthstarDLL/include/openssl/ts.h
index 5136e4e9..5136e4e9 100644
--- a/NorthstarDedicatedTest/include/openssl/ts.h
+++ b/NorthstarDLL/include/openssl/ts.h
diff --git a/NorthstarDedicatedTest/include/openssl/tserr.h b/NorthstarDLL/include/openssl/tserr.h
index e1b943e4..e1b943e4 100644
--- a/NorthstarDedicatedTest/include/openssl/tserr.h
+++ b/NorthstarDLL/include/openssl/tserr.h
diff --git a/NorthstarDedicatedTest/include/openssl/txt_db.h b/NorthstarDLL/include/openssl/txt_db.h
index af169a30..af169a30 100644
--- a/NorthstarDedicatedTest/include/openssl/txt_db.h
+++ b/NorthstarDLL/include/openssl/txt_db.h
diff --git a/NorthstarDedicatedTest/include/openssl/types.h b/NorthstarDLL/include/openssl/types.h
index de9f1665..de9f1665 100644
--- a/NorthstarDedicatedTest/include/openssl/types.h
+++ b/NorthstarDLL/include/openssl/types.h
diff --git a/NorthstarDedicatedTest/include/openssl/ui.h b/NorthstarDLL/include/openssl/ui.h
index 835b0eba..835b0eba 100644
--- a/NorthstarDedicatedTest/include/openssl/ui.h
+++ b/NorthstarDLL/include/openssl/ui.h
diff --git a/NorthstarDedicatedTest/include/openssl/ui.h.in b/NorthstarDLL/include/openssl/ui.h.in
index eb9a580f..eb9a580f 100644
--- a/NorthstarDedicatedTest/include/openssl/ui.h.in
+++ b/NorthstarDLL/include/openssl/ui.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/uierr.h b/NorthstarDLL/include/openssl/uierr.h
index 473b04ed..473b04ed 100644
--- a/NorthstarDedicatedTest/include/openssl/uierr.h
+++ b/NorthstarDLL/include/openssl/uierr.h
diff --git a/NorthstarDedicatedTest/include/openssl/whrlpool.h b/NorthstarDLL/include/openssl/whrlpool.h
index 05ba4632..05ba4632 100644
--- a/NorthstarDedicatedTest/include/openssl/whrlpool.h
+++ b/NorthstarDLL/include/openssl/whrlpool.h
diff --git a/NorthstarDedicatedTest/include/openssl/x509.h b/NorthstarDLL/include/openssl/x509.h
index db57a9bf..db57a9bf 100644
--- a/NorthstarDedicatedTest/include/openssl/x509.h
+++ b/NorthstarDLL/include/openssl/x509.h
diff --git a/NorthstarDedicatedTest/include/openssl/x509.h.in b/NorthstarDLL/include/openssl/x509.h.in
index b4efbb55..b4efbb55 100644
--- a/NorthstarDedicatedTest/include/openssl/x509.h.in
+++ b/NorthstarDLL/include/openssl/x509.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/x509_vfy.h b/NorthstarDLL/include/openssl/x509_vfy.h
index e04df0d3..e04df0d3 100644
--- a/NorthstarDedicatedTest/include/openssl/x509_vfy.h
+++ b/NorthstarDLL/include/openssl/x509_vfy.h
diff --git a/NorthstarDedicatedTest/include/openssl/x509_vfy.h.in b/NorthstarDLL/include/openssl/x509_vfy.h.in
index 80f18bd7..80f18bd7 100644
--- a/NorthstarDedicatedTest/include/openssl/x509_vfy.h.in
+++ b/NorthstarDLL/include/openssl/x509_vfy.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/x509err.h b/NorthstarDLL/include/openssl/x509err.h
index a56facd4..a56facd4 100644
--- a/NorthstarDedicatedTest/include/openssl/x509err.h
+++ b/NorthstarDLL/include/openssl/x509err.h
diff --git a/NorthstarDedicatedTest/include/openssl/x509v3.h b/NorthstarDLL/include/openssl/x509v3.h
index 78c390b3..78c390b3 100644
--- a/NorthstarDedicatedTest/include/openssl/x509v3.h
+++ b/NorthstarDLL/include/openssl/x509v3.h
diff --git a/NorthstarDedicatedTest/include/openssl/x509v3.h.in b/NorthstarDLL/include/openssl/x509v3.h.in
index d00a66a3..d00a66a3 100644
--- a/NorthstarDedicatedTest/include/openssl/x509v3.h.in
+++ b/NorthstarDLL/include/openssl/x509v3.h.in
diff --git a/NorthstarDedicatedTest/include/openssl/x509v3err.h b/NorthstarDLL/include/openssl/x509v3err.h
index 1ae3a562..1ae3a562 100644
--- a/NorthstarDedicatedTest/include/openssl/x509v3err.h
+++ b/NorthstarDLL/include/openssl/x509v3err.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/allocators.h b/NorthstarDLL/include/rapidjson/allocators.h
index 98affe03..98affe03 100644
--- a/NorthstarDedicatedTest/include/rapidjson/allocators.h
+++ b/NorthstarDLL/include/rapidjson/allocators.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/document.h b/NorthstarDLL/include/rapidjson/document.h
index e3e20dfb..e3e20dfb 100644
--- a/NorthstarDedicatedTest/include/rapidjson/document.h
+++ b/NorthstarDLL/include/rapidjson/document.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/encodedstream.h b/NorthstarDLL/include/rapidjson/encodedstream.h
index 14506838..14506838 100644
--- a/NorthstarDedicatedTest/include/rapidjson/encodedstream.h
+++ b/NorthstarDLL/include/rapidjson/encodedstream.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/encodings.h b/NorthstarDLL/include/rapidjson/encodings.h
index baa7c2b1..baa7c2b1 100644
--- a/NorthstarDedicatedTest/include/rapidjson/encodings.h
+++ b/NorthstarDLL/include/rapidjson/encodings.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/error/en.h b/NorthstarDLL/include/rapidjson/error/en.h
index 2db838bf..2db838bf 100644
--- a/NorthstarDedicatedTest/include/rapidjson/error/en.h
+++ b/NorthstarDLL/include/rapidjson/error/en.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/error/error.h b/NorthstarDLL/include/rapidjson/error/error.h
index 95cb31a7..95cb31a7 100644
--- a/NorthstarDedicatedTest/include/rapidjson/error/error.h
+++ b/NorthstarDLL/include/rapidjson/error/error.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/filereadstream.h b/NorthstarDLL/include/rapidjson/filereadstream.h
index b56ea13b..b56ea13b 100644
--- a/NorthstarDedicatedTest/include/rapidjson/filereadstream.h
+++ b/NorthstarDLL/include/rapidjson/filereadstream.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/filewritestream.h b/NorthstarDLL/include/rapidjson/filewritestream.h
index 6378dd60..6378dd60 100644
--- a/NorthstarDedicatedTest/include/rapidjson/filewritestream.h
+++ b/NorthstarDLL/include/rapidjson/filewritestream.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/fwd.h b/NorthstarDLL/include/rapidjson/fwd.h
index e8104e84..e8104e84 100644
--- a/NorthstarDedicatedTest/include/rapidjson/fwd.h
+++ b/NorthstarDLL/include/rapidjson/fwd.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/biginteger.h b/NorthstarDLL/include/rapidjson/internal/biginteger.h
index 9d3e88c9..9d3e88c9 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/biginteger.h
+++ b/NorthstarDLL/include/rapidjson/internal/biginteger.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/diyfp.h b/NorthstarDLL/include/rapidjson/internal/diyfp.h
index c9fefdc6..c9fefdc6 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/diyfp.h
+++ b/NorthstarDLL/include/rapidjson/internal/diyfp.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/dtoa.h b/NorthstarDLL/include/rapidjson/internal/dtoa.h
index 8d6350e6..8d6350e6 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/dtoa.h
+++ b/NorthstarDLL/include/rapidjson/internal/dtoa.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/ieee754.h b/NorthstarDLL/include/rapidjson/internal/ieee754.h
index 82bb0b99..82bb0b99 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/ieee754.h
+++ b/NorthstarDLL/include/rapidjson/internal/ieee754.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/itoa.h b/NorthstarDLL/include/rapidjson/internal/itoa.h
index 01a4e7e7..01a4e7e7 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/itoa.h
+++ b/NorthstarDLL/include/rapidjson/internal/itoa.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/meta.h b/NorthstarDLL/include/rapidjson/internal/meta.h
index 5a9aaa42..5a9aaa42 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/meta.h
+++ b/NorthstarDLL/include/rapidjson/internal/meta.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/pow10.h b/NorthstarDLL/include/rapidjson/internal/pow10.h
index 02f475d7..02f475d7 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/pow10.h
+++ b/NorthstarDLL/include/rapidjson/internal/pow10.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/regex.h b/NorthstarDLL/include/rapidjson/internal/regex.h
index 422a5240..422a5240 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/regex.h
+++ b/NorthstarDLL/include/rapidjson/internal/regex.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/stack.h b/NorthstarDLL/include/rapidjson/internal/stack.h
index 022c9aab..022c9aab 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/stack.h
+++ b/NorthstarDLL/include/rapidjson/internal/stack.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/strfunc.h b/NorthstarDLL/include/rapidjson/internal/strfunc.h
index 2edfae52..2edfae52 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/strfunc.h
+++ b/NorthstarDLL/include/rapidjson/internal/strfunc.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/strtod.h b/NorthstarDLL/include/rapidjson/internal/strtod.h
index 289c413b..289c413b 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/strtod.h
+++ b/NorthstarDLL/include/rapidjson/internal/strtod.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/internal/swap.h b/NorthstarDLL/include/rapidjson/internal/swap.h
index 666e49f9..666e49f9 100644
--- a/NorthstarDedicatedTest/include/rapidjson/internal/swap.h
+++ b/NorthstarDLL/include/rapidjson/internal/swap.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/istreamwrapper.h b/NorthstarDLL/include/rapidjson/istreamwrapper.h
index f5fe2897..f5fe2897 100644
--- a/NorthstarDedicatedTest/include/rapidjson/istreamwrapper.h
+++ b/NorthstarDLL/include/rapidjson/istreamwrapper.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/memorybuffer.h b/NorthstarDLL/include/rapidjson/memorybuffer.h
index 39bee1de..39bee1de 100644
--- a/NorthstarDedicatedTest/include/rapidjson/memorybuffer.h
+++ b/NorthstarDLL/include/rapidjson/memorybuffer.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/memorystream.h b/NorthstarDLL/include/rapidjson/memorystream.h
index 1d71d8a4..1d71d8a4 100644
--- a/NorthstarDedicatedTest/include/rapidjson/memorystream.h
+++ b/NorthstarDLL/include/rapidjson/memorystream.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/msinttypes/inttypes.h b/NorthstarDLL/include/rapidjson/msinttypes/inttypes.h
index 18111286..18111286 100644
--- a/NorthstarDedicatedTest/include/rapidjson/msinttypes/inttypes.h
+++ b/NorthstarDLL/include/rapidjson/msinttypes/inttypes.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/msinttypes/stdint.h b/NorthstarDLL/include/rapidjson/msinttypes/stdint.h
index 3d4477b9..3d4477b9 100644
--- a/NorthstarDedicatedTest/include/rapidjson/msinttypes/stdint.h
+++ b/NorthstarDLL/include/rapidjson/msinttypes/stdint.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/ostreamwrapper.h b/NorthstarDLL/include/rapidjson/ostreamwrapper.h
index 6f4667c0..6f4667c0 100644
--- a/NorthstarDedicatedTest/include/rapidjson/ostreamwrapper.h
+++ b/NorthstarDLL/include/rapidjson/ostreamwrapper.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/pointer.h b/NorthstarDLL/include/rapidjson/pointer.h
index 0206ac1c..0206ac1c 100644
--- a/NorthstarDedicatedTest/include/rapidjson/pointer.h
+++ b/NorthstarDLL/include/rapidjson/pointer.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/prettywriter.h b/NorthstarDLL/include/rapidjson/prettywriter.h
index 0dcb0fee..0dcb0fee 100644
--- a/NorthstarDedicatedTest/include/rapidjson/prettywriter.h
+++ b/NorthstarDLL/include/rapidjson/prettywriter.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/rapidjson.h b/NorthstarDLL/include/rapidjson/rapidjson.h
index 053b2ce4..053b2ce4 100644
--- a/NorthstarDedicatedTest/include/rapidjson/rapidjson.h
+++ b/NorthstarDLL/include/rapidjson/rapidjson.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/reader.h b/NorthstarDLL/include/rapidjson/reader.h
index 19f8849b..19f8849b 100644
--- a/NorthstarDedicatedTest/include/rapidjson/reader.h
+++ b/NorthstarDLL/include/rapidjson/reader.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/schema.h b/NorthstarDLL/include/rapidjson/schema.h
index b182aa27..b182aa27 100644
--- a/NorthstarDedicatedTest/include/rapidjson/schema.h
+++ b/NorthstarDLL/include/rapidjson/schema.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/stream.h b/NorthstarDLL/include/rapidjson/stream.h
index fef82c25..fef82c25 100644
--- a/NorthstarDedicatedTest/include/rapidjson/stream.h
+++ b/NorthstarDLL/include/rapidjson/stream.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/stringbuffer.h b/NorthstarDLL/include/rapidjson/stringbuffer.h
index 78f34d20..78f34d20 100644
--- a/NorthstarDedicatedTest/include/rapidjson/stringbuffer.h
+++ b/NorthstarDLL/include/rapidjson/stringbuffer.h
diff --git a/NorthstarDedicatedTest/include/rapidjson/writer.h b/NorthstarDLL/include/rapidjson/writer.h
index 94f22dd5..94f22dd5 100644
--- a/NorthstarDedicatedTest/include/rapidjson/writer.h
+++ b/NorthstarDLL/include/rapidjson/writer.h
diff --git a/NorthstarDedicatedTest/include/spdlog/async.h b/NorthstarDLL/include/spdlog/async.h
index f7956305..f7956305 100644
--- a/NorthstarDedicatedTest/include/spdlog/async.h
+++ b/NorthstarDLL/include/spdlog/async.h
diff --git a/NorthstarDedicatedTest/include/spdlog/async_logger-inl.h b/NorthstarDLL/include/spdlog/async_logger-inl.h
index f8c9694c..f8c9694c 100644
--- a/NorthstarDedicatedTest/include/spdlog/async_logger-inl.h
+++ b/NorthstarDLL/include/spdlog/async_logger-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/async_logger.h b/NorthstarDLL/include/spdlog/async_logger.h
index 6f299672..6f299672 100644
--- a/NorthstarDedicatedTest/include/spdlog/async_logger.h
+++ b/NorthstarDLL/include/spdlog/async_logger.h
diff --git a/NorthstarDedicatedTest/include/spdlog/cfg/argv.h b/NorthstarDLL/include/spdlog/cfg/argv.h
index 36d9f1c4..36d9f1c4 100644
--- a/NorthstarDedicatedTest/include/spdlog/cfg/argv.h
+++ b/NorthstarDLL/include/spdlog/cfg/argv.h
diff --git a/NorthstarDedicatedTest/include/spdlog/cfg/env.h b/NorthstarDLL/include/spdlog/cfg/env.h
index 1f39ebbb..1f39ebbb 100644
--- a/NorthstarDedicatedTest/include/spdlog/cfg/env.h
+++ b/NorthstarDLL/include/spdlog/cfg/env.h
diff --git a/NorthstarDedicatedTest/include/spdlog/cfg/helpers-inl.h b/NorthstarDLL/include/spdlog/cfg/helpers-inl.h
index 9e4daede..9e4daede 100644
--- a/NorthstarDedicatedTest/include/spdlog/cfg/helpers-inl.h
+++ b/NorthstarDLL/include/spdlog/cfg/helpers-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/cfg/helpers.h b/NorthstarDLL/include/spdlog/cfg/helpers.h
index a795f39a..a795f39a 100644
--- a/NorthstarDedicatedTest/include/spdlog/cfg/helpers.h
+++ b/NorthstarDLL/include/spdlog/cfg/helpers.h
diff --git a/NorthstarDedicatedTest/include/spdlog/common-inl.h b/NorthstarDLL/include/spdlog/common-inl.h
index 378efe60..378efe60 100644
--- a/NorthstarDedicatedTest/include/spdlog/common-inl.h
+++ b/NorthstarDLL/include/spdlog/common-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/common.h b/NorthstarDLL/include/spdlog/common.h
index fb9a3660..fb9a3660 100644
--- a/NorthstarDedicatedTest/include/spdlog/common.h
+++ b/NorthstarDLL/include/spdlog/common.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/backtracer-inl.h b/NorthstarDLL/include/spdlog/details/backtracer-inl.h
index 21553c26..21553c26 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/backtracer-inl.h
+++ b/NorthstarDLL/include/spdlog/details/backtracer-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/backtracer.h b/NorthstarDLL/include/spdlog/details/backtracer.h
index b7476bc9..b7476bc9 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/backtracer.h
+++ b/NorthstarDLL/include/spdlog/details/backtracer.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/circular_q.h b/NorthstarDLL/include/spdlog/details/circular_q.h
index 1f2712e7..1f2712e7 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/circular_q.h
+++ b/NorthstarDLL/include/spdlog/details/circular_q.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/console_globals.h b/NorthstarDLL/include/spdlog/details/console_globals.h
index 665201dd..665201dd 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/console_globals.h
+++ b/NorthstarDLL/include/spdlog/details/console_globals.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/file_helper-inl.h b/NorthstarDLL/include/spdlog/details/file_helper-inl.h
index 30f3cf55..30f3cf55 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/file_helper-inl.h
+++ b/NorthstarDLL/include/spdlog/details/file_helper-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/file_helper.h b/NorthstarDLL/include/spdlog/details/file_helper.h
index 5395d9cb..5395d9cb 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/file_helper.h
+++ b/NorthstarDLL/include/spdlog/details/file_helper.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/fmt_helper.h b/NorthstarDLL/include/spdlog/details/fmt_helper.h
index 5dc311a0..5dc311a0 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/fmt_helper.h
+++ b/NorthstarDLL/include/spdlog/details/fmt_helper.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/log_msg-inl.h b/NorthstarDLL/include/spdlog/details/log_msg-inl.h
index af11e0da..af11e0da 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/log_msg-inl.h
+++ b/NorthstarDLL/include/spdlog/details/log_msg-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/log_msg.h b/NorthstarDLL/include/spdlog/details/log_msg.h
index 834ca4df..834ca4df 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/log_msg.h
+++ b/NorthstarDLL/include/spdlog/details/log_msg.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/log_msg_buffer-inl.h b/NorthstarDLL/include/spdlog/details/log_msg_buffer-inl.h
index ca9429bb..ca9429bb 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/log_msg_buffer-inl.h
+++ b/NorthstarDLL/include/spdlog/details/log_msg_buffer-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/log_msg_buffer.h b/NorthstarDLL/include/spdlog/details/log_msg_buffer.h
index 4410110f..4410110f 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/log_msg_buffer.h
+++ b/NorthstarDLL/include/spdlog/details/log_msg_buffer.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/mpmc_blocking_q.h b/NorthstarDLL/include/spdlog/details/mpmc_blocking_q.h
index 5c3cca76..5c3cca76 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/mpmc_blocking_q.h
+++ b/NorthstarDLL/include/spdlog/details/mpmc_blocking_q.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/null_mutex.h b/NorthstarDLL/include/spdlog/details/null_mutex.h
index 83533d4f..83533d4f 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/null_mutex.h
+++ b/NorthstarDLL/include/spdlog/details/null_mutex.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/os-inl.h b/NorthstarDLL/include/spdlog/details/os-inl.h
index a701e13f..a701e13f 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/os-inl.h
+++ b/NorthstarDLL/include/spdlog/details/os-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/os.h b/NorthstarDLL/include/spdlog/details/os.h
index 9fda1447..9fda1447 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/os.h
+++ b/NorthstarDLL/include/spdlog/details/os.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/periodic_worker-inl.h b/NorthstarDLL/include/spdlog/details/periodic_worker-inl.h
index 1d794994..1d794994 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/periodic_worker-inl.h
+++ b/NorthstarDLL/include/spdlog/details/periodic_worker-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/periodic_worker.h b/NorthstarDLL/include/spdlog/details/periodic_worker.h
index 42373665..42373665 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/periodic_worker.h
+++ b/NorthstarDLL/include/spdlog/details/periodic_worker.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/registry-inl.h b/NorthstarDLL/include/spdlog/details/registry-inl.h
index a60faabc..a60faabc 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/registry-inl.h
+++ b/NorthstarDLL/include/spdlog/details/registry-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/registry.h b/NorthstarDLL/include/spdlog/details/registry.h
index b069c3f5..b069c3f5 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/registry.h
+++ b/NorthstarDLL/include/spdlog/details/registry.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/synchronous_factory.h b/NorthstarDLL/include/spdlog/details/synchronous_factory.h
index b48f5932..b48f5932 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/synchronous_factory.h
+++ b/NorthstarDLL/include/spdlog/details/synchronous_factory.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/tcp_client-windows.h b/NorthstarDLL/include/spdlog/details/tcp_client-windows.h
index 7ee72927..7ee72927 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/tcp_client-windows.h
+++ b/NorthstarDLL/include/spdlog/details/tcp_client-windows.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/tcp_client.h b/NorthstarDLL/include/spdlog/details/tcp_client.h
index 9f3bb99e..9f3bb99e 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/tcp_client.h
+++ b/NorthstarDLL/include/spdlog/details/tcp_client.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/thread_pool-inl.h b/NorthstarDLL/include/spdlog/details/thread_pool-inl.h
index c1df4361..c1df4361 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/thread_pool-inl.h
+++ b/NorthstarDLL/include/spdlog/details/thread_pool-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/thread_pool.h b/NorthstarDLL/include/spdlog/details/thread_pool.h
index 61e25252..61e25252 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/thread_pool.h
+++ b/NorthstarDLL/include/spdlog/details/thread_pool.h
diff --git a/NorthstarDedicatedTest/include/spdlog/details/windows_include.h b/NorthstarDLL/include/spdlog/details/windows_include.h
index 6a2f14f9..6a2f14f9 100644
--- a/NorthstarDedicatedTest/include/spdlog/details/windows_include.h
+++ b/NorthstarDLL/include/spdlog/details/windows_include.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bin_to_hex.h b/NorthstarDLL/include/spdlog/fmt/bin_to_hex.h
index 1e2b054b..1e2b054b 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bin_to_hex.h
+++ b/NorthstarDLL/include/spdlog/fmt/bin_to_hex.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/LICENSE.rst b/NorthstarDLL/include/spdlog/fmt/bundled/LICENSE.rst
index f0ec3db4..f0ec3db4 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/LICENSE.rst
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/LICENSE.rst
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/chrono.h b/NorthstarDLL/include/spdlog/fmt/bundled/chrono.h
index bdfe2aa0..bdfe2aa0 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/chrono.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/chrono.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/color.h b/NorthstarDLL/include/spdlog/fmt/bundled/color.h
index 94e3419d..94e3419d 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/color.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/color.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/compile.h b/NorthstarDLL/include/spdlog/fmt/bundled/compile.h
index 3a33b020..3a33b020 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/compile.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/compile.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/core.h b/NorthstarDLL/include/spdlog/fmt/bundled/core.h
index 0a81e0cc..0a81e0cc 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/core.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/core.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/format-inl.h b/NorthstarDLL/include/spdlog/fmt/bundled/format-inl.h
index 8f2fe735..8f2fe735 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/format-inl.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/format-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/format.h b/NorthstarDLL/include/spdlog/fmt/bundled/format.h
index 1a037b02..1a037b02 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/format.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/format.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/locale.h b/NorthstarDLL/include/spdlog/fmt/bundled/locale.h
index 7301bf92..7301bf92 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/locale.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/locale.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/os.h b/NorthstarDLL/include/spdlog/fmt/bundled/os.h
index d44ea0c9..d44ea0c9 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/os.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/os.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/ostream.h b/NorthstarDLL/include/spdlog/fmt/bundled/ostream.h
index 29c58ec1..29c58ec1 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/ostream.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/ostream.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/posix.h b/NorthstarDLL/include/spdlog/fmt/bundled/posix.h
index da19e9d5..da19e9d5 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/posix.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/posix.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/printf.h b/NorthstarDLL/include/spdlog/fmt/bundled/printf.h
index 8c28ac23..8c28ac23 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/printf.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/printf.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/ranges.h b/NorthstarDLL/include/spdlog/fmt/bundled/ranges.h
index 632f0494..632f0494 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/bundled/ranges.h
+++ b/NorthstarDLL/include/spdlog/fmt/bundled/ranges.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/chrono.h b/NorthstarDLL/include/spdlog/fmt/chrono.h
index e1fb7a06..e1fb7a06 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/chrono.h
+++ b/NorthstarDLL/include/spdlog/fmt/chrono.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/fmt.h b/NorthstarDLL/include/spdlog/fmt/fmt.h
index 746d2f2c..746d2f2c 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/fmt.h
+++ b/NorthstarDLL/include/spdlog/fmt/fmt.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fmt/ostr.h b/NorthstarDLL/include/spdlog/fmt/ostr.h
index f82eb679..f82eb679 100644
--- a/NorthstarDedicatedTest/include/spdlog/fmt/ostr.h
+++ b/NorthstarDLL/include/spdlog/fmt/ostr.h
diff --git a/NorthstarDedicatedTest/include/spdlog/formatter.h b/NorthstarDLL/include/spdlog/formatter.h
index 5086fb21..5086fb21 100644
--- a/NorthstarDedicatedTest/include/spdlog/formatter.h
+++ b/NorthstarDLL/include/spdlog/formatter.h
diff --git a/NorthstarDedicatedTest/include/spdlog/fwd.h b/NorthstarDLL/include/spdlog/fwd.h
index cc05ddd4..cc05ddd4 100644
--- a/NorthstarDedicatedTest/include/spdlog/fwd.h
+++ b/NorthstarDLL/include/spdlog/fwd.h
diff --git a/NorthstarDedicatedTest/include/spdlog/logger-inl.h b/NorthstarDLL/include/spdlog/logger-inl.h
index d01c08da..d01c08da 100644
--- a/NorthstarDedicatedTest/include/spdlog/logger-inl.h
+++ b/NorthstarDLL/include/spdlog/logger-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/logger.h b/NorthstarDLL/include/spdlog/logger.h
index a34c5221..a34c5221 100644
--- a/NorthstarDedicatedTest/include/spdlog/logger.h
+++ b/NorthstarDLL/include/spdlog/logger.h
diff --git a/NorthstarDedicatedTest/include/spdlog/pattern_formatter-inl.h b/NorthstarDLL/include/spdlog/pattern_formatter-inl.h
index 54346e1e..54346e1e 100644
--- a/NorthstarDedicatedTest/include/spdlog/pattern_formatter-inl.h
+++ b/NorthstarDLL/include/spdlog/pattern_formatter-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/pattern_formatter.h b/NorthstarDLL/include/spdlog/pattern_formatter.h
index bc13ae10..bc13ae10 100644
--- a/NorthstarDedicatedTest/include/spdlog/pattern_formatter.h
+++ b/NorthstarDLL/include/spdlog/pattern_formatter.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/android_sink.h b/NorthstarDLL/include/spdlog/sinks/android_sink.h
index 9686adff..9686adff 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/android_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/android_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/ansicolor_sink-inl.h b/NorthstarDLL/include/spdlog/sinks/ansicolor_sink-inl.h
index 61c0a719..61c0a719 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/ansicolor_sink-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/ansicolor_sink-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/ansicolor_sink.h b/NorthstarDLL/include/spdlog/sinks/ansicolor_sink.h
index 4438f706..4438f706 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/ansicolor_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/ansicolor_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/base_sink-inl.h b/NorthstarDLL/include/spdlog/sinks/base_sink-inl.h
index b15fb0e6..b15fb0e6 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/base_sink-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/base_sink-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/base_sink.h b/NorthstarDLL/include/spdlog/sinks/base_sink.h
index bf5072f8..bf5072f8 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/base_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/base_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/basic_file_sink-inl.h b/NorthstarDLL/include/spdlog/sinks/basic_file_sink-inl.h
index 1260d15c..1260d15c 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/basic_file_sink-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/basic_file_sink-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/basic_file_sink.h b/NorthstarDLL/include/spdlog/sinks/basic_file_sink.h
index 0ab9a4a1..0ab9a4a1 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/basic_file_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/basic_file_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/daily_file_sink.h b/NorthstarDLL/include/spdlog/sinks/daily_file_sink.h
index 16be821a..16be821a 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/daily_file_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/daily_file_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/dist_sink.h b/NorthstarDLL/include/spdlog/sinks/dist_sink.h
index 8fccb4ee..8fccb4ee 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/dist_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/dist_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/dup_filter_sink.h b/NorthstarDLL/include/spdlog/sinks/dup_filter_sink.h
index c9a08d68..c9a08d68 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/dup_filter_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/dup_filter_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/hourly_file_sink.h b/NorthstarDLL/include/spdlog/sinks/hourly_file_sink.h
index f5e34366..f5e34366 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/hourly_file_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/hourly_file_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/msvc_sink.h b/NorthstarDLL/include/spdlog/sinks/msvc_sink.h
index 8fec428d..8fec428d 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/msvc_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/msvc_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/null_sink.h b/NorthstarDLL/include/spdlog/sinks/null_sink.h
index eb832801..eb832801 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/null_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/null_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/ostream_sink.h b/NorthstarDLL/include/spdlog/sinks/ostream_sink.h
index 95c1e962..95c1e962 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/ostream_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/ostream_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/ringbuffer_sink.h b/NorthstarDLL/include/spdlog/sinks/ringbuffer_sink.h
index 1ee3f691..1ee3f691 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/ringbuffer_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/ringbuffer_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/rotating_file_sink-inl.h b/NorthstarDLL/include/spdlog/sinks/rotating_file_sink-inl.h
index d715ebf3..d715ebf3 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/rotating_file_sink-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/rotating_file_sink-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/rotating_file_sink.h b/NorthstarDLL/include/spdlog/sinks/rotating_file_sink.h
index e1e85a7d..e1e85a7d 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/rotating_file_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/rotating_file_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/sink-inl.h b/NorthstarDLL/include/spdlog/sinks/sink-inl.h
index a8dd6a6c..a8dd6a6c 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/sink-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/sink-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/sink.h b/NorthstarDLL/include/spdlog/sinks/sink.h
index be99744d..be99744d 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_color_sinks-inl.h b/NorthstarDLL/include/spdlog/sinks/stdout_color_sinks-inl.h
index 653aca80..653aca80 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_color_sinks-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/stdout_color_sinks-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_color_sinks.h b/NorthstarDLL/include/spdlog/sinks/stdout_color_sinks.h
index e67aa91b..e67aa91b 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_color_sinks.h
+++ b/NorthstarDLL/include/spdlog/sinks/stdout_color_sinks.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_sinks-inl.h b/NorthstarDLL/include/spdlog/sinks/stdout_sinks-inl.h
index 25192607..25192607 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_sinks-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/stdout_sinks-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_sinks.h b/NorthstarDLL/include/spdlog/sinks/stdout_sinks.h
index 40688a46..40688a46 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/stdout_sinks.h
+++ b/NorthstarDLL/include/spdlog/sinks/stdout_sinks.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/syslog_sink.h b/NorthstarDLL/include/spdlog/sinks/syslog_sink.h
index 7c38fcb5..7c38fcb5 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/syslog_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/syslog_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/systemd_sink.h b/NorthstarDLL/include/spdlog/sinks/systemd_sink.h
index d23824b8..d23824b8 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/systemd_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/systemd_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/tcp_sink.h b/NorthstarDLL/include/spdlog/sinks/tcp_sink.h
index 9dd9e51d..9dd9e51d 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/tcp_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/tcp_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/win_eventlog_sink.h b/NorthstarDLL/include/spdlog/sinks/win_eventlog_sink.h
index 68170dd9..68170dd9 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/win_eventlog_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/win_eventlog_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/wincolor_sink-inl.h b/NorthstarDLL/include/spdlog/sinks/wincolor_sink-inl.h
index e2676d3c..e2676d3c 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/wincolor_sink-inl.h
+++ b/NorthstarDLL/include/spdlog/sinks/wincolor_sink-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/sinks/wincolor_sink.h b/NorthstarDLL/include/spdlog/sinks/wincolor_sink.h
index a82f1b24..a82f1b24 100644
--- a/NorthstarDedicatedTest/include/spdlog/sinks/wincolor_sink.h
+++ b/NorthstarDLL/include/spdlog/sinks/wincolor_sink.h
diff --git a/NorthstarDedicatedTest/include/spdlog/spdlog-inl.h b/NorthstarDLL/include/spdlog/spdlog-inl.h
index 96e09f59..96e09f59 100644
--- a/NorthstarDedicatedTest/include/spdlog/spdlog-inl.h
+++ b/NorthstarDLL/include/spdlog/spdlog-inl.h
diff --git a/NorthstarDedicatedTest/include/spdlog/spdlog.h b/NorthstarDLL/include/spdlog/spdlog.h
index bb130d94..bb130d94 100644
--- a/NorthstarDedicatedTest/include/spdlog/spdlog.h
+++ b/NorthstarDLL/include/spdlog/spdlog.h
diff --git a/NorthstarDedicatedTest/include/spdlog/stopwatch.h b/NorthstarDLL/include/spdlog/stopwatch.h
index bb976b19..bb976b19 100644
--- a/NorthstarDedicatedTest/include/spdlog/stopwatch.h
+++ b/NorthstarDLL/include/spdlog/stopwatch.h
diff --git a/NorthstarDedicatedTest/include/spdlog/tweakme.h b/NorthstarDLL/include/spdlog/tweakme.h
index 31e417ab..31e417ab 100644
--- a/NorthstarDedicatedTest/include/spdlog/tweakme.h
+++ b/NorthstarDLL/include/spdlog/tweakme.h
diff --git a/NorthstarDedicatedTest/include/spdlog/version.h b/NorthstarDLL/include/spdlog/version.h
index 828f78cb..828f78cb 100644
--- a/NorthstarDedicatedTest/include/spdlog/version.h
+++ b/NorthstarDLL/include/spdlog/version.h
diff --git a/NorthstarDedicatedTest/keyvalues.cpp b/NorthstarDLL/keyvalues.cpp
index 1b711976..1b711976 100644
--- a/NorthstarDedicatedTest/keyvalues.cpp
+++ b/NorthstarDLL/keyvalues.cpp
diff --git a/NorthstarDedicatedTest/languagehooks.cpp b/NorthstarDLL/languagehooks.cpp
index 4e708517..4e708517 100644
--- a/NorthstarDedicatedTest/languagehooks.cpp
+++ b/NorthstarDLL/languagehooks.cpp
diff --git a/NorthstarDedicatedTest/latencyflex.cpp b/NorthstarDLL/latencyflex.cpp
index 8c302df8..8c302df8 100644
--- a/NorthstarDedicatedTest/latencyflex.cpp
+++ b/NorthstarDLL/latencyflex.cpp
diff --git a/NorthstarDedicatedTest/localchatwriter.cpp b/NorthstarDLL/localchatwriter.cpp
index c4bf0ea9..c4bf0ea9 100644
--- a/NorthstarDedicatedTest/localchatwriter.cpp
+++ b/NorthstarDLL/localchatwriter.cpp
diff --git a/NorthstarDedicatedTest/localchatwriter.h b/NorthstarDLL/localchatwriter.h
index 3ef3aca1..3ef3aca1 100644
--- a/NorthstarDedicatedTest/localchatwriter.h
+++ b/NorthstarDLL/localchatwriter.h
diff --git a/NorthstarDedicatedTest/logging.cpp b/NorthstarDLL/logging.cpp
index 0f0d76fe..7fb0df3a 100644
--- a/NorthstarDedicatedTest/logging.cpp
+++ b/NorthstarDLL/logging.cpp
@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "logging.h"
 #include "convar.h"
+#include "concommand.h"
 #include "configurables.h"
 #include "bitbuf.h"
 #include "spdlog/sinks/basic_file_sink.h"
@@ -98,9 +99,7 @@ void,, (void* pEngineServer, SpewType_t type, const char* format, va_list args),
 	if (bShouldFormat)
 		vsnprintf(formatted, sizeof(formatted), format, args);
 	else
-	{
 		spdlog::warn("Failed to format {} \"{}\"", typeStr, format);
-	}
 
 	auto endpos = strlen(formatted);
 	if (formatted[endpos - 1] == '\n')
@@ -195,6 +194,13 @@ void,, (BFRead* msg),
 	}
 })
 
+AUTOHOOK(ConCommand_echo, engine.dll + 0x123680,
+void,, (const CCommand& arg),
+{
+	if (arg.ArgC() >= 2)
+		spdlog::info("[echo] {}", arg.ArgS());
+})
+
 // This needs to be called after hooks are loaded so we can access the command line args
 void CreateLogFiles()
 {
@@ -218,13 +224,20 @@ void CreateLogFiles()
 void InitialiseLogging()
 {
 	AllocConsole();
-	// seem to cause issues with console log initialisation occasionally
-	// freopen("CONOUT$", "w", stdout);
-	// freopen("CONOUT$", "w", stderr);
+
+	// don't redirect conout if already open
+	FILE* pConoutFile = fopen("CONOUT$", "w");
+	if (pConoutFile)
+	{
+		fclose(pConoutFile);
+		freopen("CONOUT$", "w", stdout);
+		freopen("CONOUT$", "w", stderr);
+	}
+
 	spdlog::default_logger()->set_pattern("[%H:%M:%S] [%l] %v");
 }
 
-ON_DLL_LOAD_CLIENT_RELIESON("engine.dll", EngineSpewFuncHooks, ConVar, [](HMODULE baseAddress)
+ON_DLL_LOAD_CLIENT_RELIESON("engine.dll", EngineSpewFuncHooks, ConCommand, [](HMODULE baseAddress)
 {
 	AUTOHOOK_DISPATCH_MODULE(engine.dll)
 
diff --git a/NorthstarDedicatedTest/logging.h b/NorthstarDLL/logging.h
index 83fd0c12..83fd0c12 100644
--- a/NorthstarDedicatedTest/logging.h
+++ b/NorthstarDLL/logging.h
diff --git a/NorthstarDedicatedTest/main.h b/NorthstarDLL/main.h
index 412f1e25..412f1e25 100644
--- a/NorthstarDedicatedTest/main.h
+++ b/NorthstarDLL/main.h
diff --git a/NorthstarDedicatedTest/masterserver.cpp b/NorthstarDLL/masterserver.cpp
index 229b2f95..229b2f95 100644
--- a/NorthstarDedicatedTest/masterserver.cpp
+++ b/NorthstarDLL/masterserver.cpp
diff --git a/NorthstarDedicatedTest/masterserver.h b/NorthstarDLL/masterserver.h
index a485a1dc..a485a1dc 100644
--- a/NorthstarDedicatedTest/masterserver.h
+++ b/NorthstarDLL/masterserver.h
diff --git a/NorthstarDedicatedTest/maxplayers.cpp b/NorthstarDLL/maxplayers.cpp
index 22f2f59a..22f2f59a 100644
--- a/NorthstarDedicatedTest/maxplayers.cpp
+++ b/NorthstarDLL/maxplayers.cpp
diff --git a/NorthstarDedicatedTest/memalloc.cpp b/NorthstarDLL/memalloc.cpp
index e00d3fc7..e00d3fc7 100644
--- a/NorthstarDedicatedTest/memalloc.cpp
+++ b/NorthstarDLL/memalloc.cpp
diff --git a/NorthstarDedicatedTest/memalloc.h b/NorthstarDLL/memalloc.h
index a1b16ad4..a1b16ad4 100644
--- a/NorthstarDedicatedTest/memalloc.h
+++ b/NorthstarDLL/memalloc.h
diff --git a/NorthstarDedicatedTest/miscclientfixes.cpp b/NorthstarDLL/miscclientfixes.cpp
index 4d0e2508..4d0e2508 100644
--- a/NorthstarDedicatedTest/miscclientfixes.cpp
+++ b/NorthstarDLL/miscclientfixes.cpp
diff --git a/NorthstarDedicatedTest/misccommands.cpp b/NorthstarDLL/misccommands.cpp
index 5a77a4f9..5a77a4f9 100644
--- a/NorthstarDedicatedTest/misccommands.cpp
+++ b/NorthstarDLL/misccommands.cpp
diff --git a/NorthstarDedicatedTest/misccommands.h b/NorthstarDLL/misccommands.h
index fbd41b32..fbd41b32 100644
--- a/NorthstarDedicatedTest/misccommands.h
+++ b/NorthstarDLL/misccommands.h
diff --git a/NorthstarDedicatedTest/miscserverfixes.cpp b/NorthstarDLL/miscserverfixes.cpp
index 3abb28f4..3abb28f4 100644
--- a/NorthstarDedicatedTest/miscserverfixes.cpp
+++ b/NorthstarDLL/miscserverfixes.cpp
diff --git a/NorthstarDedicatedTest/miscserverscript.cpp b/NorthstarDLL/miscserverscript.cpp
index 488e071a..488e071a 100644
--- a/NorthstarDedicatedTest/miscserverscript.cpp
+++ b/NorthstarDLL/miscserverscript.cpp
diff --git a/NorthstarDedicatedTest/miscserverscript.h b/NorthstarDLL/miscserverscript.h
index 8353df0d..8353df0d 100644
--- a/NorthstarDedicatedTest/miscserverscript.h
+++ b/NorthstarDLL/miscserverscript.h
diff --git a/NorthstarDedicatedTest/modlocalisation.cpp b/NorthstarDLL/modlocalisation.cpp
index ad01192d..ad01192d 100644
--- a/NorthstarDedicatedTest/modlocalisation.cpp
+++ b/NorthstarDLL/modlocalisation.cpp
diff --git a/NorthstarDedicatedTest/modmanager.cpp b/NorthstarDLL/modmanager.cpp
index 1a9ff1ab..1a9ff1ab 100644
--- a/NorthstarDedicatedTest/modmanager.cpp
+++ b/NorthstarDLL/modmanager.cpp
diff --git a/NorthstarDedicatedTest/modmanager.h b/NorthstarDLL/modmanager.h
index ceddb402..ceddb402 100644
--- a/NorthstarDedicatedTest/modmanager.h
+++ b/NorthstarDLL/modmanager.h
diff --git a/LauncherInjector/ns_startup_args.txt b/NorthstarDLL/ns_startup_args.txt
index 0713aef2..0713aef2 100644
--- a/LauncherInjector/ns_startup_args.txt
+++ b/NorthstarDLL/ns_startup_args.txt
diff --git a/LauncherInjector/ns_startup_args_dedi.txt b/NorthstarDLL/ns_startup_args_dedi.txt
index ce1dcf5f..ce1dcf5f 100644
--- a/LauncherInjector/ns_startup_args_dedi.txt
+++ b/NorthstarDLL/ns_startup_args_dedi.txt
diff --git a/NorthstarDedicatedTest/ns_version.h b/NorthstarDLL/ns_version.h
index d30594fb..d30594fb 100644
--- a/NorthstarDedicatedTest/ns_version.h
+++ b/NorthstarDLL/ns_version.h
diff --git a/NorthstarDedicatedTest/pch.cpp b/NorthstarDLL/pch.cpp
index 64b7eef6..64b7eef6 100644
--- a/NorthstarDedicatedTest/pch.cpp
+++ b/NorthstarDLL/pch.cpp
diff --git a/NorthstarDedicatedTest/pch.h b/NorthstarDLL/pch.h
index f6faa2c1..f6faa2c1 100644
--- a/NorthstarDedicatedTest/pch.h
+++ b/NorthstarDLL/pch.h
diff --git a/NorthstarDedicatedTest/pdef.cpp b/NorthstarDLL/pdef.cpp
index 367d1bbf..367d1bbf 100644
--- a/NorthstarDedicatedTest/pdef.cpp
+++ b/NorthstarDLL/pdef.cpp
diff --git a/NorthstarDedicatedTest/pdef.h b/NorthstarDLL/pdef.h
index 379e76da..379e76da 100644
--- a/NorthstarDedicatedTest/pdef.h
+++ b/NorthstarDLL/pdef.h
diff --git a/NorthstarDedicatedTest/playlist.cpp b/NorthstarDLL/playlist.cpp
index 67e3a821..27ca6be1 100644
--- a/NorthstarDedicatedTest/playlist.cpp
+++ b/NorthstarDLL/playlist.cpp
@@ -42,7 +42,7 @@ void,, (const char* pVarName, const char* pValue),
 	if (strlen(pValue) >= 64)
 		return;
 
-	R2::SetPlaylistVarOverride(pVarName, pValue);
+	SetPlaylistVarOverride(pVarName, pValue);
 })
 
 AUTOHOOK(GetCurrentPlaylistVar, engine.dll + 0x18C680,
@@ -51,7 +51,7 @@ const char*,, (const char* pVarName, bool bUseOverrides),
 	if (!bUseOverrides && !strcmp(pVarName, "max_players"))
 		bUseOverrides = true;
 
-	return R2::GetCurrentPlaylistVar(pVarName, bUseOverrides);
+	return GetCurrentPlaylistVar(pVarName, bUseOverrides);
 })
 
 
diff --git a/NorthstarDedicatedTest/playlist.h b/NorthstarDLL/playlist.h
index c77b37d9..c77b37d9 100644
--- a/NorthstarDedicatedTest/playlist.h
+++ b/NorthstarDLL/playlist.h
diff --git a/NorthstarDedicatedTest/plugin_abi.h b/NorthstarDLL/plugin_abi.h
index 4b176a32..4b176a32 100644
--- a/NorthstarDedicatedTest/plugin_abi.h
+++ b/NorthstarDLL/plugin_abi.h
diff --git a/NorthstarDedicatedTest/plugins.cpp b/NorthstarDLL/plugins.cpp
index e7e40dad..e7e40dad 100644
--- a/NorthstarDedicatedTest/plugins.cpp
+++ b/NorthstarDLL/plugins.cpp
diff --git a/NorthstarDedicatedTest/plugins.h b/NorthstarDLL/plugins.h
index 953801a2..953801a2 100644
--- a/NorthstarDedicatedTest/plugins.h
+++ b/NorthstarDLL/plugins.h
diff --git a/NorthstarDedicatedTest/printcommand.h b/NorthstarDLL/printcommand.h
index 6c3ef850..6c3ef850 100644
--- a/NorthstarDedicatedTest/printcommand.h
+++ b/NorthstarDLL/printcommand.h
diff --git a/NorthstarDedicatedTest/printcommands.cpp b/NorthstarDLL/printcommands.cpp
index c56283a1..30088f68 100644
--- a/NorthstarDedicatedTest/printcommands.cpp
+++ b/NorthstarDLL/printcommands.cpp
@@ -11,6 +11,9 @@ void PrintCommandHelpDialogue(const ConCommandBase* command, const char* name)
 		return;
 	}
 
+	// temp because command->IsCommand does not currently work
+	ConVar* cvar = R2::g_pCVar->FindVar(command->m_pszName);
+
 	// build string for flags if not FCVAR_NONE
 	std::string flagString;
 	if (command->GetFlags() != FCVAR_NONE)
@@ -21,6 +24,16 @@ void PrintCommandHelpDialogue(const ConCommandBase* command, const char* name)
 		{
 			if (command->GetFlags() & flagPair.first)
 			{
+				// special case, slightly hacky: PRINTABLEONLY is for commands, GAMEDLL_FOR_REMOTE_CLIENTS is for concommands, both have the same value
+				if (flagPair.first == FCVAR_PRINTABLEONLY)
+				{
+					if (cvar && !strcmp(flagPair.second, "GAMEDLL_FOR_REMOTE_CLIENTS"))
+						continue;
+
+					if (!cvar && !strcmp(flagPair.second, "PRINTABLEONLY"))
+						continue;			
+				}
+
 				flagString += flagPair.second;
 				flagString += " ";
 			}
@@ -29,8 +42,6 @@ void PrintCommandHelpDialogue(const ConCommandBase* command, const char* name)
 		flagString += ") ";
 	}
 
-	// temp because command->IsCommand does not currently work
-	ConVar* cvar = R2::g_pCVar->FindVar(command->m_pszName);
 	if (cvar)
 		spdlog::info("\"{}\" = \"{}\" {}- {}", cvar->GetBaseName(), cvar->GetString(), flagString, cvar->GetHelpText());
 	else
@@ -153,6 +164,7 @@ void InitialiseCommandPrint()
 {
 	RegisterConCommand("find", ConCommand_find, "Find concommands with the specified string in their name/help text.", FCVAR_NONE);
 	RegisterConCommand("findflags", ConCommand_findflags, "Find concommands by flags.", FCVAR_NONE);
+
 	// help is already a command, so we need to modify the preexisting command to use our func instead
 	// and clear the flags also
 	ConCommand* helpCommand = R2::g_pCVar->FindCommand("help");
diff --git a/NorthstarDedicatedTest/printmaps.cpp b/NorthstarDLL/printmaps.cpp
index 7fbe088a..7ecb4060 100644
--- a/NorthstarDedicatedTest/printmaps.cpp
+++ b/NorthstarDLL/printmaps.cpp
@@ -121,7 +121,7 @@ int, __fastcall, (const char const* cmdname, const char const* partial, char com
 		flLastAutocompleteRefresh = Tier0::Plat_FloatTime();
 	}
 
-	// use a custom autocomplete func for all map loading command
+	// use a custom autocomplete func for all map loading commands
 	const int cmdLength = strlen(cmdname);
 	const char* query = partial + cmdLength;
 	const int queryLength = strlen(query);
diff --git a/NorthstarDedicatedTest/printmaps.h b/NorthstarDLL/printmaps.h
index b01761c0..b01761c0 100644
--- a/NorthstarDedicatedTest/printmaps.h
+++ b/NorthstarDLL/printmaps.h
diff --git a/NorthstarDedicatedTest/r2client.cpp b/NorthstarDLL/r2client.cpp
index 0d56e16f..0d56e16f 100644
--- a/NorthstarDedicatedTest/r2client.cpp
+++ b/NorthstarDLL/r2client.cpp
diff --git a/NorthstarDedicatedTest/r2client.h b/NorthstarDLL/r2client.h
index c2de3397..c2de3397 100644
--- a/NorthstarDedicatedTest/r2client.h
+++ b/NorthstarDLL/r2client.h
diff --git a/NorthstarDedicatedTest/r2engine.cpp b/NorthstarDLL/r2engine.cpp
index c866186a..c866186a 100644
--- a/NorthstarDedicatedTest/r2engine.cpp
+++ b/NorthstarDLL/r2engine.cpp
diff --git a/NorthstarDedicatedTest/r2engine.h b/NorthstarDLL/r2engine.h
index ae02c791..1d7bf2d7 100644
--- a/NorthstarDedicatedTest/r2engine.h
+++ b/NorthstarDLL/r2engine.h
@@ -19,7 +19,7 @@ namespace R2
 		kCommandSrcCode,
 
 		// Sent from code via engine->ClientCmd, which is restricted to commands visible
-		// via FCVAR_CLIENTCMD_CAN_EXECUTE.
+		// via FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS.
 		kCommandSrcClientCmd,
 
 		// Typed in at the console or via a user key-bind.  Generally unrestricted, although
diff --git a/NorthstarDedicatedTest/r2server.cpp b/NorthstarDLL/r2server.cpp
index c61e2d13..c61e2d13 100644
--- a/NorthstarDedicatedTest/r2server.cpp
+++ b/NorthstarDLL/r2server.cpp
diff --git a/NorthstarDedicatedTest/r2server.h b/NorthstarDLL/r2server.h
index 6e09d0d1..6e09d0d1 100644
--- a/NorthstarDedicatedTest/r2server.h
+++ b/NorthstarDLL/r2server.h
diff --git a/NorthstarDedicatedTest/rpakfilesystem.cpp b/NorthstarDLL/rpakfilesystem.cpp
index bba69ff3..bba69ff3 100644
--- a/NorthstarDedicatedTest/rpakfilesystem.cpp
+++ b/NorthstarDLL/rpakfilesystem.cpp
diff --git a/NorthstarDedicatedTest/rpakfilesystem.h b/NorthstarDLL/rpakfilesystem.h
index 28b29b52..28b29b52 100644
--- a/NorthstarDedicatedTest/rpakfilesystem.h
+++ b/NorthstarDLL/rpakfilesystem.h
diff --git a/NorthstarDedicatedTest/scriptbrowserhooks.cpp b/NorthstarDLL/scriptbrowserhooks.cpp
index de78daf9..de78daf9 100644
--- a/NorthstarDedicatedTest/scriptbrowserhooks.cpp
+++ b/NorthstarDLL/scriptbrowserhooks.cpp
diff --git a/NorthstarDedicatedTest/scriptmainmenupromos.cpp b/NorthstarDLL/scriptmainmenupromos.cpp
index a4f65dd8..a4f65dd8 100644
--- a/NorthstarDedicatedTest/scriptmainmenupromos.cpp
+++ b/NorthstarDLL/scriptmainmenupromos.cpp
diff --git a/NorthstarDedicatedTest/scriptmodmenu.cpp b/NorthstarDLL/scriptmodmenu.cpp
index e1e8c7bb..e1e8c7bb 100644
--- a/NorthstarDedicatedTest/scriptmodmenu.cpp
+++ b/NorthstarDLL/scriptmodmenu.cpp
diff --git a/NorthstarDedicatedTest/scriptserverbrowser.cpp b/NorthstarDLL/scriptserverbrowser.cpp
index e1139474..e1139474 100644
--- a/NorthstarDedicatedTest/scriptserverbrowser.cpp
+++ b/NorthstarDLL/scriptserverbrowser.cpp
diff --git a/NorthstarDedicatedTest/scriptservertoclientstringcommand.cpp b/NorthstarDLL/scriptservertoclientstringcommand.cpp
index 3bb7f60d..3bb7f60d 100644
--- a/NorthstarDedicatedTest/scriptservertoclientstringcommand.cpp
+++ b/NorthstarDLL/scriptservertoclientstringcommand.cpp
diff --git a/NorthstarDedicatedTest/scriptsrson.cpp b/NorthstarDLL/scriptsrson.cpp
index d7df84e8..d7df84e8 100644
--- a/NorthstarDedicatedTest/scriptsrson.cpp
+++ b/NorthstarDLL/scriptsrson.cpp
diff --git a/NorthstarDedicatedTest/scriptsrson.h b/NorthstarDLL/scriptsrson.h
index 5e1d5684..5e1d5684 100644
--- a/NorthstarDedicatedTest/scriptsrson.h
+++ b/NorthstarDLL/scriptsrson.h
diff --git a/NorthstarDedicatedTest/serverauthentication.cpp b/NorthstarDLL/serverauthentication.cpp
index efecd692..a05dce68 100644
--- a/NorthstarDedicatedTest/serverauthentication.cpp
+++ b/NorthstarDLL/serverauthentication.cpp
@@ -447,7 +447,7 @@ char CGameClient__ExecuteStringCommandHook(void* self, uint32_t unknown, const c
 		}
 	}
 
-	// verify the command we're trying to execute is FCVAR_CLIENTCMD_CAN_EXECUTE, if it's a concommand
+	// verify the command we're trying to execute is FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS, if it's a concommand
 	char* commandBuf[1040]; // assumedly this is the size of CCommand since we don't have an actual constructor
 	memset(commandBuf, 0, sizeof(commandBuf));
 	CCommand tempCommand = *(CCommand*)&commandBuf;
@@ -458,9 +458,9 @@ char CGameClient__ExecuteStringCommandHook(void* self, uint32_t unknown, const c
 	ConCommand* command = R2::g_pCVar->FindCommand(tempCommand.Arg(0));
 
 	// if the command doesn't exist pass it on to ExecuteStringCommand for script clientcommands and stuff
-	if (command && !command->IsFlagSet(FCVAR_CLIENTCMD_CAN_EXECUTE))
+	if (command && !command->IsFlagSet(FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS))
 	{
-		// ensure FCVAR_GAMEDLL concommands without FCVAR_CLIENTCMD_CAN_EXECUTE can't be executed by remote clients
+		// ensure FCVAR_GAMEDLL concommands without FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS can't be executed by remote clients
 		if (IsDedicatedServer())
 			return false;
 
diff --git a/NorthstarDedicatedTest/serverauthentication.h b/NorthstarDLL/serverauthentication.h
index 182b3336..182b3336 100644
--- a/NorthstarDedicatedTest/serverauthentication.h
+++ b/NorthstarDLL/serverauthentication.h
diff --git a/NorthstarDedicatedTest/serverchathooks.cpp b/NorthstarDLL/serverchathooks.cpp
index 145d691e..145d691e 100644
--- a/NorthstarDedicatedTest/serverchathooks.cpp
+++ b/NorthstarDLL/serverchathooks.cpp
diff --git a/NorthstarDedicatedTest/serverchathooks.h b/NorthstarDLL/serverchathooks.h
index 1d8a806a..1d8a806a 100644
--- a/NorthstarDedicatedTest/serverchathooks.h
+++ b/NorthstarDLL/serverchathooks.h
diff --git a/NorthstarDedicatedTest/sigscanning.cpp b/NorthstarDLL/sigscanning.cpp
index 761f9f08..761f9f08 100644
--- a/NorthstarDedicatedTest/sigscanning.cpp
+++ b/NorthstarDLL/sigscanning.cpp
diff --git a/NorthstarDedicatedTest/sigscanning.h b/NorthstarDLL/sigscanning.h
index 5d255152..5d255152 100644
--- a/NorthstarDedicatedTest/sigscanning.h
+++ b/NorthstarDLL/sigscanning.h
diff --git a/NorthstarDedicatedTest/sourceconsole.cpp b/NorthstarDLL/sourceconsole.cpp
index 55e78ad3..55e78ad3 100644
--- a/NorthstarDedicatedTest/sourceconsole.cpp
+++ b/NorthstarDLL/sourceconsole.cpp
diff --git a/NorthstarDedicatedTest/sourceconsole.h b/NorthstarDLL/sourceconsole.h
index 9f6c2bf8..9f6c2bf8 100644
--- a/NorthstarDedicatedTest/sourceconsole.h
+++ b/NorthstarDLL/sourceconsole.h
diff --git a/NorthstarDedicatedTest/sourceinterface.cpp b/NorthstarDLL/sourceinterface.cpp
index 6528344d..2ffa31b5 100644
--- a/NorthstarDedicatedTest/sourceinterface.cpp
+++ b/NorthstarDLL/sourceinterface.cpp
@@ -6,7 +6,7 @@ AUTOHOOK_INIT()
 
 // really wanted to do a modular callback system here but honestly couldn't be bothered so hardcoding stuff for now: todo later
 
-AUTOHOOK_PROCADDRESS(ClientCreateInterface, "client.dll", CreateInterface, 
+AUTOHOOK_PROCADDRESS(ClientCreateInterface, client.dll, CreateInterface, 
 void*,, (const char* pName, const int* pReturnCode),
 {
 	void* ret = ClientCreateInterface(pName, pReturnCode);
@@ -18,35 +18,35 @@ void*,, (const char* pName, const int* pReturnCode),
 	return ret;
 })
 
-AUTOHOOK_PROCADDRESS(ServerCreateInterface, "server.dll", CreateInterface, 
+AUTOHOOK_PROCADDRESS(ServerCreateInterface, server.dll, CreateInterface, 
 void*,, (const char* pName, const int* pReturnCode),
 {
 	void* ret = ServerCreateInterface(pName, pReturnCode);
-	spdlog::info("CreateInterface SERVER {}", pName);
+		spdlog::info("CreateInterface SERVER {}", pName);
 
 	return ret;
 })
 
-AUTOHOOK_PROCADDRESS(EngineCreateInterface, "engine.dll", CreateInterface, 
+AUTOHOOK_PROCADDRESS(EngineCreateInterface, engine.dll, CreateInterface, 
 void*,, (const char* pName, const int* pReturnCode),
 {
 	void* ret = EngineCreateInterface(pName, pReturnCode);
-	spdlog::info("CreateInterface ENGINE {}", pName);
+		spdlog::info("CreateInterface ENGINE {}", pName);
 
 	return ret;
 })
 
 ON_DLL_LOAD("client.dll", ClientInterface, [](HMODULE baseAddress)
 {
-	AUTOHOOK_DISPATCH_MODULE("client.dll")
+	AUTOHOOK_DISPATCH_MODULE(client.dll)
 })
 
 ON_DLL_LOAD("server.dll", ServerInterface, [](HMODULE baseAddress)
 {
-	AUTOHOOK_DISPATCH_MODULE("server.dll")
+	AUTOHOOK_DISPATCH_MODULE(server.dll)
 })
 
 ON_DLL_LOAD("engine.dll", EngineInterface, [](HMODULE baseAddress)
 { 
-	AUTOHOOK_DISPATCH_MODULE("engine.dll") 
+	AUTOHOOK_DISPATCH_MODULE(engine.dll) 
 })
\ No newline at end of file
diff --git a/NorthstarDedicatedTest/sourceinterface.h b/NorthstarDLL/sourceinterface.h
index 474e961b..474e961b 100644
--- a/NorthstarDedicatedTest/sourceinterface.h
+++ b/NorthstarDLL/sourceinterface.h
diff --git a/NorthstarDedicatedTest/squirrel.cpp b/NorthstarDLL/squirrel.cpp
index bc474713..166fe277 100644
--- a/NorthstarDedicatedTest/squirrel.cpp
+++ b/NorthstarDLL/squirrel.cpp
@@ -378,5 +378,5 @@ ON_DLL_LOAD_RELIESON("server.dll", ServerSquirrel, ConCommand, [](HMODULE baseAd
 		"script",
 		ConCommand_script<ScriptContext::SERVER>,
 		"Executes script code on the server vm",
-		FCVAR_GAMEDLL | FCVAR_CLIENTCMD_CAN_EXECUTE | FCVAR_CHEAT);
+		FCVAR_GAMEDLL | FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS | FCVAR_CHEAT);
 })
\ No newline at end of file
diff --git a/NorthstarDedicatedTest/squirrel.h b/NorthstarDLL/squirrel.h
index 9d55d8a1..9d55d8a1 100644
--- a/NorthstarDedicatedTest/squirrel.h
+++ b/NorthstarDLL/squirrel.h
diff --git a/NorthstarDedicatedTest/tier0.cpp b/NorthstarDLL/tier0.cpp
index a34aaea5..a34aaea5 100644
--- a/NorthstarDedicatedTest/tier0.cpp
+++ b/NorthstarDLL/tier0.cpp
diff --git a/NorthstarDedicatedTest/tier0.h b/NorthstarDLL/tier0.h
index 5fefc699..5fefc699 100644
--- a/NorthstarDedicatedTest/tier0.h
+++ b/NorthstarDLL/tier0.h
diff --git a/NorthstarDedicatedTest/version.cpp b/NorthstarDLL/version.cpp
index 3755e4c4..3755e4c4 100644
--- a/NorthstarDedicatedTest/version.cpp
+++ b/NorthstarDLL/version.cpp
diff --git a/NorthstarDedicatedTest/version.h b/NorthstarDLL/version.h
index 261a4cf1..261a4cf1 100644
--- a/NorthstarDedicatedTest/version.h
+++ b/NorthstarDLL/version.h
diff --git a/LauncherInjector/LauncherInjector.vcxproj b/NorthstarLauncher/NorthstarLauncher.vcxproj
index 0c727918..0c727918 100644
--- a/LauncherInjector/LauncherInjector.vcxproj
+++ b/NorthstarLauncher/NorthstarLauncher.vcxproj
diff --git a/LauncherInjector/LauncherInjector.vcxproj.filters b/NorthstarLauncher/NorthstarLauncher.vcxproj.filters
index 87e25fa8..87e25fa8 100644
--- a/LauncherInjector/LauncherInjector.vcxproj.filters
+++ b/NorthstarLauncher/NorthstarLauncher.vcxproj.filters
diff --git a/LauncherInjector/main.cpp b/NorthstarLauncher/main.cpp
index 99e5ba15..99e5ba15 100644
--- a/LauncherInjector/main.cpp
+++ b/NorthstarLauncher/main.cpp
diff --git a/LauncherInjector/ns_icon.ico b/NorthstarLauncher/ns_icon.ico
index fc9ad166..fc9ad166 100644
--- a/LauncherInjector/ns_icon.ico
+++ b/NorthstarLauncher/ns_icon.ico
diff --git a/NorthstarLauncher/ns_startup_args.txt b/NorthstarLauncher/ns_startup_args.txt
new file mode 100644
index 00000000..0713aef2
--- /dev/null
+++ b/NorthstarLauncher/ns_startup_args.txt
@@ -0,0 +1 @@
+-multiple
\ No newline at end of file
diff --git a/NorthstarLauncher/ns_startup_args_dedi.txt b/NorthstarLauncher/ns_startup_args_dedi.txt
new file mode 100644
index 00000000..ce1dcf5f
--- /dev/null
+++ b/NorthstarLauncher/ns_startup_args_dedi.txt
@@ -0,0 +1 @@
++setplaylist private_match
\ No newline at end of file
diff --git a/LauncherInjector/resource1.h b/NorthstarLauncher/resource1.h
index bb584502..bb584502 100644
--- a/LauncherInjector/resource1.h
+++ b/NorthstarLauncher/resource1.h
diff --git a/LauncherInjector/resources.rc b/NorthstarLauncher/resources.rc
index de16250b..32038499 100644
--- a/LauncherInjector/resources.rc
+++ b/NorthstarLauncher/resources.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource1.h"
-#include "../NorthstarDedicatedTest/ns_version.h"
+#include "../NorthstarDLL/ns_version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
diff --git a/R2Northstar.sln b/R2Northstar.sln
index 3dfdb218..341c66dd 100644
--- a/R2Northstar.sln
+++ b/R2Northstar.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Northstar", "NorthstarDedicatedTest\NorthstarDedicatedTest.vcxproj", "{CFAD2623-064F-453C-8196-79EE10292E32}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Northstar", "NorthstarDLL\NorthstarDLL.vcxproj", "{CFAD2623-064F-453C-8196-79EE10292E32}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NorthstarLauncher", "LauncherInjector\LauncherInjector.vcxproj", "{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NorthstarLauncher", "NorthstarLauncher\NorthstarLauncher.vcxproj", "{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader_launcher_proxy", "loader_launcher_proxy\loader_launcher_proxy.vcxproj", "{F65C322D-66DF-4AF1-B650-70221DE334C0}"
 EndProject
diff --git a/loader_wsock32_proxy/hookutils.cpp b/loader_wsock32_proxy/hookutils.cpp
index f933f993..a73b277a 100644
--- a/loader_wsock32_proxy/hookutils.cpp
+++ b/loader_wsock32_proxy/hookutils.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "../NorthstarDedicatedTest/hookutils.h"
+#include "../NorthstarDLL/hookutils.h"
 
 #define ERROR(...) { char err[2048]; sprintf_s(err, __VA_ARGS__); MessageBoxA(GetForegroundWindow(), err, "Northstar Wsock32 Proxy Error", 0); }
 
diff --git a/loader_wsock32_proxy/include/MinHook.h b/loader_wsock32_proxy/include/MinHook.h
new file mode 100644
index 00000000..15c0a875
--- /dev/null
+++ b/loader_wsock32_proxy/include/MinHook.h
@@ -0,0 +1,186 @@
+/*
+ *  MinHook - The Minimalistic API Hooking Library for x64/x86
+ *  Copyright (C) 2009-2017 Tsuda Kageyu.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ *  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ *  PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+ *  OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if !(defined _M_IX86) && !(defined _M_X64) && !(defined __i386__) && !(defined __x86_64__)
+    #error MinHook supports only x86 and x64 systems.
+#endif
+
+#include <windows.h>
+
+// MinHook Error Codes.
+typedef enum MH_STATUS
+{
+    // Unknown error. Should not be returned.
+    MH_UNKNOWN = -1,
+
+    // Successful.
+    MH_OK = 0,
+
+    // MinHook is already initialized.
+    MH_ERROR_ALREADY_INITIALIZED,
+
+    // MinHook is not initialized yet, or already uninitialized.
+    MH_ERROR_NOT_INITIALIZED,
+
+    // The hook for the specified target function is already created.
+    MH_ERROR_ALREADY_CREATED,
+
+    // The hook for the specified target function is not created yet.
+    MH_ERROR_NOT_CREATED,
+
+    // The hook for the specified target function is already enabled.
+    MH_ERROR_ENABLED,
+
+    // The hook for the specified target function is not enabled yet, or already
+    // disabled.
+    MH_ERROR_DISABLED,
+
+    // The specified pointer is invalid. It points the address of non-allocated
+    // and/or non-executable region.
+    MH_ERROR_NOT_EXECUTABLE,
+
+    // The specified target function cannot be hooked.
+    MH_ERROR_UNSUPPORTED_FUNCTION,
+
+    // Failed to allocate memory.
+    MH_ERROR_MEMORY_ALLOC,
+
+    // Failed to change the memory protection.
+    MH_ERROR_MEMORY_PROTECT,
+
+    // The specified module is not loaded.
+    MH_ERROR_MODULE_NOT_FOUND,
+
+    // The specified function is not found.
+    MH_ERROR_FUNCTION_NOT_FOUND
+}
+MH_STATUS;
+
+// Can be passed as a parameter to MH_EnableHook, MH_DisableHook,
+// MH_QueueEnableHook or MH_QueueDisableHook.
+#define MH_ALL_HOOKS NULL
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    // Initialize the MinHook library. You must call this function EXACTLY ONCE
+    // at the beginning of your program.
+    MH_STATUS WINAPI MH_Initialize(VOID);
+
+    // Uninitialize the MinHook library. You must call this function EXACTLY
+    // ONCE at the end of your program.
+    MH_STATUS WINAPI MH_Uninitialize(VOID);
+
+    // Creates a Hook for the specified target function, in disabled state.
+    // Parameters:
+    //   pTarget    [in]  A pointer to the target function, which will be
+    //                    overridden by the detour function.
+    //   pDetour    [in]  A pointer to the detour function, which will override
+    //                    the target function.
+    //   ppOriginal [out] A pointer to the trampoline function, which will be
+    //                    used to call the original target function.
+    //                    This parameter can be NULL.
+    MH_STATUS WINAPI MH_CreateHook(LPVOID pTarget, LPVOID pDetour, LPVOID *ppOriginal);
+
+    // Creates a Hook for the specified API function, in disabled state.
+    // Parameters:
+    //   pszModule  [in]  A pointer to the loaded module name which contains the
+    //                    target function.
+    //   pszTarget  [in]  A pointer to the target function name, which will be
+    //                    overridden by the detour function.
+    //   pDetour    [in]  A pointer to the detour function, which will override
+    //                    the target function.
+    //   ppOriginal [out] A pointer to the trampoline function, which will be
+    //                    used to call the original target function.
+    //                    This parameter can be NULL.
+    MH_STATUS WINAPI MH_CreateHookApi(
+        LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal);
+
+    // Creates a Hook for the specified API function, in disabled state.
+    // Parameters:
+    //   pszModule  [in]  A pointer to the loaded module name which contains the
+    //                    target function.
+    //   pszTarget  [in]  A pointer to the target function name, which will be
+    //                    overridden by the detour function.
+    //   pDetour    [in]  A pointer to the detour function, which will override
+    //                    the target function.
+    //   ppOriginal [out] A pointer to the trampoline function, which will be
+    //                    used to call the original target function.
+    //                    This parameter can be NULL.
+    //   ppTarget   [out] A pointer to the target function, which will be used
+    //                    with other functions.
+    //                    This parameter can be NULL.
+    MH_STATUS WINAPI MH_CreateHookApiEx(
+        LPCWSTR pszModule, LPCSTR pszProcName, LPVOID pDetour, LPVOID *ppOriginal, LPVOID *ppTarget);
+
+    // Removes an already created hook.
+    // Parameters:
+    //   pTarget [in] A pointer to the target function.
+    MH_STATUS WINAPI MH_RemoveHook(LPVOID pTarget);
+
+    // Enables an already created hook.
+    // Parameters:
+    //   pTarget [in] A pointer to the target function.
+    //                If this parameter is MH_ALL_HOOKS, all created hooks are
+    //                enabled in one go.
+    MH_STATUS WINAPI MH_EnableHook(LPVOID pTarget);
+
+    // Disables an already created hook.
+    // Parameters:
+    //   pTarget [in] A pointer to the target function.
+    //                If this parameter is MH_ALL_HOOKS, all created hooks are
+    //                disabled in one go.
+    MH_STATUS WINAPI MH_DisableHook(LPVOID pTarget);
+
+    // Queues to enable an already created hook.
+    // Parameters:
+    //   pTarget [in] A pointer to the target function.
+    //                If this parameter is MH_ALL_HOOKS, all created hooks are
+    //                queued to be enabled.
+    MH_STATUS WINAPI MH_QueueEnableHook(LPVOID pTarget);
+
+    // Queues to disable an already created hook.
+    // Parameters:
+    //   pTarget [in] A pointer to the target function.
+    //                If this parameter is MH_ALL_HOOKS, all created hooks are
+    //                queued to be disabled.
+    MH_STATUS WINAPI MH_QueueDisableHook(LPVOID pTarget);
+
+    // Applies all queued changes in one go.
+    MH_STATUS WINAPI MH_ApplyQueued(VOID);
+
+    // Translates the MH_STATUS to its name as a string.
+    const char * WINAPI MH_StatusToString(MH_STATUS status);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/loader_wsock32_proxy/include/MinHook.x64.lib b/loader_wsock32_proxy/include/MinHook.x64.lib
new file mode 100644
index 00000000..213df08f
--- /dev/null
+++ b/loader_wsock32_proxy/include/MinHook.x64.lib
diff --git a/loader_wsock32_proxy/loader.cpp b/loader_wsock32_proxy/loader.cpp
index 61b4daf3..5f21a655 100644
--- a/loader_wsock32_proxy/loader.cpp
+++ b/loader_wsock32_proxy/loader.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "loader.h"
-#include "../NorthstarDedicatedTest/hookutils.h"
+#include "../NorthstarDLL/hookutils.h"
 #include <string>
 #include <system_error>
 #include <sstream>
diff --git a/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj b/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj
index 9866d368..d72ec9e4 100644
--- a/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj
+++ b/loader_wsock32_proxy/loader_wsock32_proxy.vcxproj
@@ -68,7 +68,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <ModuleDefinitionFile>wsock32.def</ModuleDefinitionFile>
-      <AdditionalDependencies>..\NorthstarDedicatedTest\include\MinHook.x64.lib;mswsock.lib;ws2_32.lib;Shlwapi.lib;imagehlp.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\include\MinHook.x64.lib;mswsock.lib;ws2_32.lib;Shlwapi.lib;imagehlp.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -91,7 +91,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <ModuleDefinitionFile>wsock32.def</ModuleDefinitionFile>
-      <AdditionalDependencies>..\NorthstarDedicatedTest\include\MinHook.x64.lib;mswsock.lib;ws2_32.lib;Shlwapi.lib;imagehlp.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;wsock32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>.\include\MinHook.x64.lib;mswsock.lib;ws2_32.lib;Shlwapi.lib;imagehlp.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;wsock32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>