diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_cmake/how-to-build.txt b/sonic3air-main/Oxygen/oxygenserver/build/_cmake/how-to-build.txt
new file mode 100644
index 00000000..f9184381
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_cmake/how-to-build.txt
@@ -0,0 +1,9 @@
+
+=== Build under Linux ===
+
+First make sure all packages are installed that are needed for building Sonic 3 A.I.R.
+
+Then setup and build with CMake:
+	- cd ./Oxygen/oxygenserver/source/_cmake/build
+	- cmake -DCMAKE_BUILD_TYPE=Release ..
+	- cmake --build .
diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygen.props b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygen.props
new file mode 100644
index 00000000..ffba9d3c
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygen.props
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\..\..\..\framework\build\workspace.props" />
+    <Import Project="..\..\..\..\framework\build\externals.props" />
+  </ImportGroup>
+</Project>
diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.sln b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.sln
new file mode 100644
index 00000000..bf33dcc5
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.sln
@@ -0,0 +1,70 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31829.152
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygenserver", "oxygenserver.vcxproj", "{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}"
+	ProjectSection(ProjectDependencies) = postProject
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78} = {488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "testclient.vcxproj", "{5D7C8F86-FB87-4784-8F32-144D3FE545F0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78} = {488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygen_netcore", "..\..\..\oxygenengine\build\_vstudio\oxygen_netcore.vcxproj", "{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "restarter", "restarter.vcxproj", "{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78} = {488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Debug|x64.ActiveCfg = Debug|x64
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Debug|x64.Build.0 = Debug|x64
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Debug|x86.ActiveCfg = Debug|Win32
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Debug|x86.Build.0 = Debug|Win32
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Release|x64.ActiveCfg = Release|x64
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Release|x64.Build.0 = Release|x64
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Release|x86.ActiveCfg = Release|Win32
+		{8E1BE2EF-A43F-482F-B5BF-BBE4182AF009}.Release|x86.Build.0 = Release|Win32
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Debug|x64.ActiveCfg = Debug|x64
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Debug|x64.Build.0 = Debug|x64
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Debug|x86.ActiveCfg = Debug|Win32
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Debug|x86.Build.0 = Debug|Win32
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Release|x64.ActiveCfg = Release|x64
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Release|x64.Build.0 = Release|x64
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Release|x86.ActiveCfg = Release|Win32
+		{5D7C8F86-FB87-4784-8F32-144D3FE545F0}.Release|x86.Build.0 = Release|Win32
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Debug|x64.ActiveCfg = Debug|x64
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Debug|x64.Build.0 = Debug|x64
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Debug|x86.ActiveCfg = Debug|Win32
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Debug|x86.Build.0 = Debug|Win32
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Release|x64.ActiveCfg = Release|x64
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Release|x64.Build.0 = Release|x64
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Release|x86.ActiveCfg = Release|Win32
+		{488CD7A3-2B09-43AC-82B2-8D72DEBFBB78}.Release|x86.Build.0 = Release|Win32
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Debug|x64.ActiveCfg = Debug|x64
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Debug|x64.Build.0 = Debug|x64
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Debug|x86.ActiveCfg = Debug|Win32
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Debug|x86.Build.0 = Debug|Win32
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Release|x64.ActiveCfg = Release|x64
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Release|x64.Build.0 = Release|x64
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Release|x86.ActiveCfg = Release|Win32
+		{9CE1F342-4F28-4ECF-A9D3-F7D6E46222B4}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7CDBDD62-9EE2-4769-9B56-174849FCA876}
+	EndGlobalSection
+EndGlobal
diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.vcxproj b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.vcxproj
new file mode 100644
index 00000000..ed20a1ca
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.vcxproj
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{8e1be2ef-a43f-482f-b5bf-bbe4182af009}</ProjectGuid>
+    <RootNamespace>oxygenserver</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>OXYGEN_SERVER;WIN32;DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>oxygenserver/pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>OXYGEN_SERVER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>oxygenserver/pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>OXYGEN_SERVER;DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>oxygenserver/pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>OXYGEN_SERVER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>oxygenserver/pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\source\oxygenserver\Configuration.h" />
+    <ClInclude Include="..\..\source\oxygenserver\pch.h" />
+    <ClInclude Include="..\..\source\oxygenserver\server\CrashHandler.h" />
+    <ClInclude Include="..\..\source\oxygenserver\server\Server.h" />
+    <ClInclude Include="..\..\source\oxygenserver\server\ServerNetConnection.h" />
+    <ClInclude Include="..\..\source\oxygenserver\subsystems\Channels.h" />
+    <ClInclude Include="..\..\source\oxygenserver\subsystems\UpdateCheck.h" />
+    <ClInclude Include="..\..\source\oxygenserver\subsystems\VirtualDirectory.h" />
+    <ClInclude Include="..\..\source\PrivatePackets.h" />
+    <ClInclude Include="..\..\source\Shared.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\oxygenserver\Configuration.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\main_server.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\source\oxygenserver\server\CrashHandler.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\server\Server.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\server\ServerNetConnection.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\subsystems\Channels.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\subsystems\UpdateCheck.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\subsystems\VirtualDirectory.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.vcxproj.filters b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.vcxproj.filters
new file mode 100644
index 00000000..c364c965
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/oxygenserver.vcxproj.filters
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClInclude Include="..\..\source\oxygenserver\pch.h" />
+    <ClInclude Include="..\..\source\Shared.h">
+      <Filter>_shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\oxygenserver\subsystems\Channels.h">
+      <Filter>subsystems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\oxygenserver\server\Server.h">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\oxygenserver\server\ServerNetConnection.h">
+      <Filter>server</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\PrivatePackets.h">
+      <Filter>_shared</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\oxygenserver\subsystems\VirtualDirectory.h">
+      <Filter>subsystems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\oxygenserver\Configuration.h" />
+    <ClInclude Include="..\..\source\oxygenserver\subsystems\UpdateCheck.h">
+      <Filter>subsystems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\oxygenserver\server\CrashHandler.h">
+      <Filter>server</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\oxygenserver\main_server.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\pch.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\subsystems\Channels.cpp">
+      <Filter>subsystems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\oxygenserver\server\Server.cpp">
+      <Filter>server</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\oxygenserver\server\ServerNetConnection.cpp">
+      <Filter>server</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\oxygenserver\subsystems\VirtualDirectory.cpp">
+      <Filter>subsystems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\oxygenserver\Configuration.cpp" />
+    <ClCompile Include="..\..\source\oxygenserver\subsystems\UpdateCheck.cpp">
+      <Filter>subsystems</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\oxygenserver\server\CrashHandler.cpp">
+      <Filter>server</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="_shared">
+      <UniqueIdentifier>{2bf4508e-2bb1-4ab8-8ed6-a067a4aade8f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="subsystems">
+      <UniqueIdentifier>{4e8bf536-cbc2-4861-b9a3-9d5553dc4cd9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="server">
+      <UniqueIdentifier>{77fe760a-f82f-48f5-a91c-611793263c80}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/restarter.vcxproj b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/restarter.vcxproj
new file mode 100644
index 00000000..8b270543
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/restarter.vcxproj
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{9ce1f342-4f28-4ecf-a9d3-f7d6e46222b4}</ProjectGuid>
+    <RootNamespace>restarter</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\sdl</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\sdl</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\sdl</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\sdl</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\restarter\main_restarter.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/restarter.vcxproj.filters b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/restarter.vcxproj.filters
new file mode 100644
index 00000000..6e0b1587
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/restarter.vcxproj.filters
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\source\restarter\main_restarter.cpp" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/testclient.vcxproj b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/testclient.vcxproj
new file mode 100644
index 00000000..990e7c5c
--- /dev/null
+++ b/sonic3air-main/Oxygen/oxygenserver/build/_vstudio/testclient.vcxproj
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{5d7c8f86-fb87-4784-8f32-144d3fe545f0}</ProjectGuid>
+    <RootNamespace>testclient</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="oxygen.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(ProjectDir)..\..\bin\$(Configuration)_$(BuildCode)\</OutDir>
+    <IntDir>tmp\$(ProjectName)_$(Configuration)_$(BuildCode)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <AdditionalIncludeDirectories>../../source;../../../oxygenengine/source;$(WorkspaceDir)\librmx\source\;$(FrameworkIncDir);$(FrameworkIncDir)\freetype;$(FrameworkIncDir)\freeimage;$(FrameworkIncDir)\minizip;$(FrameworkIncDir)\sdl;$(FrameworkIncDir)\zlib</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>oxygen_netcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../../oxygenengine/build/_vstudio/lib/$(Configuration)_$(BuildCode)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\source\testclient\main_client.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\source\PrivatePackets.h" />
+    <ClInclude Include="..\..\source\Shared.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file