diff --git a/kerep.vcxproj b/kerep.vcxproj
index 0953edf..cd2ba68 100644
--- a/kerep.vcxproj
+++ b/kerep.vcxproj
@@ -19,7 +19,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Autoarr2\Autoarr2_instances.cpp" />
     <ClCompile Include="src\Autoarr\Autoarr.c" />
     <ClCompile Include="src\Autoarr\Autoarr_KVPair_exported.c" />
     <ClCompile Include="src\Autoarr\Autoarr_Unitype_exported.c" />
@@ -30,7 +29,7 @@
     <ClCompile Include="src\DtsodParser\DtsodV24_deserialize.c" />
     <ClCompile Include="src\DtsodParser\DtsodV24_exported.c" />
     <ClCompile Include="src\DtsodParser\DtsodV24_serialize.c" />
-    <ClCompile Include="src\Hashtable\hash.c" />
+    <ClCompile Include="src\HashFunctions\hash.c" />
     <ClCompile Include="src\Hashtable\Hashtable.c" />
     <ClCompile Include="src\Hashtable\KeyValuePair.c" />
     <ClCompile Include="src\Network\knSocket.c" />
@@ -42,6 +41,8 @@
     <ClCompile Include="tests\test_autoarr2.cpp" />
     <ClCompile Include="tests\test_dtsod.c" />
     <ClCompile Include="tests\test_hashtable.c" />
+    <ClCompile Include="tests\test_hashtable2.cpp" />
+    <ClCompile Include="tests\test_hash_functions.c" />
     <ClCompile Include="tests\test_marshalling.c" />
     <ClCompile Include="tests\test_safethrow.c" />
     <ClCompile Include="tests\test_searchtree.c" />
@@ -49,7 +50,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Autoarr2\Autoarr2.hpp" />
-    <ClInclude Include="src\Autoarr2\Autoarr2_methods.hpp" />
     <ClInclude Include="src\Autoarr\Autoarr.h" />
     <ClInclude Include="src\Autoarr\Autoarr_declare.h" />
     <ClInclude Include="src\Autoarr\Autoarr_define.h" />
@@ -60,9 +60,8 @@
     <ClInclude Include="src\base\std.h" />
     <ClInclude Include="src\base\types.h" />
     <ClInclude Include="src\DtsodParser\DtsodV24.h" />
+    <ClInclude Include="src\HashFunctions\hash.h" />
     <ClInclude Include="src\Hashtable2\Hashtable2.hpp" />
-    <ClInclude Include="src\Hashtable2\Hashtable2_methods.hpp" />
-    <ClInclude Include="src\Hashtable\hash.h" />
     <ClInclude Include="src\Hashtable\Hashtable.h" />
     <ClInclude Include="src\Hashtable\KeyValuePair.h" />
     <ClInclude Include="src\Network\network.h" />
@@ -165,7 +164,7 @@
       <PrecompiledHeaderOutputFile />
       <AdditionalOptions>/Zc:twoPhase- /MP %(AdditionalOptions)</AdditionalOptions>
       <CompileAs>Default</CompileAs>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <DebugInformationFormat>None</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
     </ClCompile>
@@ -192,7 +191,7 @@
       <AdditionalOptions>/Zc:twoPhase- /MP %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <CompileAs>Default</CompileAs>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <DebugInformationFormat>None</DebugInformationFormat>
     </ClCompile>
     <Link>
@@ -217,7 +216,7 @@
       <PrecompiledHeaderOutputFile />
       <AdditionalOptions>/Zc:twoPhase- /MP %(AdditionalOptions)</AdditionalOptions>
       <CompileAs>Default</CompileAs>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <DebugInformationFormat>None</DebugInformationFormat>
     </ClCompile>
     <Link>
@@ -237,13 +236,13 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <PrecompiledHeaderOutputFile />
       <AdditionalOptions>/Zc:twoPhase- /MP %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <CompileAs>Default</CompileAs>
-      <LanguageStandard>Default</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <DebugInformationFormat>None</DebugInformationFormat>
     </ClCompile>
     <Link>