diff --git a/Console/Console_VS2008.vcproj b/Console/Console_VS2008.vcproj
index 119b24a8..2f85e330 100644
--- a/Console/Console_VS2008.vcproj
+++ b/Console/Console_VS2008.vcproj
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Console_VS2008"
-	ProjectGUID="{F962CFA1-2215-4124-938F-253973A27591}"
+	Version="9,00"
+	Name="Console"
+	ProjectGUID="{5E47B66B-6071-422C-B8CA-AF0689825767}"
 	RootNamespace="Console"
-	TargetFrameworkVersion="131072"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -17,12 +17,10 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -39,42 +37,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/Console.tlb"
-				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Debug/Console.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				RuntimeLibrary="3"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1050"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -91,8 +69,6 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/Console.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -103,13 +79,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_VS2008.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			InheritedPropertySheets="..\ja2_VS2008.vsprops"
 			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -125,40 +100,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/Console.tlb"
-				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\src\mfc&quot;;..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
-				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Release/Console.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1050"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -175,26 +132,22 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/Console.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
 			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -210,40 +163,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/Console.tlb"
-				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\src\mfc&quot;;..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
-				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Release/Console.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1050"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -260,25 +195,20 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/Console.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
+			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -295,42 +225,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/Console.tlb"
-				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Debug/Console.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				RuntimeLibrary="3"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1050"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -347,8 +257,6 @@
 			/>
 			<Tool
 				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/Console.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -357,409 +265,36 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/Console.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Debug/Console.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1050"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="comctl32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/Console.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_VS2008.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/Console.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\src\mfc&quot;;..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough="stdafx.h"
-				PrecompiledHeaderFile=".\Release/Console.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1050"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="comctl32.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/Console.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
 				RelativePath="Console.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditor|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditorD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseDebug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseRelease|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Cursors.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditor|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditorD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseDebug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseRelease|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="Dialogs.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditor|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditorD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseDebug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseRelease|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="FileStream.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditor|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditorD|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseDebug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseRelease|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
 				RelativePath="ComBSTROut.h"
@@ -788,10 +323,11 @@
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="Console.ico"
+				RelativePath="console.ico"
 				>
 			</File>
 		</Filter>
diff --git a/Editor/Editor_VS2008.vcproj b/Editor/Editor_VS2008.vcproj
index cf5c7662..e7216420 100644
--- a/Editor/Editor_VS2008.vcproj
+++ b/Editor/Editor_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="Editor_VS2008"
-	ProjectGUID="{60D793F2-90B4-43C9-83B5-221EE11B37E6}"
-	RootNamespace="Editor_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="Editor"
+	ProjectGUID="{B19F93C9-F829-4230-A805-6D809CF112F9}"
+	RootNamespace="Editor"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,145 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,223 +265,219 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Button Defines.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Cursor Modes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\edit_sys.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Editor All.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Editor Callback Prototypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Editor Modes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Editor Taskbar Creation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Editor Taskbar Utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Editor Undo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\EditorBuildings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\EditorDefines.h"
-				>
-			</File>
-			<File
-				RelativePath=".\EditorItems.h"
-				>
-			</File>
-			<File
-				RelativePath=".\EditorMapInfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\EditorMercs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\EditorTerrain.h"
-				>
-			</File>
-			<File
-				RelativePath=".\editscreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Item Statistics.h"
-				>
-			</File>
-			<File
-				RelativePath=".\LoadScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\messagebox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\newsmooth.h"
-				>
-			</File>
-			<File
-				RelativePath=".\popupmenu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Road Smoothing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Sector Summary.h"
-				>
-			</File>
-			<File
-				RelativePath=".\selectwin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SmartMethod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\smooth.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Smoothing Utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Summary Info.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\Cursor Modes.cpp"
+				RelativePath="Cursor Modes.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\edit_sys.cpp"
+				RelativePath="edit_sys.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Editor Callbacks.cpp"
+				RelativePath="Editor Callbacks.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Editor Modes.cpp"
+				RelativePath="Editor Modes.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Editor Taskbar Creation.cpp"
+				RelativePath="Editor Taskbar Creation.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Editor Taskbar Utils.cpp"
+				RelativePath="Editor Taskbar Utils.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Editor Undo.cpp"
+				RelativePath="Editor Undo.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\EditorBuildings.cpp"
+				RelativePath="EditorBuildings.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\EditorItems.cpp"
+				RelativePath="EditorItems.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\EditorMapInfo.cpp"
+				RelativePath="EditorMapInfo.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\EditorMercs.cpp"
+				RelativePath="EditorMercs.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\EditorTerrain.cpp"
+				RelativePath="EditorTerrain.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\editscreen.cpp"
+				RelativePath="editscreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Item Statistics.cpp"
+				RelativePath="Item Statistics.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\LoadScreen.cpp"
+				RelativePath="LoadScreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\messagebox.cpp"
+				RelativePath="messagebox.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\newsmooth.cpp"
+				RelativePath="newsmooth.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\popupmenu.cpp"
+				RelativePath="popupmenu.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Road Smoothing.cpp"
+				RelativePath="Road Smoothing.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Sector Summary.cpp"
+				RelativePath="Sector Summary.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\selectwin.cpp"
+				RelativePath="selectwin.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SmartMethod.cpp"
+				RelativePath="SmartMethod.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\smooth.cpp"
+				RelativePath="smooth.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Smoothing Utils.cpp"
+				RelativePath="Smoothing Utils.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="Button Defines.h"
+				>
+			</File>
+			<File
+				RelativePath="Cursor Modes.h"
+				>
+			</File>
+			<File
+				RelativePath="edit_sys.h"
+				>
+			</File>
+			<File
+				RelativePath="Editor All.h"
+				>
+			</File>
+			<File
+				RelativePath="Editor Callback Prototypes.h"
+				>
+			</File>
+			<File
+				RelativePath="Editor Modes.h"
+				>
+			</File>
+			<File
+				RelativePath="Editor Taskbar Creation.h"
+				>
+			</File>
+			<File
+				RelativePath="Editor Taskbar Utils.h"
+				>
+			</File>
+			<File
+				RelativePath="Editor Undo.h"
+				>
+			</File>
+			<File
+				RelativePath="EditorBuildings.h"
+				>
+			</File>
+			<File
+				RelativePath="EditorDefines.h"
+				>
+			</File>
+			<File
+				RelativePath="EditorItems.h"
+				>
+			</File>
+			<File
+				RelativePath="EditorMercs.h"
+				>
+			</File>
+			<File
+				RelativePath="EditorTerrain.h"
+				>
+			</File>
+			<File
+				RelativePath="editscreen.h"
+				>
+			</File>
+			<File
+				RelativePath="Item Statistics.h"
+				>
+			</File>
+			<File
+				RelativePath="LoadScreen.h"
+				>
+			</File>
+			<File
+				RelativePath="messagebox.h"
+				>
+			</File>
+			<File
+				RelativePath="newsmooth.h"
+				>
+			</File>
+			<File
+				RelativePath="popupmenu.h"
+				>
+			</File>
+			<File
+				RelativePath="Road Smoothing.h"
+				>
+			</File>
+			<File
+				RelativePath="Sector Summary.h"
+				>
+			</File>
+			<File
+				RelativePath="selectwin.h"
+				>
+			</File>
+			<File
+				RelativePath="SmartMethod.h"
+				>
+			</File>
+			<File
+				RelativePath="smooth.h"
+				>
+			</File>
+			<File
+				RelativePath="Smoothing Utils.h"
+				>
+			</File>
+			<File
+				RelativePath="Summary Info.h"
 				>
 			</File>
 		</Filter>
