diff --git a/src/ZoneLoading/ZoneLoading.vcxproj b/src/ZoneLoading/ZoneLoading.vcxproj
index ecd93d35..a58e38bc 100644
--- a/src/ZoneLoading/ZoneLoading.vcxproj
+++ b/src/ZoneLoading/ZoneLoading.vcxproj
@@ -211,10 +211,10 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)gen\addonmapents\addonmapents_load_db.h;%(RelativeDir)gen\addonmapents\addonmapents_load_db.cpp;%(RelativeDir)gen\clipmap_t\clipmap_t_load_db.h;%(RelativeDir)gen\clipmap_t\clipmap_t_load_db.cpp;%(RelativeDir)gen\comworld\comworld_load_db.h;%(RelativeDir)gen\comworld\comworld_load_db.cpp;%(RelativeDir)gen\ddlroot_t\ddlroot_t_load_db.h;%(RelativeDir)gen\ddlroot_t\ddlroot_t_load_db.cpp;%(RelativeDir)gen\destructibledef\destructibledef_load_db.h;%(RelativeDir)gen\destructibledef\destructibledef_load_db.cpp;%(RelativeDir)gen\emblemset\emblemset_load_db.h;%(RelativeDir)gen\emblemset\emblemset_load_db.cpp;%(RelativeDir)gen\font_s\font_s_load_db.h;%(RelativeDir)gen\font_s\font_s_load_db.cpp;%(RelativeDir)gen\fonticon\fonticon_load_db.h;%(RelativeDir)gen\fonticon\fonticon_load_db.cpp;%(RelativeDir)gen\footstepfxtabledef\footstepfxtabledef_load_db.h;%(RelativeDir)gen\footstepfxtabledef\footstepfxtabledef_load_db.cpp;%(RelativeDir)gen\footsteptabledef\footsteptabledef_load_db.h;%(RelativeDir)gen\footsteptabledef\footsteptabledef_load_db.cpp;%(RelativeDir)gen\fxeffectdef\fxeffectdef_load_db.h;%(RelativeDir)gen\fxeffectdef\fxeffectdef_load_db.cpp;%(RelativeDir)gen\fximpacttable\fximpacttable_load_db.h;%(RelativeDir)gen\fximpacttable\fximpacttable_load_db.cpp;%(RelativeDir)gen\gameworldmp\gameworldmp_load_db.h;%(RelativeDir)gen\gameworldmp\gameworldmp_load_db.cpp;%(RelativeDir)gen\gameworldsp\gameworldsp_load_db.h;%(RelativeDir)gen\gameworldsp\gameworldsp_load_db.cpp;%(RelativeDir)gen\gfximage\gfximage_load_db.h;%(RelativeDir)gen\gfximage\gfximage_load_db.cpp;%(RelativeDir)gen\gfxlightdef\gfxlightdef_load_db.h;%(RelativeDir)gen\gfxlightdef\gfxlightdef_load_db.cpp;%(RelativeDir)gen\gfxworld\gfxworld_load_db.h;%(RelativeDir)gen\gfxworld\gfxworld_load_db.cpp;%(RelativeDir)gen\glasses\glasses_load_db.h;%(RelativeDir)gen\glasses\glasses_load_db.cpp;%(RelativeDir)gen\keyvaluepairs\keyvaluepairs_load_db.h;%(RelativeDir)gen\keyvaluepairs\keyvaluepairs_load_db.cpp;%(RelativeDir)gen\leaderboarddef\leaderboarddef_load_db.h;%(RelativeDir)gen\leaderboarddef\leaderboarddef_load_db.cpp;%(RelativeDir)gen\localizeentry\localizeentry_load_db.h;%(RelativeDir)gen\localizeentry\localizeentry_load_db.cpp;%(RelativeDir)gen\mapents\mapents_load_db.h;%(RelativeDir)gen\mapents\mapents_load_db.cpp;%(RelativeDir)gen\material\material_load_db.h;%(RelativeDir)gen\material\material_load_db.cpp;%(RelativeDir)gen\materialtechniqueset\materialtechniqueset_load_db.h;%(RelativeDir)gen\materialtechniqueset\materialtechniqueset_load_db.cpp;%(RelativeDir)gen\memoryblock\memoryblock_load_db.h;%(RelativeDir)gen\memoryblock\memoryblock_load_db.cpp;%(RelativeDir)gen\menudef_t\menudef_t_load_db.h;%(RelativeDir)gen\menudef_t\menudef_t_load_db.cpp;%(RelativeDir)gen\menulist\menulist_load_db.h;%(RelativeDir)gen\menulist\menulist_load_db.cpp;%(RelativeDir)gen\physconstraints\physconstraints_load_db.h;%(RelativeDir)gen\physconstraints\physconstraints_load_db.cpp;%(RelativeDir)gen\physpreset\physpreset_load_db.h;%(RelativeDir)gen\physpreset\physpreset_load_db.cpp;%(RelativeDir)gen\qdb\qdb_load_db.h;%(RelativeDir)gen\qdb\qdb_load_db.cpp;%(RelativeDir)gen\rawfile\rawfile_load_db.h;%(RelativeDir)gen\rawfile\rawfile_load_db.cpp;%(RelativeDir)gen\scriptparsetree\scriptparsetree_load_db.h;%(RelativeDir)gen\scriptparsetree\scriptparsetree_load_db.cpp;%(RelativeDir)gen\skinnedvertsdef\skinnedvertsdef_load_db.h;%(RelativeDir)gen\skinnedvertsdef\skinnedvertsdef_load_db.cpp;%(RelativeDir)gen\slug\slug_load_db.h;%(RelativeDir)gen\slug\slug_load_db.cpp;%(RelativeDir)gen\sndbank\sndbank_load_db.h;%(RelativeDir)gen\sndbank\sndbank_load_db.cpp;%(RelativeDir)gen\snddriverglobals\snddriverglobals_load_db.h;%(RelativeDir)gen\snddriverglobals\snddriverglobals_load_db.cpp;%(RelativeDir)gen\sndpatch\sndpatch_load_db.h;%(RelativeDir)gen\sndpatch\sndpatch_load_db.cpp;%(RelativeDir)gen\stringtable\stringtable_load_db.h;%(RelativeDir)gen\stringtable\stringtable_load_db.cpp;%(RelativeDir)gen\tracerdef\tracerdef_load_db.h;%(RelativeDir)gen\tracerdef\tracerdef_load_db.cpp;%(RelativeDir)gen\vehicledef\vehicledef_load_db.h;%(RelativeDir)gen\vehicledef\vehicledef_load_db.cpp;%(RelativeDir)gen\weaponattachment\weaponattachment_load_db.h;%(RelativeDir)gen\weaponattachment\weaponattachment_load_db.cpp;%(RelativeDir)gen\weaponattachmentunique\weaponattachmentunique_load_db.h;%(RelativeDir)gen\weaponattachmentunique\weaponattachmentunique_load_db.cpp;%(RelativeDir)gen\weaponcamo\weaponcamo_load_db.h;%(RelativeDir)gen\weaponcamo\weaponcamo_load_db.cpp;%(RelativeDir)gen\weaponvariantdef\weaponvariantdef_load_db.h;%(RelativeDir)gen\weaponvariantdef\weaponvariantdef_load_db.cpp;%(RelativeDir)gen\xanimparts\xanimparts_load_db.h;%(RelativeDir)gen\xanimparts\xanimparts_load_db.cpp;%(RelativeDir)gen\xglobals\xglobals_load_db.h;%(RelativeDir)gen\xglobals\xglobals_load_db.cpp;%(RelativeDir)gen\xmodel\xmodel_load_db.h;%(RelativeDir)gen\xmodel\xmodel_load_db.cpp;%(RelativeDir)gen\zbarrierdef\zbarrierdef_load_db.h;%(RelativeDir)gen\zbarrierdef\zbarrierdef_load_db.cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)gen\addonmapents\addonmapents_load_db.h;%(RelativeDir)gen\addonmapents\addonmapents_load_db.cpp;%(RelativeDir)gen\clipmap_t\clipmap_t_load_db.h;%(RelativeDir)gen\clipmap_t\clipmap_t_load_db.cpp;%(RelativeDir)gen\comworld\comworld_load_db.h;%(RelativeDir)gen\comworld\comworld_load_db.cpp;%(RelativeDir)gen\ddlroot_t\ddlroot_t_load_db.h;%(RelativeDir)gen\ddlroot_t\ddlroot_t_load_db.cpp;%(RelativeDir)gen\destructibledef\destructibledef_load_db.h;%(RelativeDir)gen\destructibledef\destructibledef_load_db.cpp;%(RelativeDir)gen\emblemset\emblemset_load_db.h;%(RelativeDir)gen\emblemset\emblemset_load_db.cpp;%(RelativeDir)gen\font_s\font_s_load_db.h;%(RelativeDir)gen\font_s\font_s_load_db.cpp;%(RelativeDir)gen\fonticon\fonticon_load_db.h;%(RelativeDir)gen\fonticon\fonticon_load_db.cpp;%(RelativeDir)gen\footstepfxtabledef\footstepfxtabledef_load_db.h;%(RelativeDir)gen\footstepfxtabledef\footstepfxtabledef_load_db.cpp;%(RelativeDir)gen\footsteptabledef\footsteptabledef_load_db.h;%(RelativeDir)gen\footsteptabledef\footsteptabledef_load_db.cpp;%(RelativeDir)gen\fxeffectdef\fxeffectdef_load_db.h;%(RelativeDir)gen\fxeffectdef\fxeffectdef_load_db.cpp;%(RelativeDir)gen\fximpacttable\fximpacttable_load_db.h;%(RelativeDir)gen\fximpacttable\fximpacttable_load_db.cpp;%(RelativeDir)gen\gameworldmp\gameworldmp_load_db.h;%(RelativeDir)gen\gameworldmp\gameworldmp_load_db.cpp;%(RelativeDir)gen\gameworldsp\gameworldsp_load_db.h;%(RelativeDir)gen\gameworldsp\gameworldsp_load_db.cpp;%(RelativeDir)gen\gfximage\gfximage_load_db.h;%(RelativeDir)gen\gfximage\gfximage_load_db.cpp;%(RelativeDir)gen\gfxlightdef\gfxlightdef_load_db.h;%(RelativeDir)gen\gfxlightdef\gfxlightdef_load_db.cpp;%(RelativeDir)gen\gfxworld\gfxworld_load_db.h;%(RelativeDir)gen\gfxworld\gfxworld_load_db.cpp;%(RelativeDir)gen\glasses\glasses_load_db.h;%(RelativeDir)gen\glasses\glasses_load_db.cpp;%(RelativeDir)gen\keyvaluepairs\keyvaluepairs_load_db.h;%(RelativeDir)gen\keyvaluepairs\keyvaluepairs_load_db.cpp;%(RelativeDir)gen\leaderboarddef\leaderboarddef_load_db.h;%(RelativeDir)gen\leaderboarddef\leaderboarddef_load_db.cpp;%(RelativeDir)gen\localizeentry\localizeentry_load_db.h;%(RelativeDir)gen\localizeentry\localizeentry_load_db.cpp;%(RelativeDir)gen\mapents\mapents_load_db.h;%(RelativeDir)gen\mapents\mapents_load_db.cpp;%(RelativeDir)gen\material\material_load_db.h;%(RelativeDir)gen\material\material_load_db.cpp;%(RelativeDir)gen\materialtechniqueset\materialtechniqueset_load_db.h;%(RelativeDir)gen\materialtechniqueset\materialtechniqueset_load_db.cpp;%(RelativeDir)gen\memoryblock\memoryblock_load_db.h;%(RelativeDir)gen\memoryblock\memoryblock_load_db.cpp;%(RelativeDir)gen\menudef_t\menudef_t_load_db.h;%(RelativeDir)gen\menudef_t\menudef_t_load_db.cpp;%(RelativeDir)gen\menulist\menulist_load_db.h;%(RelativeDir)gen\menulist\menulist_load_db.cpp;%(RelativeDir)gen\physconstraints\physconstraints_load_db.h;%(RelativeDir)gen\physconstraints\physconstraints_load_db.cpp;%(RelativeDir)gen\physpreset\physpreset_load_db.h;%(RelativeDir)gen\physpreset\physpreset_load_db.cpp;%(RelativeDir)gen\qdb\qdb_load_db.h;%(RelativeDir)gen\qdb\qdb_load_db.cpp;%(RelativeDir)gen\rawfile\rawfile_load_db.h;%(RelativeDir)gen\rawfile\rawfile_load_db.cpp;%(RelativeDir)gen\scriptparsetree\scriptparsetree_load_db.h;%(RelativeDir)gen\scriptparsetree\scriptparsetree_load_db.cpp;%(RelativeDir)gen\skinnedvertsdef\skinnedvertsdef_load_db.h;%(RelativeDir)gen\skinnedvertsdef\skinnedvertsdef_load_db.cpp;%(RelativeDir)gen\slug\slug_load_db.h;%(RelativeDir)gen\slug\slug_load_db.cpp;%(RelativeDir)gen\sndbank\sndbank_load_db.h;%(RelativeDir)gen\sndbank\sndbank_load_db.cpp;%(RelativeDir)gen\snddriverglobals\snddriverglobals_load_db.h;%(RelativeDir)gen\snddriverglobals\snddriverglobals_load_db.cpp;%(RelativeDir)gen\sndpatch\sndpatch_load_db.h;%(RelativeDir)gen\sndpatch\sndpatch_load_db.cpp;%(RelativeDir)gen\stringtable\stringtable_load_db.h;%(RelativeDir)gen\stringtable\stringtable_load_db.cpp;%(RelativeDir)gen\tracerdef\tracerdef_load_db.h;%(RelativeDir)gen\tracerdef\tracerdef_load_db.cpp;%(RelativeDir)gen\vehicledef\vehicledef_load_db.h;%(RelativeDir)gen\vehicledef\vehicledef_load_db.cpp;%(RelativeDir)gen\weaponattachment\weaponattachment_load_db.h;%(RelativeDir)gen\weaponattachment\weaponattachment_load_db.cpp;%(RelativeDir)gen\weaponattachmentunique\weaponattachmentunique_load_db.h;%(RelativeDir)gen\weaponattachmentunique\weaponattachmentunique_load_db.cpp;%(RelativeDir)gen\weaponcamo\weaponcamo_load_db.h;%(RelativeDir)gen\weaponcamo\weaponcamo_load_db.cpp;%(RelativeDir)gen\weaponvariantdef\weaponvariantdef_load_db.h;%(RelativeDir)gen\weaponvariantdef\weaponvariantdef_load_db.cpp;%(RelativeDir)gen\xanimparts\xanimparts_load_db.h;%(RelativeDir)gen\xanimparts\xanimparts_load_db.cpp;%(RelativeDir)gen\xglobals\xglobals_load_db.h;%(RelativeDir)gen\xglobals\xglobals_load_db.cpp;%(RelativeDir)gen\xmodel\xmodel_load_db.h;%(RelativeDir)gen\xmodel\xmodel_load_db.cpp;%(RelativeDir)gen\zbarrierdef\zbarrierdef_load_db.h;%(RelativeDir)gen\zbarrierdef\zbarrierdef_load_db.cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)gen\addonmapents\addonmapents_load_db.h;%(RelativeDir)gen\addonmapents\addonmapents_load_db.cpp;%(RelativeDir)gen\clipmap_t\clipmap_t_load_db.h;%(RelativeDir)gen\clipmap_t\clipmap_t_load_db.cpp;%(RelativeDir)gen\comworld\comworld_load_db.h;%(RelativeDir)gen\comworld\comworld_load_db.cpp;%(RelativeDir)gen\ddlroot_t\ddlroot_t_load_db.h;%(RelativeDir)gen\ddlroot_t\ddlroot_t_load_db.cpp;%(RelativeDir)gen\destructibledef\destructibledef_load_db.h;%(RelativeDir)gen\destructibledef\destructibledef_load_db.cpp;%(RelativeDir)gen\emblemset\emblemset_load_db.h;%(RelativeDir)gen\emblemset\emblemset_load_db.cpp;%(RelativeDir)gen\font_s\font_s_load_db.h;%(RelativeDir)gen\font_s\font_s_load_db.cpp;%(RelativeDir)gen\fonticon\fonticon_load_db.h;%(RelativeDir)gen\fonticon\fonticon_load_db.cpp;%(RelativeDir)gen\footstepfxtabledef\footstepfxtabledef_load_db.h;%(RelativeDir)gen\footstepfxtabledef\footstepfxtabledef_load_db.cpp;%(RelativeDir)gen\footsteptabledef\footsteptabledef_load_db.h;%(RelativeDir)gen\footsteptabledef\footsteptabledef_load_db.cpp;%(RelativeDir)gen\fxeffectdef\fxeffectdef_load_db.h;%(RelativeDir)gen\fxeffectdef\fxeffectdef_load_db.cpp;%(RelativeDir)gen\fximpacttable\fximpacttable_load_db.h;%(RelativeDir)gen\fximpacttable\fximpacttable_load_db.cpp;%(RelativeDir)gen\gameworldmp\gameworldmp_load_db.h;%(RelativeDir)gen\gameworldmp\gameworldmp_load_db.cpp;%(RelativeDir)gen\gameworldsp\gameworldsp_load_db.h;%(RelativeDir)gen\gameworldsp\gameworldsp_load_db.cpp;%(RelativeDir)gen\gfximage\gfximage_load_db.h;%(RelativeDir)gen\gfximage\gfximage_load_db.cpp;%(RelativeDir)gen\gfxlightdef\gfxlightdef_load_db.h;%(RelativeDir)gen\gfxlightdef\gfxlightdef_load_db.cpp;%(RelativeDir)gen\gfxworld\gfxworld_load_db.h;%(RelativeDir)gen\gfxworld\gfxworld_load_db.cpp;%(RelativeDir)gen\glasses\glasses_load_db.h;%(RelativeDir)gen\glasses\glasses_load_db.cpp;%(RelativeDir)gen\keyvaluepairs\keyvaluepairs_load_db.h;%(RelativeDir)gen\keyvaluepairs\keyvaluepairs_load_db.cpp;%(RelativeDir)gen\leaderboarddef\leaderboarddef_load_db.h;%(RelativeDir)gen\leaderboarddef\leaderboarddef_load_db.cpp;%(RelativeDir)gen\localizeentry\localizeentry_load_db.h;%(RelativeDir)gen\localizeentry\localizeentry_load_db.cpp;%(RelativeDir)gen\mapents\mapents_load_db.h;%(RelativeDir)gen\mapents\mapents_load_db.cpp;%(RelativeDir)gen\material\material_load_db.h;%(RelativeDir)gen\material\material_load_db.cpp;%(RelativeDir)gen\materialtechniqueset\materialtechniqueset_load_db.h;%(RelativeDir)gen\materialtechniqueset\materialtechniqueset_load_db.cpp;%(RelativeDir)gen\memoryblock\memoryblock_load_db.h;%(RelativeDir)gen\memoryblock\memoryblock_load_db.cpp;%(RelativeDir)gen\menudef_t\menudef_t_load_db.h;%(RelativeDir)gen\menudef_t\menudef_t_load_db.cpp;%(RelativeDir)gen\menulist\menulist_load_db.h;%(RelativeDir)gen\menulist\menulist_load_db.cpp;%(RelativeDir)gen\physconstraints\physconstraints_load_db.h;%(RelativeDir)gen\physconstraints\physconstraints_load_db.cpp;%(RelativeDir)gen\physpreset\physpreset_load_db.h;%(RelativeDir)gen\physpreset\physpreset_load_db.cpp;%(RelativeDir)gen\qdb\qdb_load_db.h;%(RelativeDir)gen\qdb\qdb_load_db.cpp;%(RelativeDir)gen\rawfile\rawfile_load_db.h;%(RelativeDir)gen\rawfile\rawfile_load_db.cpp;%(RelativeDir)gen\scriptparsetree\scriptparsetree_load_db.h;%(RelativeDir)gen\scriptparsetree\scriptparsetree_load_db.cpp;%(RelativeDir)gen\skinnedvertsdef\skinnedvertsdef_load_db.h;%(RelativeDir)gen\skinnedvertsdef\skinnedvertsdef_load_db.cpp;%(RelativeDir)gen\slug\slug_load_db.h;%(RelativeDir)gen\slug\slug_load_db.cpp;%(RelativeDir)gen\sndbank\sndbank_load_db.h;%(RelativeDir)gen\sndbank\sndbank_load_db.cpp;%(RelativeDir)gen\snddriverglobals\snddriverglobals_load_db.h;%(RelativeDir)gen\snddriverglobals\snddriverglobals_load_db.cpp;%(RelativeDir)gen\sndpatch\sndpatch_load_db.h;%(RelativeDir)gen\sndpatch\sndpatch_load_db.cpp;%(RelativeDir)gen\stringtable\stringtable_load_db.h;%(RelativeDir)gen\stringtable\stringtable_load_db.cpp;%(RelativeDir)gen\tracerdef\tracerdef_load_db.h;%(RelativeDir)gen\tracerdef\tracerdef_load_db.cpp;%(RelativeDir)gen\vehicledef\vehicledef_load_db.h;%(RelativeDir)gen\vehicledef\vehicledef_load_db.cpp;%(RelativeDir)gen\weaponattachment\weaponattachment_load_db.h;%(RelativeDir)gen\weaponattachment\weaponattachment_load_db.cpp;%(RelativeDir)gen\weaponattachmentunique\weaponattachmentunique_load_db.h;%(RelativeDir)gen\weaponattachmentunique\weaponattachmentunique_load_db.cpp;%(RelativeDir)gen\weaponcamo\weaponcamo_load_db.h;%(RelativeDir)gen\weaponcamo\weaponcamo_load_db.cpp;%(RelativeDir)gen\weaponvariantdef\weaponvariantdef_load_db.h;%(RelativeDir)gen\weaponvariantdef\weaponvariantdef_load_db.cpp;%(RelativeDir)gen\xanimparts\xanimparts_load_db.h;%(RelativeDir)gen\xanimparts\xanimparts_load_db.cpp;%(RelativeDir)gen\xglobals\xglobals_load_db.h;%(RelativeDir)gen\xglobals\xglobals_load_db.cpp;%(RelativeDir)gen\xmodel\xmodel_load_db.h;%(RelativeDir)gen\xmodel\xmodel_load_db.cpp;%(RelativeDir)gen\zbarrierdef\zbarrierdef_load_db.h;%(RelativeDir)gen\zbarrierdef\zbarrierdef_load_db.cpp;%(Outputs)</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
     </CustomBuild>
   </ItemGroup>
   <PropertyGroup Label="Globals">
