diff --git a/.gitignore b/.gitignore
index 73273b3..0d772df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -232,3 +232,5 @@ $RECYCLE.BIN/
 
 # userprefs belong to the user
 *.userprefs
+
+.vs/
diff --git a/DemoInfo.sln b/DemoInfo.sln
index 78d5303..6d8497a 100644
--- a/DemoInfo.sln
+++ b/DemoInfo.sln
@@ -1,38 +1,30 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoInfo", "DemoInfo\DemoInfo.csproj", "{22D4CFC7-6810-4C18-A353-71A49782394F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevNullPlayer", "DevNullPlayer\DevNullPlayer.csproj", "{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing", "Testing\Testing.csproj", "{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Testing", "Testing\Testing.csproj", "{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Bitstream-Debugging|Any CPU = Bitstream-Debugging|Any CPU
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
-		Bitstream-Debugging|Any CPU = Bitstream-Debugging|Any CPU
 		SavePropValues|Any CPU = SavePropValues|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{22D4CFC7-6810-4C18-A353-71A49782394F}.Bitstream-Debugging|Any CPU.ActiveCfg = Bitstream-Debugging|Any CPU
-		{22D4CFC7-6810-4C18-A353-71A49782394F}.Bitstream-Debugging|Any CPU.Build.0 = Bitstream-Debugging|Any CPU
+		{22D4CFC7-6810-4C18-A353-71A49782394F}.Bitstream-Debugging|Any CPU.ActiveCfg = Debug|Any CPU
+		{22D4CFC7-6810-4C18-A353-71A49782394F}.Bitstream-Debugging|Any CPU.Build.0 = Debug|Any CPU
 		{22D4CFC7-6810-4C18-A353-71A49782394F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{22D4CFC7-6810-4C18-A353-71A49782394F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{22D4CFC7-6810-4C18-A353-71A49782394F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22D4CFC7-6810-4C18-A353-71A49782394F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22D4CFC7-6810-4C18-A353-71A49782394F}.SavePropValues|Any CPU.ActiveCfg = SavePropValues|Any CPU
-		{22D4CFC7-6810-4C18-A353-71A49782394F}.SavePropValues|Any CPU.Build.0 = SavePropValues|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Bitstream-Debugging|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Bitstream-Debugging|Any CPU.Build.0 = Debug|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.SavePropValues|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.SavePropValues|Any CPU.Build.0 = Debug|Any CPU
+		{22D4CFC7-6810-4C18-A353-71A49782394F}.SavePropValues|Any CPU.ActiveCfg = Release|Any CPU
+		{22D4CFC7-6810-4C18-A353-71A49782394F}.SavePropValues|Any CPU.Build.0 = Release|Any CPU
 		{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}.Bitstream-Debugging|Any CPU.ActiveCfg = Debug|Any CPU
 		{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}.Bitstream-Debugging|Any CPU.Build.0 = Debug|Any CPU
 		{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -41,8 +33,19 @@ Global
 		{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}.SavePropValues|Any CPU.ActiveCfg = Debug|Any CPU
 		{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}.SavePropValues|Any CPU.Build.0 = Debug|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Bitstream-Debugging|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Bitstream-Debugging|Any CPU.Build.0 = Debug|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.SavePropValues|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}.SavePropValues|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {35CC7822-5EA5-44FD-86AF-E18EA19EB128}
+	EndGlobalSection
 EndGlobal
diff --git a/DemoInfo/DemoInfo.csproj b/DemoInfo/DemoInfo.csproj
index 48107e3..4f1b5d9 100644
--- a/DemoInfo/DemoInfo.csproj
+++ b/DemoInfo/DemoInfo.csproj
@@ -1,137 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{22D4CFC7-6810-4C18-A353-71A49782394F}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DemoInfo</RootNamespace>
-    <AssemblyName>DemoInfo</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>netcoreapp3.1;netstandard2.0;net45</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
-    <DelaySign>true</DelaySign>
     <AssemblyOriginatorKeyFile>demoinfo-release.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;YOLO</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Release\DemoInfo.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Bitstream-Debugging|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;BITSTREAMDEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'YoloDebug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;YOLO;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'SavePropValues|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;SAVE_PROP_VALUES</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <DelaySign>true</DelaySign>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Version>1.4.0</Version>
+    <ApplicationIcon />
+    <StartupObject />
   </PropertyGroup>
-  <ItemGroup>
+  
+  <!-- Conditionally obtain references for the .NET Framework 4.5 target -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DemoParser.cs" />
-    <Compile Include="DP\DemoPacketParser.cs" />
-    <Compile Include="DP\Entity.cs" />
-    <Compile Include="DP\FastNetmessages\RankUpdate.cs" />
-    <Compile Include="DP\FastNetmessages\SayText.cs" />
-    <Compile Include="DP\FastNetmessages\SayText2.cs" />
-    <Compile Include="DP\FastNetmessages\ServerRankUpdate.cs" />
-    <Compile Include="DP\FastNetmessages\UserMessage.cs" />
-    <Compile Include="DP\Handler\GameEventHandler.cs" />
-    <Compile Include="DP\Handler\PacketEntitesHandler.cs" />
-    <Compile Include="DP\Handler\PropDecoder.cs" />
-    <Compile Include="DP\Handler\CreateStringTableUserInfoHandler.cs" />
-    <Compile Include="DP\Handler\UpdateStringTableUserInfoHandler.cs" />
-    <Compile Include="DP\IMessageParser.cs" />
-    <Compile Include="DT\DataTableParser.cs" />
-    <Compile Include="DT\SendTableProperty.cs" />
-    <Compile Include="DT\SendTable.cs" />
-    <Compile Include="DT\ServerClass.cs" />
-    <Compile Include="Events.cs" />
-    <Compile Include="Helper.cs" />
-    <Compile Include="Messages\netmessages.cs" />
-    <Compile Include="Messages\usermessages.cs" />
-    <Compile Include="Player.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Structs.cs" />
-    <Compile Include="ST\StringTableParser.cs" />
-    <Compile Include="DP\Handler\UserMessageHandler.cs" />
-    <Compile Include="LimitStream.cs" />
-    <Compile Include="BitStream\BitArrayStream.cs" />
-    <Compile Include="BitStream\BitStreamUtil.cs" />
-    <Compile Include="BitStream\ManagedBitStream.cs" />
-    <Compile Include="BitStream\DebugBitStream.cs" />
-    <Compile Include="BitStream\IBitStream.cs" />
-    <Compile Include="BitStream\UnsafeBitStream.cs" />
-    <Compile Include="Messages\steammessages.cs" />
-    <Compile Include="Messages\gcmessages.cs" />
-    <Compile Include="DP\FastNetmessages\NETTick.cs" />
-    <Compile Include="DP\FastNetmessages\PacketEntities.cs" />
-    <Compile Include="DP\FastNetmessages\GameEventList.cs" />
-    <Compile Include="DP\FastNetmessages\GameEvent.cs" />
-    <Compile Include="DP\FastNetmessages\CreateStringTable.cs" />
-    <Compile Include="DP\FastNetmessages\UpdateStringTable.cs" />
-    <Compile Include="DP\FastNetmessages\SendTable.cs" />
-    <Compile Include="Messages\EnumConstants.cs" />
-    <Compile Include="AdditionalPlayerInformation.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <ItemGroup />
-  <ItemGroup>
-    <Folder Include="DP\FastNetmessages\" />
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
 </Project>
diff --git a/DemoInfo/Properties/AssemblyInfo.cs b/DemoInfo/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7a6d46a..0000000
--- a/DemoInfo/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DemoInfo")]
-[assembly: AssemblyDescription("This is a C#-Library that makes reading CS:GO-Demos and analyzing them easier.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("EHVAG")]
-[assembly: AssemblyProduct("DemoInfo")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("adb0b537-c842-4082-9588-e5d3c762f541")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/DevNullPlayer/DevNullPlayer.csproj b/DevNullPlayer/DevNullPlayer.csproj
index ccfee05..683e894 100644
--- a/DevNullPlayer/DevNullPlayer.csproj
+++ b/DevNullPlayer/DevNullPlayer.csproj
@@ -1,53 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CDC69D65-52DD-45D5-97F8-A7711F35BDC5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>DevNullPlayer</RootNamespace>
-    <AssemblyName>DevNullPlayer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>netcoreapp3.1;netstandard2.0;net45</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Commandlineparameters>/home/moritz/Desktop/ldlcpass.dem</Commandlineparameters>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Commandlineparameters>/home/moritz/Desktop/ldlcpass.dem</Commandlineparameters>
-    <ConsolePause>false</ConsolePause>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'SavePropValues|AnyCPU' ">
-    <Optimize>false</Optimize>
-    <OutputPath>bin\SavePropValues</OutputPath>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+
   <ItemGroup>
-    <ProjectReference Include="..\DemoInfo\DemoInfo.csproj">
-      <Project>{22D4CFC7-6810-4C18-A353-71A49782394F}</Project>
-      <Name>DemoInfo</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\DemoInfo\DemoInfo.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/DevNullPlayer/Properties/AssemblyInfo.cs b/DevNullPlayer/Properties/AssemblyInfo.cs
deleted file mode 100644
index f9a696a..0000000
--- a/DevNullPlayer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("DevNullPlayer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("main()")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/Testing/Testing.csproj b/Testing/Testing.csproj
index 521abcd..326d028 100644
--- a/Testing/Testing.csproj
+++ b/Testing/Testing.csproj
@@ -1,57 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4EAC2881-AD2B-44E3-9CB3-525EA4598C01}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Testing</RootNamespace>
-    <AssemblyName>Testing</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'SavePropValues|AnyCPU' ">
-    <Optimize>false</Optimize>
-    <OutputPath>bin\SavePropValues</OutputPath>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="TestBitstreams.cs" />
-    <Compile Include="AwkwardStream.cs" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\DemoInfo\DemoInfo.csproj">
-      <Project>{22D4CFC7-6810-4C18-A353-71A49782394F}</Project>
-      <Name>DemoInfo</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\DemoInfo\DemoInfo.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Testing/packages.config b/Testing/packages.config
deleted file mode 100644
index c714ef3..0000000
--- a/Testing/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net45" />
-</packages>
\ No newline at end of file