diff --git a/Laptop/Laptop_VS2008.vcproj b/Laptop/Laptop_VS2008.vcproj
index 4d019407..8c29e831 100644
--- a/Laptop/Laptop_VS2008.vcproj
+++ b/Laptop/Laptop_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="Laptop_VS2008"
-	ProjectGUID="{5234CD2E-97F1-42FF-828D-CE0A1B46805E}"
-	RootNamespace="Laptop_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="Laptop"
+	ProjectGUID="{949A2F14-4838-46DF-AFF6-50B3B44417E2}"
+	RootNamespace="Laptop"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,145 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,491 +265,495 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\aim.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AimArchives.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AimFacialIndex.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AimHistory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AimLinks.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AimMembers.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AimPolicies.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AimSort.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyR.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyRAmmo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyRArmour.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyRGuns.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyRMailOrder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyRMisc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyRShipments.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BobbyRUsed.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BrokenLink.h"
-				>
-			</File>
-			<File
-				RelativePath=".\CharProfile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\email.h"
-				>
-			</File>
-			<File
-				RelativePath=".\files.h"
-				>
-			</File>
-			<File
-				RelativePath=".\finances.h"
-				>
-			</File>
-			<File
-				RelativePath=".\florist Cards.h"
-				>
-			</File>
-			<File
-				RelativePath=".\florist Gallery.h"
-				>
-			</File>
-			<File
-				RelativePath=".\florist Order Form.h"
-				>
-			</File>
-			<File
-				RelativePath=".\florist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\funeral.h"
-				>
-			</File>
-			<File
-				RelativePath=".\GunEmporium.h"
-				>
-			</File>
-			<File
-				RelativePath=".\history.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP AboutUs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Attribute Entrance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Attribute Finish.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Attribute Selection.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Begin Screen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Compile Character.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Confirm.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Finish.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP HomePage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP MainPage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Personality Entrance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Personality Finish.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Personality Quiz.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Portraits.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Skill Trait.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Text System.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMP Voices.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMPVideoObjects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\insurance Comments.h"
-				>
-			</File>
-			<File
-				RelativePath=".\insurance Contract.h"
-				>
-			</File>
-			<File
-				RelativePath=".\insurance Info.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Insurance Text.h"
-				>
-			</File>
-			<File
-				RelativePath=".\insurance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Laptop All.h"
-				>
-			</File>
-			<File
-				RelativePath=".\laptop.h"
-				>
-			</File>
-			<File
-				RelativePath=".\LaptopSave.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mercs Account.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mercs Files.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mercs No Account.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mercs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\personnel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\sirtech.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Speck Quotes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Store Inventory.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\aim.cpp"
+				RelativePath="aim.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AimArchives.cpp"
+				RelativePath="AimArchives.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AimFacialIndex.cpp"
+				RelativePath="AimFacialIndex.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AimHistory.cpp"
+				RelativePath="AimHistory.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AimLinks.cpp"
+				RelativePath="AimLinks.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AimMembers.cpp"
+				RelativePath="AimMembers.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AimPolicies.cpp"
+				RelativePath="AimPolicies.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AimSort.cpp"
+				RelativePath="AimSort.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyR.cpp"
+				RelativePath="BobbyR.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyRAmmo.cpp"
+				RelativePath="BobbyRAmmo.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyRArmour.cpp"
+				RelativePath="BobbyRArmour.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyRGuns.cpp"
+				RelativePath="BobbyRGuns.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyRMailOrder.cpp"
+				RelativePath="BobbyRMailOrder.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyRMisc.cpp"
+				RelativePath="BobbyRMisc.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyRShipments.cpp"
+				RelativePath="BobbyRShipments.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BobbyRUsed.cpp"
+				RelativePath="BobbyRUsed.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\BrokenLink.cpp"
+				RelativePath="BrokenLink.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CharProfile.cpp"
+				RelativePath="CharProfile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\email.cpp"
+				RelativePath="email.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\files.cpp"
+				RelativePath="files.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\finances.cpp"
+				RelativePath="finances.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\florist Cards.cpp"
+				RelativePath="florist Cards.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\florist Gallery.cpp"
+				RelativePath="florist Gallery.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\florist Order Form.cpp"
+				RelativePath="florist Order Form.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\florist.cpp"
+				RelativePath="florist.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\funeral.cpp"
+				RelativePath="funeral.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\history.cpp"
+				RelativePath="GunEmporium.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP AboutUs.cpp"
+				RelativePath="history.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Attribute Entrance.cpp"
+				RelativePath="IMP AboutUs.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Attribute Finish.cpp"
+				RelativePath="IMP Attribute Entrance.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Attribute Selection.cpp"
+				RelativePath="IMP Attribute Finish.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Begin Screen.cpp"
+				RelativePath="IMP Attribute Selection.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Compile Character.cpp"
+				RelativePath="IMP Begin Screen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Confirm.cpp"
+				RelativePath="IMP Compile Character.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Finish.cpp"
+				RelativePath="IMP Confirm.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP HomePage.cpp"
+				RelativePath="IMP Finish.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP MainPage.cpp"
+				RelativePath="IMP HomePage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Personality Entrance.cpp"
+				RelativePath="IMP MainPage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Personality Finish.cpp"
+				RelativePath="IMP Personality Entrance.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Personality Quiz.cpp"
+				RelativePath="IMP Personality Finish.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Portraits.cpp"
+				RelativePath="IMP Personality Quiz.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Skill Trait.cpp"
+				RelativePath="IMP Portraits.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Text System.cpp"
+				RelativePath="IMP Skill Trait.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMP Voices.cpp"
+				RelativePath="IMP Text System.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\IMPVideoObjects.cpp"
+				RelativePath="IMP Voices.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\insurance Comments.cpp"
+				RelativePath="IMPVideoObjects.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\insurance Contract.cpp"
+				RelativePath="insurance Comments.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\insurance Info.cpp"
+				RelativePath="insurance Contract.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\insurance.cpp"
+				RelativePath="insurance Info.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\laptop.cpp"
+				RelativePath="insurance.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\mercs Account.cpp"
+				RelativePath="laptop.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\mercs Files.cpp"
+				RelativePath="mercs Account.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\mercs No Account.cpp"
+				RelativePath="mercs Files.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\mercs.cpp"
+				RelativePath="mercs No Account.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\personnel.cpp"
+				RelativePath="mercs.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\sirtech.cpp"
+				RelativePath="personnel.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Store Inventory.cpp"
+				RelativePath="sirtech.cpp"
+				>
+			</File>
+			<File
+				RelativePath="Store Inventory.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="aim.h"
+				>
+			</File>
+			<File
+				RelativePath="AimArchives.h"
+				>
+			</File>
+			<File
+				RelativePath="AimFacialIndex.h"
+				>
+			</File>
+			<File
+				RelativePath="AimHistory.h"
+				>
+			</File>
+			<File
+				RelativePath="AimLinks.h"
+				>
+			</File>
+			<File
+				RelativePath="AimMembers.h"
+				>
+			</File>
+			<File
+				RelativePath="AimPolicies.h"
+				>
+			</File>
+			<File
+				RelativePath="AimSort.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyR.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyRAmmo.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyRArmour.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyRGuns.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyRMailOrder.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyRMisc.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyRShipments.h"
+				>
+			</File>
+			<File
+				RelativePath="BobbyRUsed.h"
+				>
+			</File>
+			<File
+				RelativePath="BrokenLink.h"
+				>
+			</File>
+			<File
+				RelativePath="CharProfile.h"
+				>
+			</File>
+			<File
+				RelativePath="email.h"
+				>
+			</File>
+			<File
+				RelativePath="files.h"
+				>
+			</File>
+			<File
+				RelativePath="finances.h"
+				>
+			</File>
+			<File
+				RelativePath="florist Cards.h"
+				>
+			</File>
+			<File
+				RelativePath="florist Gallery.h"
+				>
+			</File>
+			<File
+				RelativePath="florist Order Form.h"
+				>
+			</File>
+			<File
+				RelativePath="florist.h"
+				>
+			</File>
+			<File
+				RelativePath="funeral.h"
+				>
+			</File>
+			<File
+				RelativePath="GunEmporium.h"
+				>
+			</File>
+			<File
+				RelativePath="history.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP AboutUs.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Attribute Entrance.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Attribute Finish.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Attribute Selection.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Begin Screen.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Compile Character.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Confirm.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Finish.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP HomePage.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP MainPage.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Personality Entrance.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Personality Finish.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Personality Quiz.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Portraits.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Skill Trait.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Text System.h"
+				>
+			</File>
+			<File
+				RelativePath="IMP Voices.h"
+				>
+			</File>
+			<File
+				RelativePath="IMPVideoObjects.h"
+				>
+			</File>
+			<File
+				RelativePath="insurance Comments.h"
+				>
+			</File>
+			<File
+				RelativePath="insurance Contract.h"
+				>
+			</File>
+			<File
+				RelativePath="insurance Info.h"
+				>
+			</File>
+			<File
+				RelativePath="Insurance Text.h"
+				>
+			</File>
+			<File
+				RelativePath="insurance.h"
+				>
+			</File>
+			<File
+				RelativePath="Laptop All.h"
+				>
+			</File>
+			<File
+				RelativePath="laptop.h"
+				>
+			</File>
+			<File
+				RelativePath="LaptopSave.h"
+				>
+			</File>
+			<File
+				RelativePath="mercs Account.h"
+				>
+			</File>
+			<File
+				RelativePath="mercs Files.h"
+				>
+			</File>
+			<File
+				RelativePath="mercs No Account.h"
+				>
+			</File>
+			<File
+				RelativePath="mercs.h"
+				>
+			</File>
+			<File
+				RelativePath="personnel.h"
+				>
+			</File>
+			<File
+				RelativePath="sirtech.h"
+				>
+			</File>
+			<File
+				RelativePath="Speck Quotes.h"
+				>
+			</File>
+			<File
+				RelativePath="Store Inventory.h"
 				>
 			</File>
 		</Filter>
diff --git a/Standard Gaming Platform/SGP_VS2008.vcproj b/Standard Gaming Platform/SGP_VS2008.vcproj
index d58dfeac..a48f5c67 100644
--- a/Standard Gaming Platform/SGP_VS2008.vcproj	
+++ b/Standard Gaming Platform/SGP_VS2008.vcproj	
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="SGP_VS2008"
-	ProjectGUID="{6283CE93-2960-4596-8E74-7A6FBA8716FF}"
-	RootNamespace="SGP_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="SGP"
+	ProjectGUID="{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}"
+	RootNamespace="SGP"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_ZLIB_COMPRESSION"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_ZLIB_COMPRESSION;WINFONTS;CHINESE"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_ZLIB_COMPRESSION"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_ZLIB_COMPRESSION"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,145 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_ZLIB_COMPRESSION"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_ZLIB_COMPRESSION;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_ZLIB_COMPRESSION;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,438 +265,434 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Bitmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Button Sound Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Button System.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Compression.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Container.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Cursor Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\DbMan.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ddraw.h"
-				>
-			</File>
-			<File
-				RelativePath=".\DEBUG.H"
-				>
-			</File>
-			<File
-				RelativePath=".\DirectDraw Calls.h"
-				>
-			</File>
-			<File
-				RelativePath=".\DirectX Common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dsound.h"
-				>
-			</File>
-			<File
-				RelativePath=".\english.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ExceptionHandling.h"
-				>
-			</File>
-			<File
-				RelativePath=".\expat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\FileCat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\FileMan.h"
-				>
-			</File>
-			<File
-				RelativePath=".\flic.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fmod.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fmod_errors.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Font.h"
-				>
-			</File>
-			<File
-				RelativePath=".\himage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\imgfmt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\impTGA.h"
-				>
-			</File>
-			<File
-				RelativePath=".\input.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Install.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Ja2 Libs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\JA2 SGP ALL.H"
-				>
-			</File>
-			<File
-				RelativePath=".\LibraryDataBase.h"
-				>
-			</File>
-			<File
-				RelativePath=".\line.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MemMan.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mousesystem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mousesystem_macros.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Mss-old.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Mss.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Mutex Manager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pcx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\RAD.H"
-				>
-			</File>
-			<File
-				RelativePath=".\random.h"
-				>
-			</File>
-			<File
-				RelativePath=".\readdir.h"
-				>
-			</File>
-			<File
-				RelativePath=".\RegInst.h"
-				>
-			</File>
-			<File
-				RelativePath=".\sgp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\shading.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SMACK.H"
-				>
-			</File>
-			<File
-				RelativePath=".\soundman.h"
-				>
-			</File>
-			<File
-				RelativePath=".\STCI.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stringicmp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\timer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\TopicIDs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\TopicOps.h"
-				>
-			</File>
-			<File
-				RelativePath=".\trle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Types.h"
-				>
-			</File>
-			<File
-				RelativePath=".\video.h"
-				>
-			</File>
-			<File
-				RelativePath=".\video_private.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vobject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vobject_blitters.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vobject_private.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vsurface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vsurface_private.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WCheck.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WinFont.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WizShare.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ZCONF.H"
-				>
-			</File>
-			<File
-				RelativePath=".\ZLIB.H"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\Button Sound Control.cpp"
+				RelativePath="Button Sound Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Button System.cpp"
+				RelativePath="Button System.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Compression.cpp"
+				RelativePath="Compression.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Container.cpp"
+				RelativePath="Container.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Cursor Control.cpp"
+				RelativePath="Cursor Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\DbMan.cpp"
+				RelativePath="DbMan.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\DEBUG.cpp"
+				RelativePath="DEBUG.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\DirectDraw Calls.cpp"
+				RelativePath="DirectDraw Calls.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\DirectX Common.cpp"
+				RelativePath="DirectX Common.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\English.cpp"
+				RelativePath="English.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\ExceptionHandling.cpp"
+				RelativePath="ExceptionHandling.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\FileCat.cpp"
+				RelativePath="FileCat.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\FileMan.cpp"
+				RelativePath="FileMan.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Flic.cpp"
+				RelativePath="Flic.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Font.cpp"
+				RelativePath="Font.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\himage.cpp"
+				RelativePath="himage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\impTGA.cpp"
+				RelativePath="impTGA.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\input.cpp"
+				RelativePath="input.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Install.cpp"
+				RelativePath="Install.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Ja2 Libs.cpp"
+				RelativePath="Ja2 Libs.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\LibraryDataBase.cpp"
+				RelativePath="LibraryDataBase.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\line.cpp"
+				RelativePath="line.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\MemMan.cpp"
+				RelativePath="MemMan.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\mousesystem.cpp"
+				RelativePath="mousesystem.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Mutex Manager.cpp"
+				RelativePath="Mutex Manager.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\PCX.cpp"
+				RelativePath="PCX.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Random.cpp"
+				RelativePath="Random.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\readdir.cpp"
+				RelativePath="readdir.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\RegInst.cpp"
+				RelativePath="RegInst.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\sgp.cpp"
+				RelativePath="sgp.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\shading.cpp"
+				RelativePath="shading.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\soundman.cpp"
+				RelativePath="soundman.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\STCI.cpp"
+				RelativePath="STCI.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\stringicmp.cpp"
+				RelativePath="stringicmp.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\timer.cpp"
+				RelativePath="timer.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\video.cpp"
+				RelativePath="video.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\vobject.cpp"
+				RelativePath="vobject.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\vobject_blitters.cpp"
+				RelativePath="vobject_blitters.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\vsurface.cpp"
+				RelativePath="vsurface.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\WinFont.cpp"
+				RelativePath="WinFont.cpp"
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath=".\ddraw.lib"
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-		</File>
+			<File
+				RelativePath="Bitmap.h"
+				>
+			</File>
+			<File
+				RelativePath="Button Sound Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Button System.h"
+				>
+			</File>
+			<File
+				RelativePath="Compression.h"
+				>
+			</File>
+			<File
+				RelativePath="Container.h"
+				>
+			</File>
+			<File
+				RelativePath="Cursor Control.h"
+				>
+			</File>
+			<File
+				RelativePath="DbMan.h"
+				>
+			</File>
+			<File
+				RelativePath="ddraw.h"
+				>
+			</File>
+			<File
+				RelativePath="DEBUG.H"
+				>
+			</File>
+			<File
+				RelativePath="DirectDraw Calls.h"
+				>
+			</File>
+			<File
+				RelativePath="DirectX Common.h"
+				>
+			</File>
+			<File
+				RelativePath="dsound.h"
+				>
+			</File>
+			<File
+				RelativePath="english.h"
+				>
+			</File>
+			<File
+				RelativePath="ExceptionHandling.h"
+				>
+			</File>
+			<File
+				RelativePath="expat.h"
+				>
+			</File>
+			<File
+				RelativePath="FileCat.h"
+				>
+			</File>
+			<File
+				RelativePath="FileMan.h"
+				>
+			</File>
+			<File
+				RelativePath="flic.h"
+				>
+			</File>
+			<File
+				RelativePath="fmod.h"
+				>
+			</File>
+			<File
+				RelativePath="fmod_errors.h"
+				>
+			</File>
+			<File
+				RelativePath="Font.h"
+				>
+			</File>
+			<File
+				RelativePath="himage.h"
+				>
+			</File>
+			<File
+				RelativePath="imgfmt.h"
+				>
+			</File>
+			<File
+				RelativePath="impTGA.h"
+				>
+			</File>
+			<File
+				RelativePath="input.h"
+				>
+			</File>
+			<File
+				RelativePath="Install.h"
+				>
+			</File>
+			<File
+				RelativePath="Ja2 Libs.h"
+				>
+			</File>
+			<File
+				RelativePath="JA2 SGP ALL.H"
+				>
+			</File>
+			<File
+				RelativePath="LibraryDataBase.h"
+				>
+			</File>
+			<File
+				RelativePath="line.h"
+				>
+			</File>
+			<File
+				RelativePath="MemMan.h"
+				>
+			</File>
+			<File
+				RelativePath="mousesystem.h"
+				>
+			</File>
+			<File
+				RelativePath="mousesystem_macros.h"
+				>
+			</File>
+			<File
+				RelativePath="Mss-old.h"
+				>
+			</File>
+			<File
+				RelativePath="Mss.h"
+				>
+			</File>
+			<File
+				RelativePath="Mutex Manager.h"
+				>
+			</File>
+			<File
+				RelativePath="pcx.h"
+				>
+			</File>
+			<File
+				RelativePath="RAD.H"
+				>
+			</File>
+			<File
+				RelativePath="random.h"
+				>
+			</File>
+			<File
+				RelativePath="readdir.h"
+				>
+			</File>
+			<File
+				RelativePath="RegInst.h"
+				>
+			</File>
+			<File
+				RelativePath="sgp.h"
+				>
+			</File>
+			<File
+				RelativePath="shading.h"
+				>
+			</File>
+			<File
+				RelativePath="SMACK.H"
+				>
+			</File>
+			<File
+				RelativePath="soundman.h"
+				>
+			</File>
+			<File
+				RelativePath="STCI.h"
+				>
+			</File>
+			<File
+				RelativePath="stringicmp.h"
+				>
+			</File>
+			<File
+				RelativePath="timer.h"
+				>
+			</File>
+			<File
+				RelativePath="TopicIDs.h"
+				>
+			</File>
+			<File
+				RelativePath="TopicOps.h"
+				>
+			</File>
+			<File
+				RelativePath="trle.h"
+				>
+			</File>
+			<File
+				RelativePath="Types.h"
+				>
+			</File>
+			<File
+				RelativePath="video.h"
+				>
+			</File>
+			<File
+				RelativePath="video_private.h"
+				>
+			</File>
+			<File
+				RelativePath="vobject.h"
+				>
+			</File>
+			<File
+				RelativePath="vobject_blitters.h"
+				>
+			</File>
+			<File
+				RelativePath="vobject_private.h"
+				>
+			</File>
+			<File
+				RelativePath="vsurface.h"
+				>
+			</File>
+			<File
+				RelativePath="vsurface_private.h"
+				>
+			</File>
+			<File
+				RelativePath="WCheck.h"
+				>
+			</File>
+			<File
+				RelativePath="WinFont.h"
+				>
+			</File>
+			<File
+				RelativePath="WizShare.h"
+				>
+			</File>
+			<File
+				RelativePath="ZCONF.H"
+				>
+			</File>
+			<File
+				RelativePath="ZLIB.H"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Strategic/Strategic_VS2008.vcproj b/Strategic/Strategic_VS2008.vcproj
index 6d80552b..e2ba9a90 100644
--- a/Strategic/Strategic_VS2008.vcproj
+++ b/Strategic/Strategic_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="Strategic_VS2008"
-	ProjectGUID="{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}"
-	RootNamespace="Strategic_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="Strategic"
+	ProjectGUID="{AD7326E2-4A75-4A02-8930-762D3A532D8A}"
+	RootNamespace="Strategic"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,145 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,363 +265,363 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Assignments.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Auto Resolve.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Campaign Init.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Campaign Types.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Creature Spreading.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Game Clock.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Game Event Hook.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Game Events.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Game Init.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Screen Helicopter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Screen Interface Border.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Screen Interface Bottom.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Screen Interface Map Inventory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Screen Interface Map.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Screen Interface TownMine Info.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Screen Interface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mapscreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Meanwhile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Merc Contract.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MilitiaSquads.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Player Command.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PreBattle Interface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Queen Command.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Quest Debug System.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Quests.h"
-				>
-			</File>
-			<File
-				RelativePath=".\QuestText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Reinforcement.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Scheduling.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic AI.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic All.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Event Handler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Merc Handler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Mines.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Movement.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Pathing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Status.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Town Loyalty.h"
-				>
-			</File>
-			<File
-				RelativePath=".\strategic town reputation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Turns.h"
-				>
-			</File>
-			<File
-				RelativePath=".\strategic.h"
-				>
-			</File>
-			<File
-				RelativePath=".\strategicmap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Town Militia.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AI Viewer.cpp"
+				RelativePath="AI Viewer.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Assignments.cpp"
+				RelativePath="Assignments.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Auto Resolve.cpp"
+				RelativePath="Auto Resolve.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Campaign Init.cpp"
+				RelativePath="Campaign Init.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Creature Spreading.cpp"
+				RelativePath="Creature Spreading.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Game Clock.cpp"
+				RelativePath="Game Clock.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Game Event Hook.cpp"
+				RelativePath="Game Event Hook.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Game Events.cpp"
+				RelativePath="Game Events.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Game Init.cpp"
+				RelativePath="Game Init.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Hourly Update.cpp"
+				RelativePath="Hourly Update.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Screen Helicopter.cpp"
+				RelativePath="Map Screen Helicopter.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Screen Interface Border.cpp"
+				RelativePath="Map Screen Interface Border.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Screen Interface Bottom.cpp"
+				RelativePath="Map Screen Interface Bottom.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Screen Interface Map Inventory.cpp"
+				RelativePath="Map Screen Interface Map Inventory.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Screen Interface Map.cpp"
+				RelativePath="Map Screen Interface Map.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Screen Interface TownMine Info.cpp"
+				RelativePath="Map Screen Interface TownMine Info.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Screen Interface.cpp"
+				RelativePath="Map Screen Interface.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\mapscreen.cpp"
+				RelativePath="mapscreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Meanwhile.cpp"
+				RelativePath="Meanwhile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Merc Contract.cpp"
+				RelativePath="Merc Contract.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\MilitiaSquads.cpp"
+				RelativePath="MilitiaSquads.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Player Command.cpp"
+				RelativePath="Player Command.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\PreBattle Interface.cpp"
+				RelativePath="PreBattle Interface.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Queen Command.cpp"
+				RelativePath="Queen Command.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Quest Debug System.cpp"
+				RelativePath="Quest Debug System.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Quests.cpp"
+				RelativePath="Quests.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\QuestText.cpp"
+				RelativePath="QuestText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Reinforcement.cpp"
+				RelativePath="Reinforcement.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Scheduling.cpp"
+				RelativePath="Scheduling.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic AI.cpp"
+				RelativePath="Strategic AI.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Event Handler.cpp"
+				RelativePath="Strategic Event Handler.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Merc Handler.cpp"
+				RelativePath="Strategic Merc Handler.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Mines.cpp"
+				RelativePath="Strategic Mines.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Movement Costs.cpp"
+				RelativePath="Strategic Movement Costs.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Movement.cpp"
+				RelativePath="Strategic Movement.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Pathing.cpp"
+				RelativePath="Strategic Pathing.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Status.cpp"
+				RelativePath="Strategic Status.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Town Loyalty.cpp"
+				RelativePath="Strategic Town Loyalty.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\strategic town reputation.cpp"
+				RelativePath="strategic town reputation.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Turns.cpp"
+				RelativePath="Strategic Turns.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\strategic.cpp"
+				RelativePath="strategic.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\strategicmap.cpp"
+				RelativePath="strategicmap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Town Militia.cpp"
+				RelativePath="Town Militia.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Army.cpp"
+				RelativePath="XML_Army.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Roaming.cpp"
+				RelativePath="XML_Roaming.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="Assignments.h"
+				>
+			</File>
+			<File
+				RelativePath="Auto Resolve.h"
+				>
+			</File>
+			<File
+				RelativePath="Campaign Init.h"
+				>
+			</File>
+			<File
+				RelativePath="Campaign Types.h"
+				>
+			</File>
+			<File
+				RelativePath="Creature Spreading.h"
+				>
+			</File>
+			<File
+				RelativePath="Game Clock.h"
+				>
+			</File>
+			<File
+				RelativePath="Game Event Hook.h"
+				>
+			</File>
+			<File
+				RelativePath="Game Events.h"
+				>
+			</File>
+			<File
+				RelativePath="Game Init.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Screen Helicopter.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Screen Interface Border.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Screen Interface Bottom.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Screen Interface Map Inventory.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Screen Interface Map.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Screen Interface TownMine Info.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Screen Interface.h"
+				>
+			</File>
+			<File
+				RelativePath="mapscreen.h"
+				>
+			</File>
+			<File
+				RelativePath="Meanwhile.h"
+				>
+			</File>
+			<File
+				RelativePath="Merc Contract.h"
+				>
+			</File>
+			<File
+				RelativePath="MilitiaSquads.h"
+				>
+			</File>
+			<File
+				RelativePath="Player Command.h"
+				>
+			</File>
+			<File
+				RelativePath="PreBattle Interface.h"
+				>
+			</File>
+			<File
+				RelativePath="Queen Command.h"
+				>
+			</File>
+			<File
+				RelativePath="Quest Debug System.h"
+				>
+			</File>
+			<File
+				RelativePath="Quests.h"
+				>
+			</File>
+			<File
+				RelativePath="QuestText.h"
+				>
+			</File>
+			<File
+				RelativePath="Reinforcement.h"
+				>
+			</File>
+			<File
+				RelativePath="Scheduling.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic AI.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic All.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Event Handler.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Merc Handler.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Mines.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Movement.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Pathing.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Status.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Town Loyalty.h"
+				>
+			</File>
+			<File
+				RelativePath="strategic town reputation.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Turns.h"
+				>
+			</File>
+			<File
+				RelativePath="strategic.h"
+				>
+			</File>
+			<File
+				RelativePath="strategicmap.h"
+				>
+			</File>
+			<File
+				RelativePath="Town Militia.h"
 				>
 			</File>
 		</Filter>
diff --git a/Tactical/Tactical_VS2008.vcproj b/Tactical/Tactical_VS2008.vcproj
index 66a9497f..4dac8216 100644
--- a/Tactical/Tactical_VS2008.vcproj
+++ b/Tactical/Tactical_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="Tactical_VS2008"
-	ProjectGUID="{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}"
-	RootNamespace="Tactical_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="Tactical"
+	ProjectGUID="{80BE1D23-9651-47C8-AF66-6F76756E6CF3}"
+	RootNamespace="Tactical"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,145 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,739 +265,743 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Action Items.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Air Raid.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Animation Cache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Animation Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Animation Data.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Arms Dealer Init.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ArmsDealerInvInit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Auto Bandage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BinaryHeap.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Boxing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Bullets.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Campaign.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Civ Quotes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Dialogue Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\DisplayCover.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Drugs And Alcohol.h"
-				>
-			</File>
-			<File
-				RelativePath=".\End Game.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Enemy Soldier Save.h"
-				>
-			</File>
-			<File
-				RelativePath=".\EnemyItemDrops.h"
-				>
-			</File>
-			<File
-				RelativePath=".\faces.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fov.h"
-				>
-			</File>
-			<File
-				RelativePath=".\GAP.H"
-				>
-			</File>
-			<File
-				RelativePath=".\Handle Doors.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Handle Items.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Handle UI Plan.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Handle UI.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interface Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interface Cursors.h"
-				>
-			</File>
-			<File
-				RelativePath=".\interface Dialogue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interface Enhanced.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interface Items.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interface Panels.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interface Utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Inventory Choosing.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Item Types.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Items.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Keys.h"
-				>
-			</File>
-			<File
-				RelativePath=".\LOS.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Information.h"
-				>
-			</File>
-			<File
-				RelativePath=".\merc entering.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Merc Hiring.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Militia Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Morale.h"
-				>
-			</File>
-			<File
-				RelativePath=".\opplist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Overhead Types.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Overhead.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PATHAI.H"
-				>
-			</File>
-			<File
-				RelativePath=".\PathAIDebug.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Points.h"
-				>
-			</File>
-			<File
-				RelativePath=".\qarray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Rain.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Rotting Corpses.h"
-				>
-			</File>
-			<File
-				RelativePath=".\rt time defines.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ShopKeeper Interface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ShopKeeper Quotes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SkillCheck.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Add.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Ani.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Create.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Find.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Functions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Init List.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier macros.h"
-				>
-			</File>
-			<File
-				RelativePath=".\soldier profile type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Soldier Profile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\soldier tile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Spread burst.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Squads.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Strategic Exit GUI.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Structure Wrap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Tactical All.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Tactical Save.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Tactical Turns.h"
-				>
-			</File>
-			<File
-				RelativePath=".\TeamTurns.h"
-				>
-			</File>
-			<File
-				RelativePath=".\UI Cursors.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Vehicles.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Weapons.h"
-				>
-			</File>
-			<File
-				RelativePath=".\World Items.h"
-				>
-			</File>
-			<File
-				RelativePath=".\XML.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\Air Raid.cpp"
+				RelativePath="Air Raid.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Animation Cache.cpp"
+				RelativePath="Animation Cache.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Animation Control.cpp"
+				RelativePath="Animation Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Animation Data.cpp"
+				RelativePath="Animation Data.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Arms Dealer Init.cpp"
+				RelativePath="Arms Dealer Init.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\ArmsDealerInvInit.cpp"
+				RelativePath="ArmsDealerInvInit.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Auto Bandage.cpp"
+				RelativePath="Auto Bandage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Boxing.cpp"
+				RelativePath="BinaryHeap.hpp"
 				>
 			</File>
 			<File
-				RelativePath=".\bullets.cpp"
+				RelativePath="Boxing.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Campaign.cpp"
+				RelativePath="bullets.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Civ Quotes.cpp"
+				RelativePath="Campaign.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Dialogue Control.cpp"
+				RelativePath="Civ Quotes.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\DisplayCover.cpp"
+				RelativePath="Dialogue Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Drugs And Alcohol.cpp"
+				RelativePath="DisplayCover.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\End Game.cpp"
+				RelativePath="Drugs And Alcohol.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Enemy Soldier Save.cpp"
+				RelativePath="End Game.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\EnemyItemDrops.cpp"
+				RelativePath="Enemy Soldier Save.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Faces.cpp"
+				RelativePath="EnemyItemDrops.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\fov.cpp"
+				RelativePath="Faces.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\GAP.cpp"
+				RelativePath="fov.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Handle Doors.cpp"
+				RelativePath="GAP.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Handle Items.cpp"
+				RelativePath="Handle Doors.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Handle UI Plan.cpp"
+				RelativePath="Handle Items.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Handle UI.cpp"
+				RelativePath="Handle UI Plan.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface Control.cpp"
+				RelativePath="Handle UI.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface Cursors.cpp"
+				RelativePath="Interface Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface Dialogue.cpp"
+				RelativePath="Interface Cursors.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface Enhanced.cpp"
+				RelativePath="Interface Dialogue.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface Items.cpp"
+				RelativePath="Interface Enhanced.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface Panels.cpp"
+				RelativePath="Interface Items.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface Utils.cpp"
+				RelativePath="Interface Panels.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interface.cpp"
+				RelativePath="Interface Utils.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Inventory Choosing.cpp"
+				RelativePath="Interface.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Item Types.cpp"
+				RelativePath="Inventory Choosing.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Items.cpp"
+				RelativePath="Item Types.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Keys.cpp"
+				RelativePath="Items.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\LOS.cpp"
+				RelativePath="Keys.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Information.cpp"
+				RelativePath="LOS.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Merc Entering.cpp"
+				RelativePath="Map Information.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Merc Hiring.cpp"
+				RelativePath="Merc Entering.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Militia Control.cpp"
+				RelativePath="Merc Hiring.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Morale.cpp"
+				RelativePath="Militia Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\opplist.cpp"
+				RelativePath="Morale.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Overhead.cpp"
+				RelativePath="opplist.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\PATHAI.cpp"
+				RelativePath="Overhead.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Points.cpp"
+				RelativePath="PATHAI.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\QARRAY.cpp"
+				RelativePath="Points.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Rain.cpp"
+				RelativePath="QARRAY.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Real Time Input.cpp"
+				RelativePath="Rain.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Rotting Corpses.cpp"
+				RelativePath="Real Time Input.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\ShopKeeper Interface.cpp"
+				RelativePath="Rotting Corpses.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SkillCheck.cpp"
+				RelativePath="ShopKeeper Interface.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Add.cpp"
+				RelativePath="SkillCheck.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Ani.cpp"
+				RelativePath="Soldier Add.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Control.cpp"
+				RelativePath="Soldier Ani.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Create.cpp"
+				RelativePath="Soldier Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Find.cpp"
+				RelativePath="Soldier Create.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Init List.cpp"
+				RelativePath="Soldier Find.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Profile.cpp"
+				RelativePath="Soldier Init List.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Soldier Tile.cpp"
+				RelativePath="Soldier Profile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SoldierTooltips.cpp"
+				RelativePath="Soldier Tile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Spread Burst.cpp"
+				RelativePath="SoldierTooltips.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Squads.cpp"
+				RelativePath="Spread Burst.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Strategic Exit GUI.cpp"
+				RelativePath="Squads.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Structure Wrap.cpp"
+				RelativePath="Strategic Exit GUI.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Tactical Save.cpp"
+				RelativePath="Structure Wrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Tactical Turns.cpp"
+				RelativePath="Tactical Save.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\TeamTurns.cpp"
+				RelativePath="Tactical Turns.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Turn Based Input.cpp"
+				RelativePath="TeamTurns.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\UI Cursors.cpp"
+				RelativePath="Turn Based Input.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Vehicles.cpp"
+				RelativePath="UI Cursors.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Weapons.cpp"
+				RelativePath="Vehicles.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\World Items.cpp"
+				RelativePath="Weapons.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_AmmoStrings.cpp"
+				RelativePath="World Items.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_AmmoTypes.cpp"
+				RelativePath="XML_AmmoStrings.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Armour.cpp"
+				RelativePath="XML_AmmoTypes.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_AttachmentInfo.cpp"
+				RelativePath="XML_Armour.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Attachments.cpp"
+				RelativePath="XML_AttachmentInfo.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_BurstSounds.cpp"
+				RelativePath="XML_Attachments.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_ComboMergeInfo.cpp"
+				RelativePath="XML_BurstSounds.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_CompatibleFaceItems.cpp"
+				RelativePath="XML_ComboMergeInfo.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_EnemyAmmoDrops.cpp"
+				RelativePath="XML_CompatibleFaceItems.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_EnemyArmourDrops.cpp"
+				RelativePath="XML_EnemyAmmoDrops.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_EnemyExplosiveDrops.cpp"
+				RelativePath="XML_EnemyArmourDrops.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_EnemyItemChoice.cpp"
+				RelativePath="XML_EnemyExplosiveDrops.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_EnemyMiscDrops.cpp"
+				RelativePath="XML_EnemyItemChoice.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_EnemyWeaponChoice.cpp"
+				RelativePath="XML_EnemyMiscDrops.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_EnemyWeaponDrops.cpp"
+				RelativePath="XML_EnemyWeaponChoice.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Explosive.cpp"
+				RelativePath="XML_EnemyWeaponDrops.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_IMPItemChoices.cpp"
+				RelativePath="XML_Explosive.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_IncompatibleAttachments.cpp"
+				RelativePath="XML_IMPItemChoices.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Launchable.cpp"
+				RelativePath="XML_IncompatibleAttachments.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_LBEPocket.cpp"
+				RelativePath="XML_Launchable.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_LoadBearingEquipment.cpp"
+				RelativePath="XML_LBEPocket.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Magazine.cpp"
+				RelativePath="XML_LoadBearingEquipment.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_MercStartingGear.cpp"
+				RelativePath="XML_Magazine.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Merge.cpp"
+				RelativePath="XML_MercStartingGear.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_SectorLoadscreens.cpp"
+				RelativePath="XML_Merge.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Sounds.cpp"
+				RelativePath="XML_SectorLoadscreens.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_TonyInventory.cpp"
+				RelativePath="XML_Sounds.cpp"
+				>
+			</File>
+			<File
+				RelativePath="XML_TonyInventory.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="Action Items.h"
+				>
+			</File>
+			<File
+				RelativePath="Air Raid.h"
+				>
+			</File>
+			<File
+				RelativePath="Animation Cache.h"
+				>
+			</File>
+			<File
+				RelativePath="Animation Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Animation Data.h"
+				>
+			</File>
+			<File
+				RelativePath="Arms Dealer Init.h"
+				>
+			</File>
+			<File
+				RelativePath="ArmsDealerInvInit.h"
+				>
+			</File>
+			<File
+				RelativePath="AStarPathfinder.h"
+				>
+			</File>
+			<File
+				RelativePath="Auto Bandage.h"
+				>
+			</File>
+			<File
+				RelativePath="Boxing.h"
+				>
+			</File>
+			<File
+				RelativePath="Bullets.h"
+				>
+			</File>
+			<File
+				RelativePath="Campaign.h"
+				>
+			</File>
+			<File
+				RelativePath="Civ Quotes.h"
+				>
+			</File>
+			<File
+				RelativePath="Dialogue Control.h"
+				>
+			</File>
+			<File
+				RelativePath="DisplayCover.h"
+				>
+			</File>
+			<File
+				RelativePath="Drugs And Alcohol.h"
+				>
+			</File>
+			<File
+				RelativePath="End Game.h"
+				>
+			</File>
+			<File
+				RelativePath="Enemy Soldier Save.h"
+				>
+			</File>
+			<File
+				RelativePath="EnemyItemDrops.h"
+				>
+			</File>
+			<File
+				RelativePath="faces.h"
+				>
+			</File>
+			<File
+				RelativePath="fov.h"
+				>
+			</File>
+			<File
+				RelativePath="GAP.H"
+				>
+			</File>
+			<File
+				RelativePath="Handle Doors.h"
+				>
+			</File>
+			<File
+				RelativePath="Handle Items.h"
+				>
+			</File>
+			<File
+				RelativePath="Handle UI Plan.h"
+				>
+			</File>
+			<File
+				RelativePath="Handle UI.h"
+				>
+			</File>
+			<File
+				RelativePath="Interface Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Interface Cursors.h"
+				>
+			</File>
+			<File
+				RelativePath="interface Dialogue.h"
+				>
+			</File>
+			<File
+				RelativePath="Interface Enhanced.h"
+				>
+			</File>
+			<File
+				RelativePath="Interface Items.h"
+				>
+			</File>
+			<File
+				RelativePath="Interface Panels.h"
+				>
+			</File>
+			<File
+				RelativePath="Interface Utils.h"
+				>
+			</File>
+			<File
+				RelativePath="Interface.h"
+				>
+			</File>
+			<File
+				RelativePath="Inventory Choosing.h"
+				>
+			</File>
+			<File
+				RelativePath="Item Types.h"
+				>
+			</File>
+			<File
+				RelativePath="Items.h"
+				>
+			</File>
+			<File
+				RelativePath="Keys.h"
+				>
+			</File>
+			<File
+				RelativePath="LOS.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Information.h"
+				>
+			</File>
+			<File
+				RelativePath="merc entering.h"
+				>
+			</File>
+			<File
+				RelativePath="Merc Hiring.h"
+				>
+			</File>
+			<File
+				RelativePath="Militia Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Morale.h"
+				>
+			</File>
+			<File
+				RelativePath="opplist.h"
+				>
+			</File>
+			<File
+				RelativePath="Overhead Types.h"
+				>
+			</File>
+			<File
+				RelativePath="Overhead.h"
+				>
+			</File>
+			<File
+				RelativePath="PATHAI.H"
+				>
+			</File>
+			<File
+				RelativePath="PathAIDebug.h"
+				>
+			</File>
+			<File
+				RelativePath="Points.h"
+				>
+			</File>
+			<File
+				RelativePath="qarray.h"
+				>
+			</File>
+			<File
+				RelativePath="Rain.h"
+				>
+			</File>
+			<File
+				RelativePath="Rotting Corpses.h"
+				>
+			</File>
+			<File
+				RelativePath="rt time defines.h"
+				>
+			</File>
+			<File
+				RelativePath="ShopKeeper Interface.h"
+				>
+			</File>
+			<File
+				RelativePath="ShopKeeper Quotes.h"
+				>
+			</File>
+			<File
+				RelativePath="SkillCheck.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Add.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Ani.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Create.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Find.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Functions.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Init List.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier macros.h"
+				>
+			</File>
+			<File
+				RelativePath="soldier profile type.h"
+				>
+			</File>
+			<File
+				RelativePath="Soldier Profile.h"
+				>
+			</File>
+			<File
+				RelativePath="soldier tile.h"
+				>
+			</File>
+			<File
+				RelativePath="Spread burst.h"
+				>
+			</File>
+			<File
+				RelativePath="Squads.h"
+				>
+			</File>
+			<File
+				RelativePath="Strategic Exit GUI.h"
+				>
+			</File>
+			<File
+				RelativePath="Structure Wrap.h"
+				>
+			</File>
+			<File
+				RelativePath="Tactical All.h"
+				>
+			</File>
+			<File
+				RelativePath="Tactical Save.h"
+				>
+			</File>
+			<File
+				RelativePath="Tactical Turns.h"
+				>
+			</File>
+			<File
+				RelativePath="TeamTurns.h"
+				>
+			</File>
+			<File
+				RelativePath="UI Cursors.h"
+				>
+			</File>
+			<File
+				RelativePath="Vehicles.h"
+				>
+			</File>
+			<File
+				RelativePath="Weapons.h"
+				>
+			</File>
+			<File
+				RelativePath="World Items.h"
+				>
+			</File>
+			<File
+				RelativePath="XML.h"
 				>
 			</File>
 		</Filter>