diff --git a/test/ZoneCommonTests/ZoneCommonTests.vcxproj b/test/ZoneCommonTests/ZoneCommonTests.vcxproj
index bfa827ca..94679d1a 100644
--- a/test/ZoneCommonTests/ZoneCommonTests.vcxproj
+++ b/test/ZoneCommonTests/ZoneCommonTests.vcxproj
@@ -77,22 +77,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests</OutDir>
+    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests\</OutDir>
     <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)_$(Platform)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests</OutDir>
+    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests\</OutDir>
     <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)_$(Platform)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests</OutDir>
+    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests\</OutDir>
     <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)_$(Platform)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests</OutDir>
+    <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\tests\</OutDir>
     <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)_$(Platform)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -220,14 +220,14 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe" -h "$(SolutionDir)src\ZoneCode\T6\T6.h" -e "$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt" -o "%(RelativeDir)gen" -g "*" "AssetStructTests"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe" -h "$(SolutionDir)src\ZoneCode\T6\T6.h" -e "$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt" -o "%(RelativeDir)gen" -g "*" "AssetStructTests"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe" -h "$(SolutionDir)src\ZoneCode\T6\T6.h" -e "$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt" -o "%(RelativeDir)gen" -g "*" "AssetStructTests"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(Outputs)</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)src\ZoneCodeGenerator\bin\$(Configuration)\ZoneCodeGenerator.exe;$(SolutionDir)src\ZoneCode\T6\T6.h;$(SolutionDir)src\ZoneCommon\Game\T6\T6_Assets.h;$(SolutionDir)src\ZoneCode\Common.h;$(SolutionDir)src\ZoneCode\T6\T6_Commands.txt;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(RelativeDir)gen\clipmap_t_struct_test.cpp;%(RelativeDir)gen\comworld_struct_test.cpp;%(RelativeDir)gen\ddlroot_t_struct_test.cpp;%(RelativeDir)gen\destructibledef_struct_test.cpp;%(RelativeDir)gen\emblemset_struct_test.cpp;%(RelativeDir)gen\font_s_struct_test.cpp;%(RelativeDir)gen\fonticon_struct_test.cpp;%(RelativeDir)gen\footstepfxtabledef_struct_test.cpp;%(RelativeDir)gen\footsteptabledef_struct_test.cpp;%(RelativeDir)gen\fxeffectdef_struct_test.cpp;%(RelativeDir)gen\fximpacttable_struct_test.cpp;%(RelativeDir)gen\gameworldmp_struct_test.cpp;%(RelativeDir)gen\gameworldsp_struct_test.cpp;%(RelativeDir)gen\gfximage_struct_test.cpp;%(RelativeDir)gen\gfxlightdef_struct_test.cpp;%(RelativeDir)gen\gfxworld_struct_test.cpp;%(RelativeDir)gen\glasses_struct_test.cpp;%(RelativeDir)gen\keyvaluepairs_struct_test.cpp;%(RelativeDir)gen\leaderboarddef_struct_test.cpp;%(RelativeDir)gen\localizeentry_struct_test.cpp;%(RelativeDir)gen\mapents_struct_test.cpp;%(RelativeDir)gen\material_struct_test.cpp;%(RelativeDir)gen\materialtechniqueset_struct_test.cpp;%(RelativeDir)gen\memoryblock_struct_test.cpp;%(RelativeDir)gen\menudef_t_struct_test.cpp;%(RelativeDir)gen\menulist_struct_test.cpp;%(RelativeDir)gen\physconstraints_struct_test.cpp;%(RelativeDir)gen\physpreset_struct_test.cpp;%(RelativeDir)gen\qdb_struct_test.cpp;%(RelativeDir)gen\rawfile_struct_test.cpp;%(RelativeDir)gen\scriptparsetree_struct_test.cpp;%(RelativeDir)gen\skinnedvertsdef_struct_test.cpp;%(RelativeDir)gen\slug_struct_test.cpp;%(RelativeDir)gen\sndbank_struct_test.cpp;%(RelativeDir)gen\snddriverglobals_struct_test.cpp;%(RelativeDir)gen\sndpatch_struct_test.cpp;%(RelativeDir)gen\stringtable_struct_test.cpp;%(RelativeDir)gen\tracerdef_struct_test.cpp;%(RelativeDir)gen\vehicledef_struct_test.cpp;%(RelativeDir)gen\weaponattachment_struct_test.cpp;%(RelativeDir)gen\weaponattachmentunique_struct_test.cpp;%(RelativeDir)gen\weaponcamo_struct_test.cpp;%(RelativeDir)gen\weaponvariantdef_struct_test.cpp;%(RelativeDir)gen\xanimparts_struct_test.cpp;%(RelativeDir)gen\xglobals_struct_test.cpp;%(RelativeDir)gen\xmodel_struct_test.cpp;%(RelativeDir)gen\zbarrierdef_struct_test.cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(RelativeDir)gen\clipmap_t_struct_test.cpp;%(RelativeDir)gen\comworld_struct_test.cpp;%(RelativeDir)gen\ddlroot_t_struct_test.cpp;%(RelativeDir)gen\destructibledef_struct_test.cpp;%(RelativeDir)gen\emblemset_struct_test.cpp;%(RelativeDir)gen\font_s_struct_test.cpp;%(RelativeDir)gen\fonticon_struct_test.cpp;%(RelativeDir)gen\footstepfxtabledef_struct_test.cpp;%(RelativeDir)gen\footsteptabledef_struct_test.cpp;%(RelativeDir)gen\fxeffectdef_struct_test.cpp;%(RelativeDir)gen\fximpacttable_struct_test.cpp;%(RelativeDir)gen\gameworldmp_struct_test.cpp;%(RelativeDir)gen\gameworldsp_struct_test.cpp;%(RelativeDir)gen\gfximage_struct_test.cpp;%(RelativeDir)gen\gfxlightdef_struct_test.cpp;%(RelativeDir)gen\gfxworld_struct_test.cpp;%(RelativeDir)gen\glasses_struct_test.cpp;%(RelativeDir)gen\keyvaluepairs_struct_test.cpp;%(RelativeDir)gen\leaderboarddef_struct_test.cpp;%(RelativeDir)gen\localizeentry_struct_test.cpp;%(RelativeDir)gen\mapents_struct_test.cpp;%(RelativeDir)gen\material_struct_test.cpp;%(RelativeDir)gen\materialtechniqueset_struct_test.cpp;%(RelativeDir)gen\memoryblock_struct_test.cpp;%(RelativeDir)gen\menudef_t_struct_test.cpp;%(RelativeDir)gen\menulist_struct_test.cpp;%(RelativeDir)gen\physconstraints_struct_test.cpp;%(RelativeDir)gen\physpreset_struct_test.cpp;%(RelativeDir)gen\qdb_struct_test.cpp;%(RelativeDir)gen\rawfile_struct_test.cpp;%(RelativeDir)gen\scriptparsetree_struct_test.cpp;%(RelativeDir)gen\skinnedvertsdef_struct_test.cpp;%(RelativeDir)gen\slug_struct_test.cpp;%(RelativeDir)gen\sndbank_struct_test.cpp;%(RelativeDir)gen\snddriverglobals_struct_test.cpp;%(RelativeDir)gen\sndpatch_struct_test.cpp;%(RelativeDir)gen\stringtable_struct_test.cpp;%(RelativeDir)gen\tracerdef_struct_test.cpp;%(RelativeDir)gen\vehicledef_struct_test.cpp;%(RelativeDir)gen\weaponattachment_struct_test.cpp;%(RelativeDir)gen\weaponattachmentunique_struct_test.cpp;%(RelativeDir)gen\weaponcamo_struct_test.cpp;%(RelativeDir)gen\weaponvariantdef_struct_test.cpp;%(RelativeDir)gen\xanimparts_struct_test.cpp;%(RelativeDir)gen\xglobals_struct_test.cpp;%(RelativeDir)gen\xmodel_struct_test.cpp;%(RelativeDir)gen\zbarrierdef_struct_test.cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(RelativeDir)gen\clipmap_t_struct_test.cpp;%(RelativeDir)gen\comworld_struct_test.cpp;%(RelativeDir)gen\ddlroot_t_struct_test.cpp;%(RelativeDir)gen\destructibledef_struct_test.cpp;%(RelativeDir)gen\emblemset_struct_test.cpp;%(RelativeDir)gen\font_s_struct_test.cpp;%(RelativeDir)gen\fonticon_struct_test.cpp;%(RelativeDir)gen\footstepfxtabledef_struct_test.cpp;%(RelativeDir)gen\footsteptabledef_struct_test.cpp;%(RelativeDir)gen\fxeffectdef_struct_test.cpp;%(RelativeDir)gen\fximpacttable_struct_test.cpp;%(RelativeDir)gen\gameworldmp_struct_test.cpp;%(RelativeDir)gen\gameworldsp_struct_test.cpp;%(RelativeDir)gen\gfximage_struct_test.cpp;%(RelativeDir)gen\gfxlightdef_struct_test.cpp;%(RelativeDir)gen\gfxworld_struct_test.cpp;%(RelativeDir)gen\glasses_struct_test.cpp;%(RelativeDir)gen\keyvaluepairs_struct_test.cpp;%(RelativeDir)gen\leaderboarddef_struct_test.cpp;%(RelativeDir)gen\localizeentry_struct_test.cpp;%(RelativeDir)gen\mapents_struct_test.cpp;%(RelativeDir)gen\material_struct_test.cpp;%(RelativeDir)gen\materialtechniqueset_struct_test.cpp;%(RelativeDir)gen\memoryblock_struct_test.cpp;%(RelativeDir)gen\menudef_t_struct_test.cpp;%(RelativeDir)gen\menulist_struct_test.cpp;%(RelativeDir)gen\physconstraints_struct_test.cpp;%(RelativeDir)gen\physpreset_struct_test.cpp;%(RelativeDir)gen\qdb_struct_test.cpp;%(RelativeDir)gen\rawfile_struct_test.cpp;%(RelativeDir)gen\scriptparsetree_struct_test.cpp;%(RelativeDir)gen\skinnedvertsdef_struct_test.cpp;%(RelativeDir)gen\slug_struct_test.cpp;%(RelativeDir)gen\sndbank_struct_test.cpp;%(RelativeDir)gen\snddriverglobals_struct_test.cpp;%(RelativeDir)gen\sndpatch_struct_test.cpp;%(RelativeDir)gen\stringtable_struct_test.cpp;%(RelativeDir)gen\tracerdef_struct_test.cpp;%(RelativeDir)gen\vehicledef_struct_test.cpp;%(RelativeDir)gen\weaponattachment_struct_test.cpp;%(RelativeDir)gen\weaponattachmentunique_struct_test.cpp;%(RelativeDir)gen\weaponcamo_struct_test.cpp;%(RelativeDir)gen\weaponvariantdef_struct_test.cpp;%(RelativeDir)gen\xanimparts_struct_test.cpp;%(RelativeDir)gen\xglobals_struct_test.cpp;%(RelativeDir)gen\xmodel_struct_test.cpp;%(RelativeDir)gen\zbarrierdef_struct_test.cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)gen\addonmapents_struct_test.cpp;%(RelativeDir)gen\clipmap_t_struct_test.cpp;%(RelativeDir)gen\comworld_struct_test.cpp;%(RelativeDir)gen\ddlroot_t_struct_test.cpp;%(RelativeDir)gen\destructibledef_struct_test.cpp;%(RelativeDir)gen\emblemset_struct_test.cpp;%(RelativeDir)gen\font_s_struct_test.cpp;%(RelativeDir)gen\fonticon_struct_test.cpp;%(RelativeDir)gen\footstepfxtabledef_struct_test.cpp;%(RelativeDir)gen\footsteptabledef_struct_test.cpp;%(RelativeDir)gen\fxeffectdef_struct_test.cpp;%(RelativeDir)gen\fximpacttable_struct_test.cpp;%(RelativeDir)gen\gameworldmp_struct_test.cpp;%(RelativeDir)gen\gameworldsp_struct_test.cpp;%(RelativeDir)gen\gfximage_struct_test.cpp;%(RelativeDir)gen\gfxlightdef_struct_test.cpp;%(RelativeDir)gen\gfxworld_struct_test.cpp;%(RelativeDir)gen\glasses_struct_test.cpp;%(RelativeDir)gen\keyvaluepairs_struct_test.cpp;%(RelativeDir)gen\leaderboarddef_struct_test.cpp;%(RelativeDir)gen\localizeentry_struct_test.cpp;%(RelativeDir)gen\mapents_struct_test.cpp;%(RelativeDir)gen\material_struct_test.cpp;%(RelativeDir)gen\materialtechniqueset_struct_test.cpp;%(RelativeDir)gen\memoryblock_struct_test.cpp;%(RelativeDir)gen\menudef_t_struct_test.cpp;%(RelativeDir)gen\menulist_struct_test.cpp;%(RelativeDir)gen\physconstraints_struct_test.cpp;%(RelativeDir)gen\physpreset_struct_test.cpp;%(RelativeDir)gen\qdb_struct_test.cpp;%(RelativeDir)gen\rawfile_struct_test.cpp;%(RelativeDir)gen\scriptparsetree_struct_test.cpp;%(RelativeDir)gen\skinnedvertsdef_struct_test.cpp;%(RelativeDir)gen\slug_struct_test.cpp;%(RelativeDir)gen\sndbank_struct_test.cpp;%(RelativeDir)gen\snddriverglobals_struct_test.cpp;%(RelativeDir)gen\sndpatch_struct_test.cpp;%(RelativeDir)gen\stringtable_struct_test.cpp;%(RelativeDir)gen\tracerdef_struct_test.cpp;%(RelativeDir)gen\vehicledef_struct_test.cpp;%(RelativeDir)gen\weaponattachment_struct_test.cpp;%(RelativeDir)gen\weaponattachmentunique_struct_test.cpp;%(RelativeDir)gen\weaponcamo_struct_test.cpp;%(RelativeDir)gen\weaponvariantdef_struct_test.cpp;%(RelativeDir)gen\xanimparts_struct_test.cpp;%(RelativeDir)gen\xglobals_struct_test.cpp;%(RelativeDir)gen\xmodel_struct_test.cpp;%(RelativeDir)gen\zbarrierdef_struct_test.cpp;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />