diff --git a/Facepunch.Steamworks.sln b/Facepunch.Steamworks.sln
index 2ad9492..95fbbc6 100644
--- a/Facepunch.Steamworks.sln
+++ b/Facepunch.Steamworks.sln
@@ -1,8 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Facepunch.Steamworks.NetCore", "Facepunch.Steamworks\Facepunch.Steamworks.NetCore.csproj", "{91962664-EB42-472A-94C8-C4FFEB44CC4B}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facepunch.Steamworks", "Facepunch.Steamworks\Facepunch.Steamworks.csproj", "{DC2D9FA9-F005-468F-8581-85C79F4E0034}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facepunch.Steamworks.Test", "Facepunch.Steamworks.Test\Facepunch.Steamworks.Test.csproj", "{3F6183AD-D966-44F2-A6EB-42E61E591B49}"
@@ -15,6 +17,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{91962664-EB42-472A-94C8-C4FFEB44CC4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91962664-EB42-472A-94C8-C4FFEB44CC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91962664-EB42-472A-94C8-C4FFEB44CC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91962664-EB42-472A-94C8-C4FFEB44CC4B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC2D9FA9-F005-468F-8581-85C79F4E0034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DC2D9FA9-F005-468F-8581-85C79F4E0034}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC2D9FA9-F005-468F-8581-85C79F4E0034}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj
new file mode 100644
index 0000000..32cd464
--- /dev/null
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.NetCore.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>Facepunch.Steamworks</AssemblyName>
+    <PackageId>Facepunch.Steamworks</PackageId>
+    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <RootNamespace>Facepunch.Steamworks</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_6;NETCORE</DefineConstants>
+    <NoWarn>1701;1702;1705;618;1591</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NETSTANDARD1_6;NETCORE</DefineConstants>
+    <NoWarn>1701;1702;1705;618;1591</NoWarn>
+  </PropertyGroup>
+
+</Project>
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.csproj
index a1a24d7..4953776 100644
--- a/Facepunch.Steamworks/Facepunch.Steamworks.csproj
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.csproj
@@ -1,200 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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>{DC2D9FA9-F005-468F-8581-85C79F4E0034}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Facepunch.Steamworks</RootNamespace>
+    <TargetFramework>net3.5</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Facepunch.Steamworks</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <PackageId>Facepunch.Steamworks</PackageId>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <RootNamespace>Facepunch.Steamworks</RootNamespace>
   </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>
-    <DocumentationFile>bin\Debug\Facepunch.Steamworks.XML</DocumentationFile>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_6;NETCORE</DefineConstants>
+    <NoWarn>1701;1702;1705;618;1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Facepunch.Steamworks.XML</DocumentationFile>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NETSTANDARD1_6;NETCORE</DefineConstants>
+    <NoWarn>1701;1702;1705;618;1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug64|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug64\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug64|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug64\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug64|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug64\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BaseSteamworks.cs" />
-    <Compile Include="Callbacks\Index.cs" />
-    <Compile Include="Client\Leaderboard.cs" />
-    <Compile Include="Interfaces\Inventory.Item.cs" />
-    <Compile Include="Interfaces\Inventory.Result.cs" />
-    <Compile Include="Interfaces\Networking.cs" />
-    <Compile Include="Client\Overlay.cs" />
-    <Compile Include="Client\ServerList.cs" />
-    <Compile Include="Client\ServerList.Request.cs" />
-    <Compile Include="Client\Auth.cs" />
-    <Compile Include="Client.cs" />
-    <Compile Include="Client\ServerList.Server.cs" />
-    <Compile Include="Client\App.cs" />
-    <Compile Include="Client\Friends.cs" />
-    <Compile Include="Client\Image.cs" />
-    <Compile Include="Interfaces\Inventory.cs" />
-    <Compile Include="Client\Screenshots.cs" />
-    <Compile Include="Client\Stats.cs" />
-    <Compile Include="Interfaces\Inventory.Definition.cs" />
-    <Compile Include="Client\Voice.cs" />
-    <Compile Include="Config.cs" />
-    <Compile Include="Interfaces\Workshop.cs" />
-    <Compile Include="Interfaces\Workshop.Editor.cs" />
-    <Compile Include="Interfaces\Workshop.Item.cs" />
-    <Compile Include="Interfaces\Workshop.Query.cs" />
-    <Compile Include="Interop\Native.cs" />
-    <Compile Include="Interop\ServerRules.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Server.cs" />
-    <Compile Include="Server\Auth.cs" />
-    <Compile Include="Server\Query.cs" />
-    <Compile Include="Server\Stats.cs" />
-    <Compile Include="SteamNative\SteamNative.Helpers.cs" />
-    <Compile Include="SteamNative\SteamNative.Constants.cs" />
-    <Compile Include="SteamNative\SteamNative.Enums.cs" />
-    <Compile Include="SteamNative\SteamNative.Platform.cs" />
-    <Compile Include="SteamNative\SteamNative.Platform.Interface.cs" />
-    <Compile Include="SteamNative\SteamNative.Platform.Linux32.cs" />
-    <Compile Include="SteamNative\SteamNative.Platform.Linux64.cs" />
-    <Compile Include="SteamNative\SteamNative.Platform.Mac.cs" />
-    <Compile Include="SteamNative\SteamNative.Platform.Win32.cs" />
-    <Compile Include="SteamNative\SteamNative.Platform.Win64.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamApi.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamAppList.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamApps.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamClient.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamController.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamFriends.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamGameServer.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamGameServerStats.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamHTMLSurface.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamHTTP.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamInventory.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamMatchmaking.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamMatchmakingServers.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamMusic.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamMusicRemote.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamNetworking.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamRemoteStorage.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamScreenshots.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamUGC.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamUnifiedMessages.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamUser.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamUserStats.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamUtils.cs" />
-    <Compile Include="SteamNative\SteamNative.SteamVideo.cs" />
-    <Compile Include="SteamNative\SteamNative.Callback.cs" />
-    <Compile Include="SteamNative\SteamNative.Structs.cs" />
-    <Compile Include="SteamNative\SteamNative.Types.cs" />
-    <Compile Include="Utility.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-  <!-- 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>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>