diff --git a/TacticalAI/TacticalAI_VS2008.vcproj b/TacticalAI/TacticalAI_VS2008.vcproj
index ffd8f559..efe8a560 100644
--- a/TacticalAI/TacticalAI_VS2008.vcproj
+++ b/TacticalAI/TacticalAI_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="TacticalAI_VS2008"
-	ProjectGUID="{27A49DAF-3F5A-4FF2-B943-9559F0B63032}"
-	RootNamespace="TacticalAI_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="TacticalAI"
+	ProjectGUID="{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}"
+	RootNamespace="TacticalAI"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,145 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,95 +265,87 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\AI All.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ai.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AIInternals.h"
-				>
-			</File>
-			<File
-				RelativePath=".\AIList.h"
-				>
-			</File>
-			<File
-				RelativePath=".\NPC.h"
-				>
-			</File>
-			<File
-				RelativePath=".\QuestDebug.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AIList.cpp"
+				RelativePath="AIList.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AIMain.cpp"
+				RelativePath="AIMain.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AIUtils.cpp"
+				RelativePath="AIUtils.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Attacks.cpp"
+				RelativePath="Attacks.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\CreatureDecideAction.cpp"
+				RelativePath="CreatureDecideAction.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\DecideAction.cpp"
+				RelativePath="DecideAction.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\FindLocations.cpp"
+				RelativePath="FindLocations.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Knowledge.cpp"
+				RelativePath="Knowledge.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Medical.cpp"
+				RelativePath="Medical.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Movement.cpp"
+				RelativePath="Movement.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\NPC.cpp"
+				RelativePath="NPC.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\PanicButtons.cpp"
+				RelativePath="PanicButtons.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\QuestDebug.cpp"
+				RelativePath="QuestDebug.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Realtime.cpp"
+				RelativePath="Realtime.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="AI All.h"
+				>
+			</File>
+			<File
+				RelativePath="ai.h"
+				>
+			</File>
+			<File
+				RelativePath="AIInternals.h"
+				>
+			</File>
+			<File
+				RelativePath="AIList.h"
 				>
 			</File>
 		</Filter>
diff --git a/TileEngine/TileEngine_VS2008.vcproj b/TileEngine/TileEngine_VS2008.vcproj
index a791489e..e47221af 100644
--- a/TileEngine/TileEngine_VS2008.vcproj
+++ b/TileEngine/TileEngine_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="TileEngine_VS2008"
-	ProjectGUID="{FC1938E8-9253-49A8-AA99-4639BBB46C1B}"
-	RootNamespace="TileEngine_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="TileEngine"
+	ProjectGUID="{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}"
+	RootNamespace="TileEngine"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,145 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -401,323 +265,319 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Ambient Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Ambient Types.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Buildings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\environment.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Exit Grids.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Explosion Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Fog Of War.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Interactive Tiles.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Isometric Utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\LightEffects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lighting.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Map Edgepoints.h"
-				>
-			</File>
-			<File
-				RelativePath=".\overhead map.h"
-				>
-			</File>
-			<File
-				RelativePath=".\phys math.h"
-				>
-			</File>
-			<File
-				RelativePath=".\physics.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pits.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Radar Screen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Render Dirty.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Render Fun.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Render Z.h"
-				>
-			</File>
-			<File
-				RelativePath=".\renderworld.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SaveLoadMap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Shade Table Util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Simple Render Utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Smell.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SmokeEffects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Structure Internals.h"
-				>
-			</File>
-			<File
-				RelativePath=".\structure.h"
-				>
-			</File>
-			<File
-				RelativePath=".\sysutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Tactical Placement GUI.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Tile Animation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Tile Cache.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Tile Surface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\TileDat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tiledef.h"
-				>
-			</File>
-			<File
-				RelativePath=".\TileEngine All.h"
-				>
-			</File>
-			<File
-				RelativePath=".\World Tileset Enums.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WorldDat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\worlddef.h"
-				>
-			</File>
-			<File
-				RelativePath=".\worldman.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\Ambient Control.cpp"
+				RelativePath="Ambient Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Buildings.cpp"
+				RelativePath="Buildings.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\environment.cpp"
+				RelativePath="environment.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Exit Grids.cpp"
+				RelativePath="Exit Grids.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Explosion Control.cpp"
+				RelativePath="Explosion Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Fog Of War.cpp"
+				RelativePath="Fog Of War.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Interactive Tiles.cpp"
+				RelativePath="Interactive Tiles.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Isometric Utils.cpp"
+				RelativePath="Isometric Utils.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\LightEffects.cpp"
+				RelativePath="LightEffects.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\lighting.cpp"
+				RelativePath="lighting.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Map Edgepoints.cpp"
+				RelativePath="Map Edgepoints.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\overhead map.cpp"
+				RelativePath="overhead map.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\phys math.cpp"
+				RelativePath="phys math.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\physics.cpp"
+				RelativePath="physics.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\pits.cpp"
+				RelativePath="pits.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Radar Screen.cpp"
+				RelativePath="Radar Screen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Render Dirty.cpp"
+				RelativePath="Render Dirty.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Render Fun.cpp"
+				RelativePath="Render Fun.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Render Z.cpp"
+				RelativePath="Render Z.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\renderworld.cpp"
+				RelativePath="renderworld.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SaveLoadMap.cpp"
+				RelativePath="SaveLoadMap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Shade Table Util.cpp"
+				RelativePath="Shade Table Util.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Simple Render Utils.cpp"
+				RelativePath="Simple Render Utils.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Smell.cpp"
+				RelativePath="Smell.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SmokeEffects.cpp"
+				RelativePath="SmokeEffects.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\structure.cpp"
+				RelativePath="structure.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\sysutil.cpp"
+				RelativePath="sysutil.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Tactical Placement GUI.cpp"
+				RelativePath="Tactical Placement GUI.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Tile Animation.cpp"
+				RelativePath="Tile Animation.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Tile Cache.cpp"
+				RelativePath="Tile Cache.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Tile Surface.cpp"
+				RelativePath="Tile Surface.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\TileDat.cpp"
+				RelativePath="TileDat.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\tiledef.cpp"
+				RelativePath="tiledef.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\WorldDat.cpp"
+				RelativePath="WorldDat.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\worlddef.cpp"
+				RelativePath="worlddef.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\worldman.cpp"
+				RelativePath="worldman.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_ExplosionData.cpp"
+				RelativePath="XML_ExplosionData.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="Ambient Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Ambient Types.h"
+				>
+			</File>
+			<File
+				RelativePath="Buildings.h"
+				>
+			</File>
+			<File
+				RelativePath="environment.h"
+				>
+			</File>
+			<File
+				RelativePath="Exit Grids.h"
+				>
+			</File>
+			<File
+				RelativePath="Explosion Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Fog Of War.h"
+				>
+			</File>
+			<File
+				RelativePath="Interactive Tiles.h"
+				>
+			</File>
+			<File
+				RelativePath="Isometric Utils.h"
+				>
+			</File>
+			<File
+				RelativePath="LightEffects.h"
+				>
+			</File>
+			<File
+				RelativePath="lighting.h"
+				>
+			</File>
+			<File
+				RelativePath="Map Edgepoints.h"
+				>
+			</File>
+			<File
+				RelativePath="overhead map.h"
+				>
+			</File>
+			<File
+				RelativePath="phys math.h"
+				>
+			</File>
+			<File
+				RelativePath="physics.h"
+				>
+			</File>
+			<File
+				RelativePath="pits.h"
+				>
+			</File>
+			<File
+				RelativePath="Radar Screen.h"
+				>
+			</File>
+			<File
+				RelativePath="Render Dirty.h"
+				>
+			</File>
+			<File
+				RelativePath="Render Fun.h"
+				>
+			</File>
+			<File
+				RelativePath="Render Z.h"
+				>
+			</File>
+			<File
+				RelativePath="renderworld.h"
+				>
+			</File>
+			<File
+				RelativePath="SaveLoadMap.h"
+				>
+			</File>
+			<File
+				RelativePath="Shade Table Util.h"
+				>
+			</File>
+			<File
+				RelativePath="Simple Render Utils.h"
+				>
+			</File>
+			<File
+				RelativePath="Smell.h"
+				>
+			</File>
+			<File
+				RelativePath="SmokeEffects.h"
+				>
+			</File>
+			<File
+				RelativePath="Structure Internals.h"
+				>
+			</File>
+			<File
+				RelativePath="structure.h"
+				>
+			</File>
+			<File
+				RelativePath="sysutil.h"
+				>
+			</File>
+			<File
+				RelativePath="Tactical Placement GUI.h"
+				>
+			</File>
+			<File
+				RelativePath="Tile Animation.h"
+				>
+			</File>
+			<File
+				RelativePath="Tile Cache.h"
+				>
+			</File>
+			<File
+				RelativePath="Tile Surface.h"
+				>
+			</File>
+			<File
+				RelativePath="TileDat.h"
+				>
+			</File>
+			<File
+				RelativePath="tiledef.h"
+				>
+			</File>
+			<File
+				RelativePath="TileEngine All.h"
+				>
+			</File>
+			<File
+				RelativePath="WorldDat.h"
+				>
+			</File>
+			<File
+				RelativePath="worlddef.h"
+				>
+			</File>
+			<File
+				RelativePath="worldman.h"
 				>
 			</File>
 		</Filter>
