diff --git a/Substrate.Entities/Substrate.Entities.csproj b/Substrate.Entities/Substrate.Entities.csproj
index 28ee54cd..37dada14 100644
--- a/Substrate.Entities/Substrate.Entities.csproj
+++ b/Substrate.Entities/Substrate.Entities.csproj
@@ -33,50 +33,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net20-Release|AnyCPU'">
-    <AssemblyName>Substrate.Entities.net20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net20-Debug|AnyCPU'">
-    <AssemblyName>Substrate.Entities.net20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net35-Debug|AnyCPU'">
-    <AssemblyName>Substrate.Entities.net35</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net35-Release|AnyCPU'">
-    <AssemblyName>Substrate.Entities.net35</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
diff --git a/Substrate.Tests/Substrate.Tests.csproj b/Substrate.Tests/Substrate.Tests.csproj
index 7696723c..74f7ef8b 100644
--- a/Substrate.Tests/Substrate.Tests.csproj
+++ b/Substrate.Tests/Substrate.Tests.csproj
@@ -41,54 +41,6 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net20-Release|AnyCPU'">
-    <AssemblyName>Substrate.Tests.net20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net20-Debug|AnyCPU'">
-    <AssemblyName>Substrate.Tests.net20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net35-Debug|AnyCPU'">
-    <AssemblyName>Substrate.Tests.net35</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net35-Release|AnyCPU'">
-    <AssemblyName>Substrate.Tests.net35</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System" />
diff --git a/Substrate.sln b/Substrate.sln
index fa56d3b5..874d6aa8 100644
--- a/Substrate.sln
+++ b/Substrate.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3E89D2F4-E9AF-4DBC-AB0B-8BED3C607012}"
 EndProject
@@ -23,46 +23,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{D7504FC4
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		net20-Debug|Any CPU = net20-Debug|Any CPU
-		net20-Release|Any CPU = net20-Release|Any CPU
-		net35-Debug|Any CPU = net35-Debug|Any CPU
-		net35-Release|Any CPU = net35-Release|Any CPU
 		net40-client-Debug|Any CPU = net40-client-Debug|Any CPU
 		net40-client-Release|Any CPU = net40-client-Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net20-Debug|Any CPU.ActiveCfg = net20-Debug|Any CPU
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net20-Debug|Any CPU.Build.0 = net20-Debug|Any CPU
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net20-Release|Any CPU.ActiveCfg = net20-Release|Any CPU
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net20-Release|Any CPU.Build.0 = net20-Release|Any CPU
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net35-Debug|Any CPU.ActiveCfg = net35-Debug|Any CPU
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net35-Debug|Any CPU.Build.0 = net35-Debug|Any CPU
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net35-Release|Any CPU.ActiveCfg = net35-Release|Any CPU
-		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net35-Release|Any CPU.Build.0 = net35-Release|Any CPU
 		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net40-client-Debug|Any CPU.ActiveCfg = net40-client-Debug|Any CPU
 		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net40-client-Debug|Any CPU.Build.0 = net40-client-Debug|Any CPU
 		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net40-client-Release|Any CPU.ActiveCfg = net40-client-Release|Any CPU
 		{2D269AE0-C025-4647-BA9C-1DB2B84A4E55}.net40-client-Release|Any CPU.Build.0 = net40-client-Release|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net20-Debug|Any CPU.ActiveCfg = net20-Debug|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net20-Debug|Any CPU.Build.0 = net20-Debug|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net20-Release|Any CPU.ActiveCfg = net20-Release|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net20-Release|Any CPU.Build.0 = net20-Release|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net35-Debug|Any CPU.ActiveCfg = net35-Debug|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net35-Debug|Any CPU.Build.0 = net35-Debug|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net35-Release|Any CPU.ActiveCfg = net35-Release|Any CPU
-		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net35-Release|Any CPU.Build.0 = net35-Release|Any CPU
 		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net40-client-Debug|Any CPU.ActiveCfg = net40-client-Debug|Any CPU
 		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net40-client-Debug|Any CPU.Build.0 = net40-client-Debug|Any CPU
 		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net40-client-Release|Any CPU.ActiveCfg = net40-client-Release|Any CPU
 		{7264A1C4-AB4A-4437-B252-7379B98B5509}.net40-client-Release|Any CPU.Build.0 = net40-client-Release|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net20-Debug|Any CPU.ActiveCfg = net20-Debug|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net20-Debug|Any CPU.Build.0 = net20-Debug|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net20-Release|Any CPU.ActiveCfg = net20-Release|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net20-Release|Any CPU.Build.0 = net20-Release|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net35-Debug|Any CPU.ActiveCfg = net35-Debug|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net35-Debug|Any CPU.Build.0 = net35-Debug|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net35-Release|Any CPU.ActiveCfg = net35-Release|Any CPU
-		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net35-Release|Any CPU.Build.0 = net35-Release|Any CPU
 		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net40-client-Debug|Any CPU.ActiveCfg = net40-client-Debug|Any CPU
 		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net40-client-Debug|Any CPU.Build.0 = net40-client-Debug|Any CPU
 		{5D875E2D-AD97-43DB-9180-DBA3F26DC569}.net40-client-Release|Any CPU.ActiveCfg = net40-client-Release|Any CPU
@@ -71,4 +43,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {ED67AB82-79E7-4381-8969-679D3CF97E5A}
+	EndGlobalSection
 EndGlobal
diff --git a/Substrate/Substrate.csproj b/Substrate/Substrate.csproj
index cbae3b2c..42dabb17 100644
--- a/Substrate/Substrate.csproj
+++ b/Substrate/Substrate.csproj
@@ -62,58 +62,6 @@
     <DocumentationFile>bin\Release\Substrate.net40-client.XML</DocumentationFile>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net20-Release|AnyCPU'">
-    <AssemblyName>Substrate.net20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\Substrate.net20.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net20-Debug|AnyCPU'">
-    <AssemblyName>Substrate.net20</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>bin\Debug\Substrate.net20.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net35-Debug|AnyCPU'">
-    <AssemblyName>Substrate.net35</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>bin\Debug\Substrate.net35.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net35-Release|AnyCPU'">
-    <AssemblyName>Substrate.net35</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>bin\Release\Substrate.net35.XML</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>1591</NoWarn>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
diff --git a/Substrate/Substrate.nuspec b/Substrate/Substrate.nuspec
index 93acfc91..daed9c63 100644
--- a/Substrate/Substrate.nuspec
+++ b/Substrate/Substrate.nuspec
@@ -12,12 +12,6 @@
     <tags>minecraft level client world</tags>
   </metadata>
   <files>
-    <!--<file src="bin\Release\Substrate.net20.dll" target="lib\net20\Substrate.net20.dll" />
-    <file src="bin\Release\Substrate.net20.pdb" target="lib\net20\Substrate.net20.pdb" />
-    <file src="bin\Release\Substrate.net20.XML" target="lib\net20\Substrate.net20.XML" />
-    <file src="bin\Release\Substrate.net35.dll" target="lib\net35\Substrate.net35.dll" />
-    <file src="bin\Release\Substrate.net35.pdb" target="lib\net35\Substrate.net35.pdb" />
-    <file src="bin\Release\Substrate.net35.XML" target="lib\net35\Substrate.net35.XML" />-->
     <file src="bin\Release\Substrate.net40-client.dll" target="lib\net40-client\Substrate.net40-client.dll" />
     <file src="bin\Release\Substrate.net40-client.pdb" target="lib\net40-client\Substrate.net40-client.pdb" />
     <file src="bin\Release\Substrate.net40-client.XML" target="lib\net40-client\Substrate.net40-client.XML" />