diff --git a/Utils/Utils_VS2008.vcproj b/Utils/Utils_VS2008.vcproj
index 98949876..4722e92d 100644
--- a/Utils/Utils_VS2008.vcproj
+++ b/Utils/Utils_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="Utils_VS2008"
-	ProjectGUID="{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}"
-	RootNamespace="Utils_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="Utils"
+	ProjectGUID="{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}"
+	RootNamespace="Utils"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,18 +40,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -83,10 +78,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +102,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +140,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +164,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +202,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,203 +225,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="chsRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -459,351 +265,351 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\_Ja25DutchText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\_Ja25EnglishText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\_Ja25FrenchText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\_Ja25GermanText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\_Ja25ItalianText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\_Ja25PolishText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\_Ja25RussianText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\_Ja25TaiwaneseText.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Animated ProgressBar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Cinematics.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Cursors.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Debug Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dsutil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Encrypted File.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Event Manager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Event Pump.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Font Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\INIReader.h"
-				>
-			</File>
-			<File
-				RelativePath=".\maputility.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MercTextBox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Multi Language Graphic Utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Multilingual Text Code Generator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Music Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PopUpBox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Quantize Wrap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Quantize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Slider.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Sound Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\STIConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Text Input.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Text.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Timer Control.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Utilities.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Utils All.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Win Util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WordWrap.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\_ChineseText.cpp"
+				RelativePath="_DutchText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_DutchText.cpp"
+				RelativePath="_EnglishText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_EnglishText.cpp"
+				RelativePath="_FrenchText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_FrenchText.cpp"
+				RelativePath="_GermanText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_GermanText.cpp"
+				RelativePath="_ItalianText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_ItalianText.cpp"
+				RelativePath="_Ja25DutchText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25ChineseText.cpp"
+				RelativePath="_Ja25EnglishText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25DutchText.cpp"
+				RelativePath="_Ja25FrenchText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25EnglishText.cpp"
+				RelativePath="_Ja25GermanText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25FrenchText.cpp"
+				RelativePath="_Ja25ItalianText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25GermanText.cpp"
+				RelativePath="_Ja25PolishText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25ItalianText.cpp"
+				RelativePath="_Ja25RussianText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25PolishText.cpp"
+				RelativePath="_Ja25TaiwaneseText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25RussianText.cpp"
+				RelativePath="_PolishText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_Ja25TaiwaneseText.cpp"
+				RelativePath="_RussianText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_PolishText.cpp"
+				RelativePath="_TaiwaneseText.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_RussianText.cpp"
+				RelativePath="Animated ProgressBar.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\_TaiwaneseText.cpp"
+				RelativePath="Cinematics.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Animated ProgressBar.cpp"
+				RelativePath="Cursors.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Cinematics.cpp"
+				RelativePath="Debug Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Cursors.cpp"
+				RelativePath="dsutil.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Debug Control.cpp"
+				RelativePath="Encrypted File.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\dsutil.cpp"
+				RelativePath="Event Manager.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Encrypted File.cpp"
+				RelativePath="Event Pump.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Event Manager.cpp"
+				RelativePath="Font Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Event Pump.cpp"
+				RelativePath="INIReader.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Font Control.cpp"
+				RelativePath="MapUtility.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\INIReader.cpp"
+				RelativePath="MercTextBox.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\MapUtility.cpp"
+				RelativePath="message.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\MercTextBox.cpp"
+				RelativePath="Multi Language Graphic Utils.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\message.cpp"
+				RelativePath="Multilingual Text Code Generator.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Multi Language Graphic Utils.cpp"
+				RelativePath="Music Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Multilingual Text Code Generator.cpp"
+				RelativePath="PopUpBox.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Music Control.cpp"
+				RelativePath="Quantize Wrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\PopUpBox.cpp"
+				RelativePath="Quantize.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Quantize Wrap.cpp"
+				RelativePath="Slider.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Quantize.cpp"
+				RelativePath="Sound Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Slider.cpp"
+				RelativePath="STIConvert.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Sound Control.cpp"
+				RelativePath="Text Input.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\STIConvert.cpp"
+				RelativePath="Text Utils.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Text Input.cpp"
+				RelativePath="Timer Control.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Text Utils.cpp"
+				RelativePath="Utilities.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Timer Control.cpp"
+				RelativePath="Win Util.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Utilities.cpp"
+				RelativePath="WordWrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\WordWrap.cpp"
+				RelativePath="XML_Items.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Items.cpp"
+				RelativePath="XML_Strings.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\XML_Strings.cpp"
+				RelativePath="XML_Strings2.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="_Ja25DutchText.h"
+				>
+			</File>
+			<File
+				RelativePath="_Ja25EnglishText.h"
+				>
+			</File>
+			<File
+				RelativePath="_Ja25FrenchText.h"
+				>
+			</File>
+			<File
+				RelativePath="_Ja25GermanText.h"
+				>
+			</File>
+			<File
+				RelativePath="_Ja25ItalianText.h"
+				>
+			</File>
+			<File
+				RelativePath="_Ja25PolishText.h"
+				>
+			</File>
+			<File
+				RelativePath="_Ja25RussianText.h"
+				>
+			</File>
+			<File
+				RelativePath="_Ja25TaiwaneseText.h"
+				>
+			</File>
+			<File
+				RelativePath="Animated ProgressBar.h"
+				>
+			</File>
+			<File
+				RelativePath="Cinematics.h"
+				>
+			</File>
+			<File
+				RelativePath="Cursors.h"
+				>
+			</File>
+			<File
+				RelativePath="Debug Control.h"
+				>
+			</File>
+			<File
+				RelativePath="dsutil.h"
+				>
+			</File>
+			<File
+				RelativePath="Encrypted File.h"
+				>
+			</File>
+			<File
+				RelativePath="Event Manager.h"
+				>
+			</File>
+			<File
+				RelativePath="Event Pump.h"
+				>
+			</File>
+			<File
+				RelativePath="Font Control.h"
+				>
+			</File>
+			<File
+				RelativePath="INIReader.h"
+				>
+			</File>
+			<File
+				RelativePath="maputility.h"
+				>
+			</File>
+			<File
+				RelativePath="MercTextBox.h"
+				>
+			</File>
+			<File
+				RelativePath="message.h"
+				>
+			</File>
+			<File
+				RelativePath="Multi Language Graphic Utils.h"
+				>
+			</File>
+			<File
+				RelativePath="Multilingual Text Code Generator.h"
+				>
+			</File>
+			<File
+				RelativePath="Music Control.h"
+				>
+			</File>
+			<File
+				RelativePath="PopUpBox.h"
+				>
+			</File>
+			<File
+				RelativePath="Quantize Wrap.h"
+				>
+			</File>
+			<File
+				RelativePath="Quantize.h"
+				>
+			</File>
+			<File
+				RelativePath="Slider.h"
+				>
+			</File>
+			<File
+				RelativePath="Sound Control.h"
+				>
+			</File>
+			<File
+				RelativePath="STIConvert.h"
+				>
+			</File>
+			<File
+				RelativePath="Text Input.h"
+				>
+			</File>
+			<File
+				RelativePath="Text.h"
+				>
+			</File>
+			<File
+				RelativePath="Timer Control.h"
+				>
+			</File>
+			<File
+				RelativePath="Utilities.h"
+				>
+			</File>
+			<File
+				RelativePath="Utils All.h"
+				>
+			</File>
+			<File
+				RelativePath="Win Util.h"
+				>
+			</File>
+			<File
+				RelativePath="WordWrap.h"
 				>
 			</File>
 		</Filter>
diff --git a/ja2_VS2008.sln b/ja2_VS2008.sln
index f49a1cec..11d2a81c 100644
--- a/ja2_VS2008.sln
+++ b/ja2_VS2008.sln
@@ -1,182 +1,136 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja2_VS2008", "ja2_VS2008.vcproj", "{F44669E7-74AC-444B-B75F-F16F4B9F0265}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja2", "ja2_VS2008.vcproj", "{BAB4E408-421C-4214-84ED-5469A24C8533}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E} = {5234CD2E-97F1-42FF-828D-CE0A1B46805E}
-		{F962CFA1-2215-4124-938F-253973A27591} = {F962CFA1-2215-4124-938F-253973A27591}
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6} = {60D793F2-90B4-43C9-83B5-221EE11B37E6}
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B} = {FC1938E8-9253-49A8-AA99-4639BBB46C1B}
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4} = {AB8837DB-0435-40C7-916A-0AACF5CFF1C4}
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76} = {A83DA7DA-2C31-45D8-9A69-B4993A885E76}
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032} = {27A49DAF-3F5A-4FF2-B943-9559F0B63032}
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096} = {D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF} = {6283CE93-2960-4596-8E74-7A6FBA8716FF}
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C} = {262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2} = {949A2F14-4838-46DF-AFF6-50B3B44417E2}
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3} = {80BE1D23-9651-47C8-AF66-6F76756E6CF3}
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA} = {5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}
+		{5E47B66B-6071-422C-B8CA-AF0689825767} = {5E47B66B-6071-422C-B8CA-AF0689825767}
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693} = {C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14} = {1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB} = {CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}
+		{B19F93C9-F829-4230-A805-6D809CF112F9} = {B19F93C9-F829-4230-A805-6D809CF112F9}
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB} = {5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A} = {AD7326E2-4A75-4A02-8930-762D3A532D8A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor_VS2008", "Editor\Editor_VS2008.vcproj", "{60D793F2-90B4-43C9-83B5-221EE11B37E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console\Console_VS2008.vcproj", "{5E47B66B-6071-422C-B8CA-AF0689825767}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Laptop_VS2008", "Laptop\Laptop_VS2008.vcproj", "{5234CD2E-97F1-42FF-828D-CE0A1B46805E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor", "Editor\Editor_VS2008.vcproj", "{B19F93C9-F829-4230-A805-6D809CF112F9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_VS2008", "lua\lua_VS2008.vcproj", "{A83DA7DA-2C31-45D8-9A69-B4993A885E76}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Laptop", "Laptop\Laptop_VS2008.vcproj", "{949A2F14-4838-46DF-AFF6-50B3B44417E2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SGP_VS2008", "Standard Gaming Platform\SGP_VS2008.vcproj", "{6283CE93-2960-4596-8E74-7A6FBA8716FF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua\lua_VS2008.vcproj", "{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Strategic_VS2008", "Strategic\Strategic_VS2008.vcproj", "{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SGP", "Standard Gaming Platform\SGP_VS2008.vcproj", "{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactical_VS2008", "Tactical\Tactical_VS2008.vcproj", "{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Strategic", "Strategic\Strategic_VS2008.vcproj", "{AD7326E2-4A75-4A02-8930-762D3A532D8A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TacticalAI_VS2008", "TacticalAI\TacticalAI_VS2008.vcproj", "{27A49DAF-3F5A-4FF2-B943-9559F0B63032}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tactical", "Tactical\Tactical_VS2008.vcproj", "{80BE1D23-9651-47C8-AF66-6F76756E6CF3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TileEngine_VS2008", "TileEngine\TileEngine_VS2008.vcproj", "{FC1938E8-9253-49A8-AA99-4639BBB46C1B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TacticalAI", "TacticalAI\TacticalAI_VS2008.vcproj", "{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils_VS2008", "Utils\Utils_VS2008.vcproj", "{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TileEngine", "TileEngine\TileEngine_VS2008.vcproj", "{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console_VS2008", "Console\Console_VS2008.vcproj", "{F962CFA1-2215-4124-938F-253973A27591}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils", "Utils\Utils_VS2008.vcproj", "{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		ChineseDebug|Win32 = ChineseDebug|Win32
-		ChineseRelease|Win32 = ChineseRelease|Win32
 		Debug|Win32 = Debug|Win32
 		MapEditor|Win32 = MapEditor|Win32
 		MapEditorD|Win32 = MapEditorD|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Debug|Win32.Build.0 = Debug|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Release|Win32.ActiveCfg = Release|Win32
-		{F44669E7-74AC-444B-B75F-F16F4B9F0265}.Release|Win32.Build.0 = Release|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Debug|Win32.Build.0 = Debug|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Release|Win32.ActiveCfg = Release|Win32
-		{60D793F2-90B4-43C9-83B5-221EE11B37E6}.Release|Win32.Build.0 = Release|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Debug|Win32.Build.0 = Debug|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Release|Win32.ActiveCfg = Release|Win32
-		{5234CD2E-97F1-42FF-828D-CE0A1B46805E}.Release|Win32.Build.0 = Release|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Debug|Win32.Build.0 = Debug|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Release|Win32.ActiveCfg = Release|Win32
-		{A83DA7DA-2C31-45D8-9A69-B4993A885E76}.Release|Win32.Build.0 = Release|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Debug|Win32.Build.0 = Debug|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Release|Win32.ActiveCfg = Release|Win32
-		{6283CE93-2960-4596-8E74-7A6FBA8716FF}.Release|Win32.Build.0 = Release|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Debug|Win32.Build.0 = Debug|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Release|Win32.ActiveCfg = Release|Win32
-		{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}.Release|Win32.Build.0 = Release|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Debug|Win32.Build.0 = Debug|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Release|Win32.ActiveCfg = Release|Win32
-		{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}.Release|Win32.Build.0 = Release|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Debug|Win32.Build.0 = Debug|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Release|Win32.ActiveCfg = Release|Win32
-		{27A49DAF-3F5A-4FF2-B943-9559F0B63032}.Release|Win32.Build.0 = Release|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Debug|Win32.Build.0 = Debug|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Release|Win32.ActiveCfg = Release|Win32
-		{FC1938E8-9253-49A8-AA99-4639BBB46C1B}.Release|Win32.Build.0 = Release|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.ChineseRelease|Win32.ActiveCfg = chsRelease|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.ChineseRelease|Win32.Build.0 = chsRelease|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Debug|Win32.Build.0 = Debug|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Release|Win32.ActiveCfg = Release|Win32
-		{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}.Release|Win32.Build.0 = Release|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.ChineseDebug|Win32.ActiveCfg = ChineseDebug|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.ChineseDebug|Win32.Build.0 = ChineseDebug|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.ChineseRelease|Win32.ActiveCfg = ChineseRelease|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.ChineseRelease|Win32.Build.0 = ChineseRelease|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.Debug|Win32.Build.0 = Debug|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.MapEditor|Win32.Build.0 = MapEditor|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.Release|Win32.ActiveCfg = Release|Win32
-		{F962CFA1-2215-4124-938F-253973A27591}.Release|Win32.Build.0 = Release|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.Debug|Win32.Build.0 = Debug|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.Release|Win32.ActiveCfg = Release|Win32
+		{BAB4E408-421C-4214-84ED-5469A24C8533}.Release|Win32.Build.0 = Release|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.Debug|Win32.Build.0 = Debug|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.Release|Win32.ActiveCfg = Release|Win32
+		{5E47B66B-6071-422C-B8CA-AF0689825767}.Release|Win32.Build.0 = Release|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.Debug|Win32.Build.0 = Debug|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.Release|Win32.ActiveCfg = Release|Win32
+		{B19F93C9-F829-4230-A805-6D809CF112F9}.Release|Win32.Build.0 = Release|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.Debug|Win32.Build.0 = Debug|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.Release|Win32.ActiveCfg = Release|Win32
+		{949A2F14-4838-46DF-AFF6-50B3B44417E2}.Release|Win32.Build.0 = Release|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.Debug|Win32.Build.0 = Debug|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.Release|Win32.ActiveCfg = Release|Win32
+		{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}.Release|Win32.Build.0 = Release|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.Debug|Win32.Build.0 = Debug|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.Release|Win32.ActiveCfg = Release|Win32
+		{5FD3FB5E-D0E5-4C0C-90BC-65EFF70D62EA}.Release|Win32.Build.0 = Release|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.Debug|Win32.Build.0 = Debug|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.Release|Win32.ActiveCfg = Release|Win32
+		{AD7326E2-4A75-4A02-8930-762D3A532D8A}.Release|Win32.Build.0 = Release|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.Debug|Win32.Build.0 = Debug|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.Release|Win32.ActiveCfg = Release|Win32
+		{80BE1D23-9651-47C8-AF66-6F76756E6CF3}.Release|Win32.Build.0 = Release|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.Debug|Win32.Build.0 = Debug|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.Release|Win32.ActiveCfg = Release|Win32
+		{CE9010A3-4DE2-4C20-9EE8-6E2F2CA42ACB}.Release|Win32.Build.0 = Release|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.Debug|Win32.Build.0 = Debug|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.Release|Win32.ActiveCfg = Release|Win32
+		{1437EB92-83CB-4F0D-A1DB-1576FFEF3F14}.Release|Win32.Build.0 = Release|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.Debug|Win32.Build.0 = Debug|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.MapEditor|Win32.ActiveCfg = MapEditor|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.MapEditor|Win32.Build.0 = MapEditor|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.MapEditorD|Win32.ActiveCfg = MapEditorD|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.MapEditorD|Win32.Build.0 = MapEditorD|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.Release|Win32.ActiveCfg = Release|Win32
+		{5FDBE9C9-E6E3-42A8-A5C4-6EA9E073A5FB}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ja2_VS2008.vcproj b/ja2_VS2008.vcproj
index d383e68c..a3bc7577 100644
--- a/ja2_VS2008.vcproj
+++ b/ja2_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="ja2_VS2008"
-	ProjectGUID="{F44669E7-74AC-444B-B75F-F16F4B9F0265}"
-	RootNamespace="ja2_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="ja2"
+	ProjectGUID="{BAB4E408-421C-4214-84ED-5469A24C8533}"
+	RootNamespace="ja2"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,11 +17,10 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="\games\jagged alliance 2"
+			OutputDirectory="\Games\Jagged Alliance 2"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Debug.vsprops"
-			UseOfMFC="0"
+			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Debug.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -42,19 +40,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				FavorSizeOrSpeed="0"
-				AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -67,11 +60,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ja2_debug_2417_en.exe"
+				AdditionalDependencies="Winmm.lib RakNetLibStaticDebug.lib ws2_32.lib"
+				OutputFile="$(OutDir)\ja2_debug_2445_en.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="Multiplayer\raknet"
+				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				EntryPointSymbol=""
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -96,6 +92,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -103,8 +100,7 @@
 			OutputDirectory="\games\jagged alliance 2"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\ja2_VS2008.vsprops"
-			UseOfMFC="0"
+			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -125,13 +121,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="false"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -146,15 +141,17 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ja2_release_2417_en.exe"
+				AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
+				OutputFile="$(OutDir)\ja2_release_2445_en.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
+				AdditionalLibraryDirectories="Multiplayer\raknet"
+				IgnoreDefaultLibraryNames="libcmt"
+				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				OptimizeForWindows98="0"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -179,7 +176,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -187,8 +183,7 @@
 			OutputDirectory="\games\jagged alliance 2"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Editor.vsprops"
-			UseOfMFC="0"
+			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops;.\ja2_VS2008Editor.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -209,13 +204,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="false"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -230,15 +224,17 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
-				OutputFile="$(OutDir)\Map Editor_2389_en.exe"
+				AdditionalDependencies="Winmm.lib RakNetLibStatic.lib ws2_32.lib"
+				OutputFile="$(OutDir)\MapEditor_release_2389_en.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
+				AdditionalLibraryDirectories="Multiplayer\raknet"
+				IgnoreDefaultLibraryNames="libcmt"
+				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				OptimizeForWindows98="0"
+				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -263,7 +259,6 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -271,8 +266,7 @@
 			OutputDirectory="\games\jagged alliance 2"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Editor.vsprops"
-			UseOfMFC="0"
+			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Linker.vsprops;.\ja2_VS2008Libs.vsprops;.\ja2_VS2008Editor.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -292,18 +286,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -316,175 +306,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
-				OutputFile="$(OutDir)\Map EditorD_2389_en.exe"
+				AdditionalDependencies="Winmm.lib RakNetLibStaticDebug.lib ws2_32.lib"
+				OutputFile="$(OutDir)\MapEditor_debug_2389_en.exe"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="Multiplayer\raknet"
+				IgnoreDefaultLibraryNames="libcmtd"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="d:\game\ja2 1.13"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\ja2_VS2008.vsprops;.\ja2_VS2008Debug.vsprops"
-			UseOfMFC="0"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ja2_debug_2389_cn.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\ja2_VS2008.vsprops"
-			UseOfMFC="0"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINFONTS;CHINESE"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ja2_release_2389_en.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapFileName="$(TargetDir)$(TargetName).map"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EntryPointSymbol=""
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -522,95 +351,95 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\aniviewscreen.cpp"
+				RelativePath="aniviewscreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Credits.cpp"
+				RelativePath="Credits.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Fade Screen.cpp"
+				RelativePath="Fade Screen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\GameInitOptionsScreen.cpp"
+				RelativePath="GameInitOptionsScreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\gameloop.cpp"
+				RelativePath="gameloop.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\gamescreen.cpp"
+				RelativePath="gamescreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\GameSettings.cpp"
+				RelativePath="GameSettings.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\GameVersion.cpp"
+				RelativePath="GameVersion.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\HelpScreen.cpp"
+				RelativePath="HelpScreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Init.cpp"
+				RelativePath="Init.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Intro.cpp"
+				RelativePath="Intro.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\JA2 Splash.cpp"
+				RelativePath="JA2 Splash.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\jascreens.cpp"
+				RelativePath="jascreens.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Language Defines.cpp"
+				RelativePath="Language Defines.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Loading Screen.cpp"
+				RelativePath="Loading Screen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\MainMenuScreen.cpp"
+				RelativePath="MainMenuScreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\MessageBoxScreen.cpp"
+				RelativePath="MessageBoxScreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Options Screen.cpp"
+				RelativePath="Options Screen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\profiler.cpp"
+				RelativePath="profiler.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SaveLoadGame.cpp"
+				RelativePath="SaveLoadGame.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SaveLoadScreen.cpp"
+				RelativePath="SaveLoadScreen.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\SCREENS.cpp"
+				RelativePath="SCREENS.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Sys Globals.cpp"
+				RelativePath="Sys Globals.cpp"
 				>
 			</File>
 		</Filter>
@@ -620,131 +449,131 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\builddefines.h"
+				RelativePath="builddefines.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Cheats.h"
+				RelativePath="Cheats.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Credits.h"
+				RelativePath="Credits.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Fade Screen.h"
+				RelativePath="Fade Screen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\GameInitOptionsScreen.h"
+				RelativePath="GameInitOptionsScreen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\gameloop.h"
+				RelativePath="gameloop.h"
 				>
 			</File>
 			<File
-				RelativePath=".\gamescreen.h"
+				RelativePath="gamescreen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\GameSettings.h"
+				RelativePath="GameSettings.h"
 				>
 			</File>
 			<File
-				RelativePath=".\GameVersion.h"
+				RelativePath="GameVersion.h"
 				>
 			</File>
 			<File
-				RelativePath=".\HelpScreen.h"
+				RelativePath="HelpScreen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\HelpScreenText.h"
+				RelativePath="HelpScreenText.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Init.h"
+				RelativePath="Init.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Intro.h"
+				RelativePath="Intro.h"
 				>
 			</File>
 			<File
-				RelativePath=".\JA2 All.h"
+				RelativePath="JA2 All.h"
 				>
 			</File>
 			<File
-				RelativePath=".\JA2 Demo Ads.h"
+				RelativePath="JA2 Demo Ads.h"
 				>
 			</File>
 			<File
-				RelativePath=".\JA2 Splash.h"
+				RelativePath="JA2 Splash.h"
 				>
 			</File>
 			<File
-				RelativePath=".\ja2.h"
+				RelativePath="ja2.h"
 				>
 			</File>
 			<File
-				RelativePath=".\JA2Prototypes.h"
+				RelativePath="JA2Prototypes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\jascreens.h"
+				RelativePath="jascreens.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Language Defines.h"
+				RelativePath="Language Defines.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Loading Screen.h"
+				RelativePath="Loading Screen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\local.h"
+				RelativePath="local.h"
 				>
 			</File>
 			<File
-				RelativePath=".\mainmenuscreen.h"
+				RelativePath="mainmenuscreen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\MessageBoxScreen.h"
+				RelativePath="MessageBoxScreen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\Options Screen.h"
+				RelativePath="Options Screen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\profiler.h"
+				RelativePath="profiler.h"
 				>
 			</File>
 			<File
-				RelativePath=".\SaveLoadGame.h"
+				RelativePath="SaveLoadGame.h"
 				>
 			</File>
 			<File
-				RelativePath=".\SaveLoadScreen.h"
+				RelativePath="SaveLoadScreen.h"
 				>
 			</File>
 			<File
-				RelativePath=".\screenids.h"
+				RelativePath="screenids.h"
 				>
 			</File>
 			<File
-				RelativePath=".\SCREENS.H"
+				RelativePath="SCREENS.H"
 				>
 			</File>
 			<File
-				RelativePath=".\Sys Globals.h"
+				RelativePath="Sys Globals.h"
 				>
 			</File>
 			<File
-				RelativePath=".\VtuneApi.h"
+				RelativePath="VtuneApi.h"
 				>
 			</File>
 		</Filter>
@@ -754,67 +583,15 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\Console\Console.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories=".\Res"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories=".\Res"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditor|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories=".\Res"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MapEditorD|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories=".\Res"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseDebug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories=".\Res"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ChineseRelease|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories=".\Res"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\Res\ja2.rc"
+				RelativePath="Res\ja2.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\Res\jagged3.ico"
+				RelativePath="Res\jagged3.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\Res\resource.h"
+				RelativePath="Res\resource.h"
 				>
 			</File>
 		</Filter>
@@ -823,229 +600,41 @@
 			>
 			<Filter
 				Name="Header Files"
-				Filter="h;hpp;hxx;hm;inl;inc;xsd"
 				>
 				<File
-					RelativePath=".\Multiplayer\connect.h"
+					RelativePath="Multiplayer\connect.h"
 					>
 				</File>
 				<File
-					RelativePath=".\Multiplayer\fresh_header.h"
+					RelativePath="Multiplayer\fresh_header.h"
 					>
 				</File>
 				<File
-					RelativePath=".\Multiplayer\network.h"
+					RelativePath="Multiplayer\network.h"
 					>
 				</File>
 				<File
-					RelativePath=".\Multiplayer\test_space.h"
+					RelativePath="Multiplayer\test_space.h"
 					>
 				</File>
 			</Filter>
 			<Filter
 				Name="Source Files"
-				Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 				>
 				<File
-					RelativePath=".\Multiplayer\client.cpp"
+					RelativePath="Multiplayer\client.cpp"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MapEditor|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MapEditorD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ChineseDebug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ChineseRelease|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\Multiplayer\server.cpp"
+					RelativePath="Multiplayer\server.cpp"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MapEditor|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MapEditorD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ChineseDebug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ChineseRelease|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\Multiplayer\test_space.cpp"
+					RelativePath="Multiplayer\test_space.cpp"
 					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MapEditor|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MapEditorD|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ChineseDebug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="ChineseRelease|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>
-		<File
-			RelativePath=".\fmodvc.lib"
-			>
-		</File>
-		<File
-			RelativePath=".\libexpatMT.lib"
-			>
-		</File>
-		<File
-			RelativePath=".\lua51.lib"
-			>
-		</File>
-		<File
-			RelativePath=".\mss32.lib"
-			>
-		</File>
-		<File
-			RelativePath=".\SMACKW32.LIB"
-			>
-		</File>
-		<File
-			RelativePath=".\VtuneApi.lib"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/ja2_VS2008.vsprops b/ja2_VS2008.vsprops
index 6b8c4be8..5f7f17a4 100644
--- a/ja2_VS2008.vsprops
+++ b/ja2_VS2008.vsprops
@@ -2,12 +2,12 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ja2_VS2008"
+	Name="ja2"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\Utils;..\TileEngine;..\TacticalAI;..\Tactical;..\Strategic;&quot;..\Standard Gaming Platform&quot;;..\Res;..\lua;..\Laptop;..\Editor;..\;..\Console;$(NOINHERIT)"
-		PreprocessorDefinitions="JA2;CINTERFACE;XML_STATIC"
+		AdditionalIncludeDirectories=".\.;..\.;..\Utils;.\Utils;..\TileEngine;.\TileEngine;..\TacticalAI;.\TacticalAI;..\Tactical;.\Tactical;..\Strategic;.\Strategic;&quot;..\Standard Gaming Platform&quot;;&quot;.\Standard Gaming Platform&quot;;..\Res;.\Res;..\lua;.\lua;..\Laptop;.\Laptop;..\Multiplayer;.\Multiplayer;..\Multiplayer\raknet;.\Multiplayer\raknet;..\Editor;.\Editor;..\Console;.\Console;$(NOINHERIT)"
+		PreprocessorDefinitions="JA2;CINTERFACE;XML_STATIC;_CRT_SECURE_NO_DEPRECATE"
 		Detect64BitPortabilityProblems="false"
 	/>
 </VisualStudioPropertySheet>
diff --git a/ja2_VS2008Debug.vsprops b/ja2_VS2008Debug.vsprops
index f0268c82..90a657fa 100644
--- a/ja2_VS2008Debug.vsprops
+++ b/ja2_VS2008Debug.vsprops
@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ja2_VS2008Debug"
+	Name="ja2_Debug"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/ja2_VS2008Editor.vsprops b/ja2_VS2008Editor.vsprops
index 221626a7..8de3b034 100644
--- a/ja2_VS2008Editor.vsprops
+++ b/ja2_VS2008Editor.vsprops
@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ja2_VS2008Editor"
+	Name="ja2_Editor"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/ja2_VS2008Libs.vsprops b/ja2_VS2008Libs.vsprops
new file mode 100644
index 00000000..2606ab9c
--- /dev/null
+++ b/ja2_VS2008Libs.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ja2_Libs"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalLibraryDirectories="&quot;.\Standard Gaming Platform&quot;"
+		AdditionalDependencies="libexpatMT.lib mss32.lib SMACKW32.LIB fmodvc.lib lua51.vc9.lib VtuneApi.lib ddraw.lib"
+	/>
+</VisualStudioPropertySheet>
diff --git a/ja2_VS2008Linker.vsprops b/ja2_VS2008Linker.vsprops
new file mode 100644
index 00000000..c5196faf
--- /dev/null
+++ b/ja2_VS2008Linker.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ja2_Linker"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalLibraryDirectories="lib\$(ConfigurationName)"
+		AdditionalDependencies="Console.lib Editor.lib Laptop.lib lua.lib SGP.lib Strategic.lib Tactical.lib TacticalAI.lib TileEngine.lib Utils.lib"
+	/>
+</VisualStudioPropertySheet>
diff --git a/lua/lua_VS2008.vcproj b/lua/lua_VS2008.vcproj
index 6c531732..7d9a365c 100644
--- a/lua/lua_VS2008.vcproj
+++ b/lua/lua_VS2008.vcproj
@@ -2,11 +2,10 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="lua_VS2008"
-	ProjectGUID="{A83DA7DA-2C31-45D8-9A69-B4993A885E76}"
-	RootNamespace="lua_VS2008"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	Name="lua"
+	ProjectGUID="{C6EBEF77-2FAF-4F79-A38A-F2BB529A6693}"
+	RootNamespace="lua"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -18,10 +17,11 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,15 +40,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4100"
@@ -83,10 +80,12 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,13 +104,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -145,10 +142,12 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditor|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -167,13 +166,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -207,10 +204,11 @@
 		</Configuration>
 		<Configuration
 			Name="MapEditorD|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -229,15 +227,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4100"
@@ -270,194 +265,67 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="ChineseDebug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;CHINESE;WINFONTS;SGP_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4100"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ChineseRelease|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\Multiplayer"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\lauxlib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Lua Interpreter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lua.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lua.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\luaconf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lualib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lwstring.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\lua.cpp"
+				RelativePath="lua.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\lua_env.cpp"
+				RelativePath="lua_env.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\lua_strategic.cpp"
+				RelativePath="lua_strategic.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\lua_tactical.cpp"
+				RelativePath="lua_tactical.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\lwstring.cpp"
+				RelativePath="lwstring.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="lauxlib.h"
+				>
+			</File>
+			<File
+				RelativePath="Lua Interpreter.h"
+				>
+			</File>
+			<File
+				RelativePath="lua.h"
+				>
+			</File>
+			<File
+				RelativePath="lua.hpp"
+				>
+			</File>
+			<File
+				RelativePath="luaconf.h"
+				>
+			</File>
+			<File
+				RelativePath="lualib.h"
+				>
+			</File>
+			<File
+				RelativePath="lwstring.h"
 				>
 			</File>
 		</Filter>
diff --git a/lua51.vc9.lib b/lua51.vc9.lib
new file mode 100644
index 00000000..6a84909e
Binary files /dev/null and b/lua51.vc9.lib differ