diff --git a/.travis.yml b/.travis.yml
index 063c361dd..0c91b183c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,19 @@
 sudo: false
 language: csharp
+mono:
+    - alpha
+
 solution: SteamKit2/SteamKit2.sln
 
 install:
     - nuget restore SteamKit2/SteamKit2.sln
     - nuget restore Samples/Samples.sln
-    - nuget install xunit.runners -Version 1.9.1 -o SteamKit2/packages
+    - nuget install xunit.runner.console -Version 2.0.0 -o SteamKit2/packages
 
 script:
     - xbuild /p:NoWarn=1584 SteamKit2/SteamKit2.sln /target:SteamKit2 /target:Tests
     - xbuild Samples/Samples.sln
-    - mono SteamKit2/packages/xunit.runners.1.9.1/tools/xunit.console.exe SteamKit2/Tests/bin/Debug/Tests.dll
+    - mono SteamKit2/packages/xunit.runner.console.2.0.0/tools/xunit.console.exe SteamKit2/Tests/bin/Debug/Tests.dll
 
 notifications:
     irc:
diff --git a/Samples/1.Logon/Sample1_Logon.csproj b/Samples/1.Logon/Sample1_Logon.csproj
index f2bfc3abf..2fe1af6ac 100644
--- a/Samples/1.Logon/Sample1_Logon.csproj
+++ b/Samples/1.Logon/Sample1_Logon.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample1_Logon</RootNamespace>
     <AssemblyName>Sample1_Logon</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -24,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -53,6 +55,9 @@
       <Name>SteamKit2</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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.
diff --git a/Samples/1.Logon/app.config b/Samples/1.Logon/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/1.Logon/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/2.Extending/Sample2_Extending.csproj b/Samples/2.Extending/Sample2_Extending.csproj
index 9609aa583..f2418e707 100644
--- a/Samples/2.Extending/Sample2_Extending.csproj
+++ b/Samples/2.Extending/Sample2_Extending.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample2_Extending</RootNamespace>
     <AssemblyName>Sample2_Extending</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -27,6 +27,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>414</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -36,6 +37,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
@@ -62,6 +64,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Samples/2.Extending/app.config b/Samples/2.Extending/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/2.Extending/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/3.DebugLog/Sample3_DebugLog.csproj b/Samples/3.DebugLog/Sample3_DebugLog.csproj
index a55614e1a..b0d20cdc6 100644
--- a/Samples/3.DebugLog/Sample3_DebugLog.csproj
+++ b/Samples/3.DebugLog/Sample3_DebugLog.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample3_DebugLog</RootNamespace>
     <AssemblyName>Sample3_DebugLog</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -24,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -53,6 +55,9 @@
       <Name>SteamKit2</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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.
diff --git a/Samples/3.DebugLog/app.config b/Samples/3.DebugLog/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/3.DebugLog/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/4.Friends/Sample4_Friends.csproj b/Samples/4.Friends/Sample4_Friends.csproj
index 3b65861a0..75a21ad32 100644
--- a/Samples/4.Friends/Sample4_Friends.csproj
+++ b/Samples/4.Friends/Sample4_Friends.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample4_Friends</RootNamespace>
     <AssemblyName>Sample4_Friends</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -26,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -35,6 +36,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -51,10 +53,13 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\SteamKit2\SteamKit2\SteamKit2.csproj">
-      <Project>{BEB5BF07-BB56-402A-97A3-A41C6444C6A5}</Project>
+      <Project>{beb5bf07-bb56-402a-97a3-a41c6444c6a5}</Project>
       <Name>SteamKit2</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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.
diff --git a/Samples/4.Friends/app.config b/Samples/4.Friends/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/4.Friends/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/5.SteamGuard/Sample5_SteamGuard.csproj b/Samples/5.SteamGuard/Sample5_SteamGuard.csproj
index 7945600c6..97272b652 100644
--- a/Samples/5.SteamGuard/Sample5_SteamGuard.csproj
+++ b/Samples/5.SteamGuard/Sample5_SteamGuard.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample5_SteamGuard</RootNamespace>
     <AssemblyName>Sample5_SteamGuard</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -52,6 +55,9 @@
       <Name>SteamKit2</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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.
diff --git a/Samples/5.SteamGuard/app.config b/Samples/5.SteamGuard/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/5.SteamGuard/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/6.WebAPI/Sample6_WebAPI.csproj b/Samples/6.WebAPI/Sample6_WebAPI.csproj
index a8dfdbb4b..4a80822df 100644
--- a/Samples/6.WebAPI/Sample6_WebAPI.csproj
+++ b/Samples/6.WebAPI/Sample6_WebAPI.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample6_WebAPI</RootNamespace>
     <AssemblyName>Sample6_WebAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -24,6 +25,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>219</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -33,6 +35,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -53,6 +56,9 @@
       <Name>SteamKit2</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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.
diff --git a/Samples/6.WebAPI/app.config b/Samples/6.WebAPI/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/6.WebAPI/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/7.ServerList/Sample7_ServerList.csproj b/Samples/7.ServerList/Sample7_ServerList.csproj
index c18e77c14..c9aed1220 100644
--- a/Samples/7.ServerList/Sample7_ServerList.csproj
+++ b/Samples/7.ServerList/Sample7_ServerList.csproj
@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample7_ServerList</RootNamespace>
     <AssemblyName>Sample7_ServerList</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -32,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -52,6 +55,9 @@
       <Name>SteamKit2</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </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.
diff --git a/Samples/7.ServerList/app.config b/Samples/7.ServerList/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/7.ServerList/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/8.UnifiedMessages/Sample8_UnifiedMessages.csproj b/Samples/8.UnifiedMessages/Sample8_UnifiedMessages.csproj
index ded38d736..3782d35df 100644
--- a/Samples/8.UnifiedMessages/Sample8_UnifiedMessages.csproj
+++ b/Samples/8.UnifiedMessages/Sample8_UnifiedMessages.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sample8_UnifiedMessages</RootNamespace>
     <AssemblyName>Sample8_UnifiedMessages</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -37,6 +38,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -46,6 +48,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
@@ -71,6 +74,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Samples/8.UnifiedMessages/app.config b/Samples/8.UnifiedMessages/app.config
new file mode 100644
index 000000000..51278a456
--- /dev/null
+++ b/Samples/8.UnifiedMessages/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/Samples/8.UnifiedMessages/packages.config b/Samples/8.UnifiedMessages/packages.config
index 7e322d2b9..f150c11ac 100644
--- a/Samples/8.UnifiedMessages/packages.config
+++ b/Samples/8.UnifiedMessages/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="protobuf-net" version="2.0.0.668" targetFramework="net4-client" />
+  <package id="protobuf-net" version="2.0.0.668" targetFramework="net40-Client" />
 </packages>
\ No newline at end of file
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/Callbacks.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/Callbacks.cs
index 2ee1ae29c..33021bcec 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/Callbacks.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/Callbacks.cs
@@ -754,7 +754,7 @@ internal PICSProductInfo( CMsgClientPICSProductInfoResponse.PackageInfo package_
             /// </summary>
             public bool MetaDataOnly { get; private set; }
             /// <summary>
-            /// Gets if the are more product information responses pending
+            /// Gets if there are more product information responses pending
             /// </summary>
             public bool ResponsePending { get; private set; }
             /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/SteamApps.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/SteamApps.cs
index b89c8d62d..80adc5c05 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/SteamApps.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamApps/SteamApps.cs
@@ -138,10 +138,11 @@ internal SteamApps()
         /// <summary>
         /// Requests an app ownership ticket for the specified AppID.
         /// Results are returned in a <see cref="AppOwnershipTicketCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="appid">The appid to request the ownership ticket of.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="AppOwnershipTicketCallback"/>.</returns>
-        public JobID GetAppOwnershipTicket( uint appid )
+        public AsyncJob<AppOwnershipTicketCallback> GetAppOwnershipTicket( uint appid )
         {
             var request = new ClientMsgProtobuf<CMsgClientGetAppOwnershipTicket>( EMsg.ClientGetAppOwnershipTicket );
             request.SourceJobID = Client.GetNextJobID();
@@ -150,58 +151,62 @@ public JobID GetAppOwnershipTicket( uint appid )
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<AppOwnershipTicketCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
         /// Requests app information for a single app. Use the overload for requesting information on a batch of apps.
         /// Results are returned in a <see cref="AppInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// 
         /// Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
         /// </summary>
         /// <param name="app">The app to request information for.</param>
         /// <param name="supportsBatches">if set to <c>true</c>, the request supports batches.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="AppInfoCallback"/>.</returns>
-        public JobID GetAppInfo( AppDetails app, bool supportsBatches = false )
+        public AsyncJob<AppInfoCallback> GetAppInfo( AppDetails app, bool supportsBatches = false )
         {
             return GetAppInfo( new AppDetails[] { app }, supportsBatches );
         }
         /// <summary>
         /// Requests app information for a single app. Use the overload for requesting information on a batch of apps.
         /// Results are returned in a <see cref="AppInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// 
         /// Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
         /// </summary>
         /// <param name="app">The app to request information for.</param>
         /// <param name="supportsBatches">if set to <c>true</c>, the request supports batches.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="AppInfoCallback"/>.</returns>
-        public JobID GetAppInfo( uint app, bool supportsBatches = false )
+        public AsyncJob<AppInfoCallback> GetAppInfo( uint app, bool supportsBatches = false )
         {
             return GetAppInfo( new uint[] { app }, supportsBatches );
         }
         /// <summary>
         /// Requests app information for a list of apps.
         /// Results are returned in a <see cref="AppInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// 
         /// Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
         /// </summary>
         /// <param name="apps">The apps to request information for.</param>
         /// <param name="supportsBatches">if set to <c>true</c>, the request supports batches.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="AppInfoCallback"/>.</returns>
-        public JobID GetAppInfo( IEnumerable<uint> apps, bool supportsBatches = false )
+        public AsyncJob<AppInfoCallback> GetAppInfo( IEnumerable<uint> apps, bool supportsBatches = false )
         {
             return GetAppInfo( apps.Select( a => new AppDetails { AppID = a } ), supportsBatches );
         }
         /// <summary>
         /// Requests app information for a list of apps.
         /// Results are returned in a <see cref="AppInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// 
         /// Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
         /// </summary>
         /// <param name="apps">The apps to request information for.</param>
         /// <param name="supportsBatches">if set to <c>true</c>, the request supports batches.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="AppInfoCallback"/>.</returns>
-        public JobID GetAppInfo( IEnumerable<AppDetails> apps, bool supportsBatches = false )
+        public AsyncJob<AppInfoCallback> GetAppInfo( IEnumerable<AppDetails> apps, bool supportsBatches = false )
         {
             var request = new ClientMsgProtobuf<CMsgClientAppInfoRequest>( EMsg.ClientAppInfoRequest );
             request.SourceJobID = Client.GetNextJobID();
@@ -223,32 +228,34 @@ public JobID GetAppInfo( IEnumerable<AppDetails> apps, bool supportsBatches = fa
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<AppInfoCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
         /// Requests package information for a single package. Use the overload for requesting information on a batch of packages.
         /// Results are returned in a <see cref="PackageInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// 
         /// Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
         /// </summary>
         /// <param name="packageId">The package id to request information for.</param>
         /// <param name="metaDataOnly">if set to <c>true</c>, request metadata only.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PackageInfoCallback"/>.</returns>
-        public JobID GetPackageInfo( uint packageId, bool metaDataOnly = false )
+        public AsyncJob<PackageInfoCallback> GetPackageInfo( uint packageId, bool metaDataOnly = false )
         {
             return GetPackageInfo( new uint[] { packageId }, metaDataOnly );
         }
         /// <summary>
         /// Requests package information for a list of packages.
         /// Results are returned in a <see cref="PackageInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// 
         /// Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
         /// </summary>
         /// <param name="packageId">The packages to request information for.</param>
         /// <param name="metaDataOnly">if set to <c>true</c> to request metadata only.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PackageInfoCallback"/>.</returns>
-        public JobID GetPackageInfo( IEnumerable<uint> packageId, bool metaDataOnly = false )
+        public AsyncJob<PackageInfoCallback> GetPackageInfo( IEnumerable<uint> packageId, bool metaDataOnly = false )
         {
             var request = new ClientMsgProtobuf<CMsgClientPackageInfoRequest>( EMsg.ClientPackageInfoRequest );
 
@@ -259,7 +266,7 @@ public JobID GetPackageInfo( IEnumerable<uint> packageId, bool metaDataOnly = fa
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<PackageInfoCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
@@ -283,11 +290,12 @@ public void GetAppChanges( uint lastChangeNumber = 0, bool sendChangelist = true
         /// <summary>
         /// Request the depot decryption key for a specified DepotID.
         /// Results are returned in a <see cref="DepotKeyCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="depotid">The DepotID to request a decryption key for.</param>
         /// <param name="appid">The AppID to request the decryption key for.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="DepotKeyCallback"/>.</returns>
-        public JobID GetDepotDecryptionKey( uint depotid, uint appid = 0 )
+        public AsyncJob<DepotKeyCallback> GetDepotDecryptionKey( uint depotid, uint appid = 0 )
         {
             var request = new ClientMsgProtobuf<CMsgClientGetDepotDecryptionKey>( EMsg.ClientGetDepotDecryptionKey );
             request.SourceJobID = Client.GetNextJobID();
@@ -297,17 +305,18 @@ public JobID GetDepotDecryptionKey( uint depotid, uint appid = 0 )
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
-        }
-
+            return new AsyncJob<DepotKeyCallback>( this.Client, request.SourceJobID );
+        }
+
         /// <summary>
         /// Request PICS access tokens for an app or package.
         /// Results are returned in a <see cref="PICSTokensCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="app">App id to request access token for.</param>
         /// <param name="package">Package id to request access token for.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PICSTokensCallback"/>.</returns>
-        public JobID PICSGetAccessTokens( uint? app, uint? package )
+        public AsyncJob<PICSTokensCallback> PICSGetAccessTokens( uint? app, uint? package )
         {
             List<uint> apps = new List<uint>();
             List<uint> packages = new List<uint>();
@@ -321,11 +330,12 @@ public JobID PICSGetAccessTokens( uint? app, uint? package )
         /// <summary>
         /// Request PICS access tokens for a list of app ids and package ids
         /// Results are returned in a <see cref="PICSTokensCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="appIds">List of app ids to request access tokens for.</param>
         /// <param name="packageIds">List of package ids to request access tokens for.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PICSTokensCallback"/>.</returns>
-        public JobID PICSGetAccessTokens( IEnumerable<uint> appIds, IEnumerable<uint> packageIds )
+        public AsyncJob<PICSTokensCallback> PICSGetAccessTokens( IEnumerable<uint> appIds, IEnumerable<uint> packageIds )
         {
             var request = new ClientMsgProtobuf<CMsgClientPICSAccessTokenRequest>( EMsg.ClientPICSAccessTokenRequest );
             request.SourceJobID = Client.GetNextJobID();
@@ -335,18 +345,19 @@ public JobID PICSGetAccessTokens( IEnumerable<uint> appIds, IEnumerable<uint> pa
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<PICSTokensCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
         /// Request changes for apps and packages since a given change number
         /// Results are returned in a <see cref="PICSChangesCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="lastChangeNumber">Last change number seen.</param>
         /// <param name="sendAppChangelist">Whether to send app changes.</param>
         /// <param name="sendPackageChangelist">Whether to send package changes.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PICSChangesCallback"/>.</returns>
-        public JobID PICSGetChangesSince( uint lastChangeNumber = 0, bool sendAppChangelist = true, bool sendPackageChangelist = false )
+        public AsyncJob<PICSChangesCallback> PICSGetChangesSince( uint lastChangeNumber = 0, bool sendAppChangelist = true, bool sendPackageChangelist = false )
         {
             var request = new ClientMsgProtobuf<CMsgClientPICSChangesSinceRequest>( EMsg.ClientPICSChangesSinceRequest );
             request.SourceJobID = Client.GetNextJobID();
@@ -357,19 +368,20 @@ public JobID PICSGetChangesSince( uint lastChangeNumber = 0, bool sendAppChangel
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<PICSChangesCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
         /// Request product information for an app or package
         /// Results are returned in a <see cref="PICSProductInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="app">App id requested.</param>
         /// <param name="package">Package id requested.</param>
         /// <param name="onlyPublic">Whether to send only public information.</param>
         /// <param name="metaDataOnly">Whether to send only meta data.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PICSProductInfoCallback"/>.</returns>
-        public JobID PICSGetProductInfo(uint? app, uint? package, bool onlyPublic = true, bool metaDataOnly = false)
+        public AsyncJobMultiple<PICSProductInfoCallback> PICSGetProductInfo(uint? app, uint? package, bool onlyPublic = true, bool metaDataOnly = false)
         {
             List<uint> apps = new List<uint>();
             List<uint> packages = new List<uint>();
@@ -383,13 +395,14 @@ public JobID PICSGetProductInfo(uint? app, uint? package, bool onlyPublic = true
         /// <summary>
         /// Request product information for a list of apps or packages
         /// Results are returned in a <see cref="PICSProductInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="apps">List of app ids requested.</param>
         /// <param name="packages">List of package ids requested.</param>
         /// <param name="onlyPublic">Whether to send only public information.</param>
         /// <param name="metaDataOnly">Whether to send only meta data.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PICSProductInfoCallback"/>.</returns>
-        public JobID PICSGetProductInfo( IEnumerable<uint> apps, IEnumerable<uint> packages, bool onlyPublic = true, bool metaDataOnly = false )
+        public AsyncJobMultiple<PICSProductInfoCallback> PICSGetProductInfo( IEnumerable<uint> apps, IEnumerable<uint> packages, bool onlyPublic = true, bool metaDataOnly = false )
         {
             return PICSGetProductInfo( apps.Select( app => new PICSRequest( app, 0, onlyPublic ) ), packages.Select( package => new PICSRequest( package ) ), metaDataOnly );
         }
@@ -397,12 +410,13 @@ public JobID PICSGetProductInfo( IEnumerable<uint> apps, IEnumerable<uint> packa
         /// <summary>
         /// Request product information for a list of apps or packages
         /// Results are returned in a <see cref="PICSProductInfoCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="apps">List of <see cref="PICSRequest"/> requests for apps.</param>
         /// <param name="packages">List of <see cref="PICSRequest"/> requests for packages.</param>
         /// <param name="metaDataOnly">Whether to send only meta data.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PICSProductInfoCallback"/>.</returns>
-        public JobID PICSGetProductInfo( IEnumerable<PICSRequest> apps, IEnumerable<PICSRequest> packages, bool metaDataOnly = false )
+        public AsyncJobMultiple<PICSProductInfoCallback> PICSGetProductInfo( IEnumerable<PICSRequest> apps, IEnumerable<PICSRequest> packages, bool metaDataOnly = false )
         {
             var request = new ClientMsgProtobuf<CMsgClientPICSProductInfoRequest>( EMsg.ClientPICSProductInfoRequest );
             request.SourceJobID = Client.GetNextJobID();
@@ -430,18 +444,19 @@ public JobID PICSGetProductInfo( IEnumerable<PICSRequest> apps, IEnumerable<PICS
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJobMultiple<PICSProductInfoCallback>( this.Client, request.SourceJobID, callback => !callback.ResponsePending );
         }
 
 
         /// <summary>
         /// Request product information for an app or package
         /// Results are returned in a <see cref="CDNAuthTokenCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="app">App id requested.</param>
         /// <param name="host_name">CDN host name being requested.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="CDNAuthTokenCallback"/>.</returns>
-        public JobID GetCDNAuthToken(uint app, string host_name)
+        public AsyncJob<CDNAuthTokenCallback> GetCDNAuthToken(uint app, string host_name)
         {
             var request = new ClientMsgProtobuf<CMsgClientGetCDNAuthToken>(EMsg.ClientGetCDNAuthToken);
             request.SourceJobID = Client.GetNextJobID();
@@ -451,26 +466,28 @@ public JobID GetCDNAuthToken(uint app, string host_name)
 
             this.Client.Send(request);
 
-            return request.SourceJobID;
+            return new AsyncJob<CDNAuthTokenCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
         /// Request a free license for given appid, can be used for free on demand apps
         /// Results are returned in a <see cref="FreeLicenseCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="app">The app to request a free license for.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="FreeLicenseCallback"/>.</returns>
-        public JobID RequestFreeLicense( uint app )
+        public AsyncJob<FreeLicenseCallback> RequestFreeLicense( uint app )
         {
             return RequestFreeLicense( new List<uint> { app } );
         }
         /// <summary>
         /// Request a free license for given appids, can be used for free on demand apps
         /// Results are returned in a <see cref="FreeLicenseCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="apps">The apps to request a free license for.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="FreeLicenseCallback"/>.</returns>
-        public JobID RequestFreeLicense( IEnumerable<uint> apps )
+        public AsyncJob<FreeLicenseCallback> RequestFreeLicense( IEnumerable<uint> apps )
         {
             var request = new ClientMsgProtobuf<CMsgClientRequestFreeLicense>( EMsg.ClientRequestFreeLicense );
             request.SourceJobID = Client.GetNextJobID();
@@ -479,7 +496,7 @@ public JobID RequestFreeLicense( IEnumerable<uint> apps )
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<FreeLicenseCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamCloud/SteamCloud.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamCloud/SteamCloud.cs
index e2acd13db..d8514b450 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamCloud/SteamCloud.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamCloud/SteamCloud.cs
@@ -32,10 +32,11 @@ internal SteamCloud()
         /// <summary>
         /// Requests details for a specific item of user generated content from the Steam servers.
         /// Results are returned in a <see cref="UGCDetailsCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="ugcId">The unique user generated content id.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="UGCDetailsCallback"/>.</returns>
-        public JobID RequestUGCDetails( UGCHandle ugcId )
+        public AsyncJob<UGCDetailsCallback> RequestUGCDetails( UGCHandle ugcId )
         {
             var request = new ClientMsgProtobuf<CMsgClientUFSGetUGCDetails>( EMsg.ClientUFSGetUGCDetails );
             request.SourceJobID = Client.GetNextJobID();
@@ -44,17 +45,18 @@ public JobID RequestUGCDetails( UGCHandle ugcId )
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<UGCDetailsCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
         /// Requests details for a specific file in the user's Cloud storage.
         /// Results are returned in a <see cref="SingleFileInfoCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="appid">The app id of the game.</param>
         /// <param name="filename">The path to the file being requested.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="SingleFileInfoCallback"/>.</returns>
-        public JobID GetSingleFileInfo(uint appid, string filename)
+        public AsyncJob<SingleFileInfoCallback> GetSingleFileInfo(uint appid, string filename)
         {
             var request = new ClientMsgProtobuf<CMsgClientUFSGetSingleFileInfo>(EMsg.ClientUFSGetSingleFileInfo);
             request.SourceJobID = Client.GetNextJobID();
@@ -64,17 +66,18 @@ public JobID GetSingleFileInfo(uint appid, string filename)
 
             this.Client.Send(request);
 
-            return request.SourceJobID;
+            return new AsyncJob<SingleFileInfoCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
         /// Commit a Cloud file at the given path to make its UGC handle publicly visible.
         /// Results are returned in a <see cref="ShareFileCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="appid">The app id of the game.</param>
         /// <param name="filename">The path to the file being requested.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="ShareFileCallback"/>.</returns>
-        public JobID ShareFile(uint appid, string filename)
+        public AsyncJob<ShareFileCallback> ShareFile(uint appid, string filename)
         {
             var request = new ClientMsgProtobuf<CMsgClientUFSShareFile>(EMsg.ClientUFSShareFile);
             request.SourceJobID = Client.GetNextJobID();
@@ -84,7 +87,7 @@ public JobID ShareFile(uint appid, string filename)
 
             this.Client.Send(request);
 
-            return request.SourceJobID;
+            return new AsyncJob<ShareFileCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamFriends/SteamFriends.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamFriends/SteamFriends.cs
index c4da10f01..bf8c294d8 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamFriends/SteamFriends.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamFriends/SteamFriends.cs
@@ -67,10 +67,11 @@ public string GetPersonaName()
         /// <summary>
         /// Sets the local user's persona name and broadcasts it over the network.
         /// Results are returned in a <see cref="PersonaChangeCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PersonaChangeCallback"/>.</returns>
-        public JobID SetPersonaName( string name )
+        public AsyncJob<PersonaChangeCallback> SetPersonaName( string name )
         {
             // cache the local name right away, so that early calls to SetPersonaState don't reset the set name
             cache.LocalUser.Name = name;
@@ -83,7 +84,7 @@ public JobID SetPersonaName( string name )
 
             this.Client.Send( stateMsg );
 
-            return stateMsg.SourceJobID;
+            return new AsyncJob<PersonaChangeCallback>( this.Client, stateMsg.SourceJobID );
         }
 
         /// <summary>
@@ -97,10 +98,11 @@ public EPersonaState GetPersonaState()
         /// <summary>
         /// Sets the local user's persona state and broadcasts it over the network.
         /// Results are returned in a <see cref="PersonaChangeCallback"/> callback.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="state">The state.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PersonaChangeCallback"/>.</returns>
-        public JobID SetPersonaState( EPersonaState state )
+        public AsyncJob<PersonaChangeCallback> SetPersonaState( EPersonaState state )
         {
             cache.LocalUser.PersonaState = state;
 
@@ -112,7 +114,7 @@ public JobID SetPersonaState( EPersonaState state )
 
             this.Client.Send( stateMsg );
 
-            return stateMsg.SourceJobID;
+            return new AsyncJob<PersonaChangeCallback>( this.Client, stateMsg.SourceJobID );
         }
 
         /// <summary>
@@ -524,11 +526,12 @@ public void RequestFriendInfo( SteamID steamId, EClientPersonaStateFlag requeste
         /// <summary>
         /// Ignores or unignores a friend on Steam.
         /// Results are returned in a <see cref="IgnoreFriendCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="steamId">The SteamID of the friend to ignore or unignore.</param>
         /// <param name="setIgnore">if set to <c>true</c>, the friend will be ignored; otherwise, they will be unignored.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="IgnoreFriendCallback"/>.</returns>
-        public JobID IgnoreFriend( SteamID steamId, bool setIgnore = true )
+        public AsyncJob<IgnoreFriendCallback> IgnoreFriend( SteamID steamId, bool setIgnore = true )
         {
             var ignore = new ClientMsg<MsgClientSetIgnoreFriend>();
             ignore.SourceJobID = Client.GetNextJobID();
@@ -539,17 +542,18 @@ public JobID IgnoreFriend( SteamID steamId, bool setIgnore = true )
 
             this.Client.Send( ignore );
 
-            return ignore.SourceJobID;
+            return new AsyncJob<IgnoreFriendCallback>( this.Client, ignore.SourceJobID );
         }
 
 
         /// <summary>
         /// Requests profile information for the given <see cref="SteamID"/>.
         /// Results are returned in a <see cref="ProfileInfoCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="steamId">The SteamID of the friend to request the details of.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="ProfileInfoCallback"/>.</returns>
-        public JobID RequestProfileInfo( SteamID steamId )
+        public AsyncJob<ProfileInfoCallback> RequestProfileInfo( SteamID steamId )
         {
             var request = new ClientMsgProtobuf<CMsgClientFriendProfileInfo>( EMsg.ClientFriendProfileInfo );
             request.SourceJobID = Client.GetNextJobID();
@@ -558,7 +562,7 @@ public JobID RequestProfileInfo( SteamID steamId )
 
             this.Client.Send( request );
 
-            return request.SourceJobID;
+            return new AsyncJob<ProfileInfoCallback>( this.Client, request.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamMasterServer/SteamMasterServer.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamMasterServer/SteamMasterServer.cs
index a4ec32788..01c93a220 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamMasterServer/SteamMasterServer.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamMasterServer/SteamMasterServer.cs
@@ -62,10 +62,11 @@ internal SteamMasterServer()
         /// <summary>
         /// Requests a list of servers from the Steam game master server.
         /// Results are returned in a <see cref="QueryCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="details">The details for the request.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="QueryCallback"/>.</returns>
-        public JobID ServerQuery( QueryDetails details )
+        public AsyncJob<QueryCallback> ServerQuery( QueryDetails details )
         {
             var query = new ClientMsgProtobuf<CMsgClientGMSServerQuery>( EMsg.ClientGMSServerQuery );
             query.SourceJobID = Client.GetNextJobID();
@@ -82,7 +83,7 @@ public JobID ServerQuery( QueryDetails details )
 
             this.Client.Send( query );
 
-            return query.SourceJobID;
+            return new AsyncJob<QueryCallback>( this.Client, query.SourceJobID );
         }
 
 
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamScreenshots/SteamScreenshots.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamScreenshots/SteamScreenshots.cs
index e83bb37bc..7a0a4cab6 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamScreenshots/SteamScreenshots.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamScreenshots/SteamScreenshots.cs
@@ -95,10 +95,11 @@ internal SteamScreenshots()
         /// <summary>
         /// Adds a screenshot to the user's screenshot library. The screenshot image and thumbnail must already exist on the UFS.
         /// Results are returned in a <see cref="ScreenshotAddedCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="details">The details of the screenshot.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="ScreenshotAddedCallback"/>.</returns>
-        public JobID AddScreenshot( ScreenshotDetails details )
+        public AsyncJob<ScreenshotAddedCallback> AddScreenshot( ScreenshotDetails details )
         {
             var msg = new ClientMsgProtobuf<CMsgClientUCMAddScreenshot>( EMsg.ClientUCMAddScreenshot );
             msg.SourceJobID = Client.GetNextJobID();
@@ -115,7 +116,7 @@ public JobID AddScreenshot( ScreenshotDetails details )
 
             Client.Send( msg );
 
-            return msg.SourceJobID;
+            return new AsyncJob<ScreenshotAddedCallback>( this.Client, msg.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamUnifiedMessages/SteamUnifiedMessages.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamUnifiedMessages/SteamUnifiedMessages.cs
index fbad39a75..d03a96db6 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamUnifiedMessages/SteamUnifiedMessages.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamUnifiedMessages/SteamUnifiedMessages.cs
@@ -34,12 +34,13 @@ internal UnifiedService( SteamUnifiedMessages steamUnifiedMessages )
             /// <summary>
             /// Sends a message.
             /// Results are returned in a <see cref="ServiceMethodResponse"/>.
+            /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
             /// </summary>
             /// <typeparam name="TResponse">The type of the protobuf object which is the response to the RPC call.</typeparam>
             /// <param name="expr">RPC call expression, e.g. x => x.SomeMethodCall(message);</param>
             /// <param name="isNotification">Whether this message is a notification or not.</param>
             /// <returns>The JobID of the request. This can be used to find the appropriate <see cref="ServiceMethodResponse"/>.</returns>
-            public JobID SendMessage<TResponse>( Expression<Func<TService, TResponse>> expr, bool isNotification = false )
+            public AsyncJob<ServiceMethodResponse> SendMessage<TResponse>( Expression<Func<TService, TResponse>> expr, bool isNotification = false )
             {
                 var call = expr.Body as MethodCallExpression;
                 var methodInfo = call.Method;
@@ -67,7 +68,7 @@ public JobID SendMessage<TResponse>( Expression<Func<TService, TResponse>> expr,
 
                 var method = typeof(SteamUnifiedMessages).GetMethod( "SendMessage" ).MakeGenericMethod( message.GetType() );
                 var result = method.Invoke( this.steamUnifiedMessages, new[] { rpcName, message, isNotification } );
-                return (JobID)result;
+                return (AsyncJob<ServiceMethodResponse>)result;
             }
         }
 
@@ -86,13 +87,14 @@ internal SteamUnifiedMessages()
         /// <summary>
         /// Sends a message.
         /// Results are returned in a <see cref="ServiceMethodResponse"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <typeparam name="TRequest">The type of a protobuf object.</typeparam>
         /// <param name="name">Name of the RPC endpoint. Takes the format ServiceName.RpcName</param>
         /// <param name="message">The message to send.</param>
         /// <param name="isNotification">Whether this message is a notification or not.</param>
         /// <returns>The JobID of the request. This can be used to find the appropriate <see cref="ServiceMethodResponse"/>.</returns>
-        public JobID SendMessage<TRequest>( string name, TRequest message, bool isNotification = false )
+        public AsyncJob<ServiceMethodResponse> SendMessage<TRequest>( string name, TRequest message, bool isNotification = false )
             where TRequest : IExtensible
         {
             var msg = new ClientMsgProtobuf<CMsgClientServiceMethod>( EMsg.ClientServiceMethod );
@@ -109,7 +111,7 @@ public JobID SendMessage<TRequest>( string name, TRequest message, bool isNotifi
 
             Client.Send( msg );
 
-            return msg.SourceJobID;
+            return new AsyncJob<ServiceMethodResponse>( this.Client, msg.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamUser/SteamUser.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamUser/SteamUser.cs
index f6007d2c2..9930c70ce 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamUser/SteamUser.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamUser/SteamUser.cs
@@ -440,16 +440,17 @@ public void SendMachineAuthResponse( MachineAuthDetails details )
         /// <summary>
         /// Requests a new WebAPI authentication user nonce.
         /// Results are returned in a <see cref="WebAPIUserNonceCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="WebAPIUserNonceCallback"/>.</returns>
-        public JobID RequestWebAPIUserNonce()
+        public AsyncJob<WebAPIUserNonceCallback> RequestWebAPIUserNonce()
         {
             var reqMsg = new ClientMsgProtobuf<CMsgClientRequestWebAPIAuthenticateUserNonce>( EMsg.ClientRequestWebAPIAuthenticateUserNonce );
             reqMsg.SourceJobID = Client.GetNextJobID();
 
             this.Client.Send( reqMsg );
 
-            return reqMsg.SourceJobID;
+            return new AsyncJob<WebAPIUserNonceCallback>( this.Client, reqMsg.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamUserStats/SteamUserStats.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamUserStats/SteamUserStats.cs
index ea92e439f..cbdb74ee0 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamUserStats/SteamUserStats.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamUserStats/SteamUserStats.cs
@@ -35,7 +35,7 @@ internal SteamUserStats()
         /// </summary>
         /// <param name="gameId">The GameID to request the number of players for.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="NumberOfPlayersCallback"/>.</returns>
-        public JobID GetNumberOfCurrentPlayers( GameID gameId )
+        public AsyncJob<NumberOfPlayersCallback> GetNumberOfCurrentPlayers( GameID gameId )
         {
             var msg = new ClientMsg<MsgClientGetNumberOfCurrentPlayers>();
             msg.SourceJobID = Client.GetNextJobID();
@@ -44,17 +44,18 @@ public JobID GetNumberOfCurrentPlayers( GameID gameId )
 
             Client.Send( msg );
 
-            return msg.SourceJobID;
+            return new AsyncJob<NumberOfPlayersCallback>( this.Client, msg.SourceJobID );
         }
 
         /// <summary>
         /// Asks the Steam back-end for a leaderboard by name for a given appid.
         /// Results are returned in a <see cref="FindOrCreateLeaderboardCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="appId">The AppID to request a leaderboard for.</param>
         /// <param name="name">Name of the leaderboard to request.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="FindOrCreateLeaderboardCallback"/>.</returns>
-        public JobID FindLeaderboard( uint appId, string name )
+        public AsyncJob<FindOrCreateLeaderboardCallback> FindLeaderboard( uint appId, string name )
         {
             var msg = new ClientMsgProtobuf<CMsgClientLBSFindOrCreateLB>( EMsg.ClientLBSFindOrCreateLB );
             msg.SourceJobID = Client.GetNextJobID();
@@ -68,18 +69,19 @@ public JobID FindLeaderboard( uint appId, string name )
 
             Client.Send( msg );
 
-            return msg.SourceJobID;
+            return new AsyncJob<FindOrCreateLeaderboardCallback>( this.Client, msg.SourceJobID );
         }
         /// <summary>
         /// Asks the Steam back-end for a leaderboard by name, and will create it if it's not yet.
         /// Results are returned in a <see cref="FindOrCreateLeaderboardCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="appId">The AppID to request a leaderboard for.</param>
         /// <param name="name">Name of the leaderboard to create.</param>
         /// <param name="sortMethod">Sort method to use for this leaderboard</param>
         /// <param name="displayType">Display type for this leaderboard.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="FindOrCreateLeaderboardCallback"/>.</returns>
-        public JobID CreateLeaderboard( uint appId, string name, ELeaderboardSortMethod sortMethod, ELeaderboardDisplayType displayType )
+        public AsyncJob<FindOrCreateLeaderboardCallback> CreateLeaderboard( uint appId, string name, ELeaderboardSortMethod sortMethod, ELeaderboardDisplayType displayType )
         {
             var msg = new ClientMsgProtobuf<CMsgClientLBSFindOrCreateLB>( EMsg.ClientLBSFindOrCreateLB );
             msg.SourceJobID = Client.GetNextJobID();
@@ -95,12 +97,13 @@ public JobID CreateLeaderboard( uint appId, string name, ELeaderboardSortMethod
 
             Client.Send( msg );
 
-            return msg.SourceJobID;
+            return new AsyncJob<FindOrCreateLeaderboardCallback>( this.Client, msg.SourceJobID );
         }
 
         /// <summary>
         /// Asks the Steam back-end for a set of rows in the leaderboard.
         /// Results are returned in a <see cref="LeaderboardEntriesCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="appId">The AppID to request leaderboard rows for.</param>
         /// <param name="id">ID of the leaderboard to view.</param>
@@ -108,7 +111,7 @@ public JobID CreateLeaderboard( uint appId, string name, ELeaderboardSortMethod
         /// <param name="rangeStart">Range start or 0.</param>
         /// <param name="rangeEnd">Range end or max leaderboard entries.</param>
         /// <param name="dataRequest">Type of request.</param>
-        public JobID GetLeaderboardEntries( uint appId, int id, int rangeStart, int rangeEnd, ELeaderboardDataRequest dataRequest )
+        public AsyncJob<LeaderboardEntriesCallback> GetLeaderboardEntries( uint appId, int id, int rangeStart, int rangeEnd, ELeaderboardDataRequest dataRequest )
         {
             var msg = new ClientMsgProtobuf<CMsgClientLBSGetLBEntries>( EMsg.ClientLBSGetLBEntries );
             msg.SourceJobID = Client.GetNextJobID();
@@ -124,7 +127,7 @@ public JobID GetLeaderboardEntries( uint appId, int id, int rangeStart, int rang
 
             Client.Send( msg );
 
-            return msg.SourceJobID;
+            return new AsyncJob<LeaderboardEntriesCallback>( this.Client, msg.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/Handlers/SteamWorkshop/SteamWorkshop.cs b/SteamKit2/SteamKit2/Steam/Handlers/SteamWorkshop/SteamWorkshop.cs
index b36f5eb6e..b1b676eeb 100644
--- a/SteamKit2/SteamKit2/Steam/Handlers/SteamWorkshop/SteamWorkshop.cs
+++ b/SteamKit2/SteamKit2/Steam/Handlers/SteamWorkshop/SteamWorkshop.cs
@@ -71,10 +71,11 @@ public sealed class EnumerationUserDetails
         /// <summary>
         /// Enumerates the list of published files for the current logged in user.
         /// Results are returned in a <see cref="UserPublishedFilesCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="details">The specific details of the request.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="UserPublishedFilesCallback"/>.</returns>
-        public JobID EnumerateUserPublishedFiles( EnumerationUserDetails details )
+        public AsyncJob<UserPublishedFilesCallback> EnumerateUserPublishedFiles( EnumerationUserDetails details )
         {
             var enumRequest = new ClientMsgProtobuf<CMsgClientUCMEnumerateUserPublishedFiles>( EMsg.ClientUCMEnumerateUserPublishedFiles );
             enumRequest.SourceJobID = Client.GetNextJobID();
@@ -85,15 +86,16 @@ public JobID EnumerateUserPublishedFiles( EnumerationUserDetails details )
 
             Client.Send( enumRequest );
 
-            return enumRequest.SourceJobID;
+            return new AsyncJob<UserPublishedFilesCallback>( this.Client, enumRequest.SourceJobID );
         }
         /// <summary>
         /// Enumerates the list of subscribed files for the current logged in user.
         /// Results are returned in a <see cref="UserSubscribedFilesCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="details">The specific details of the request.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="UserSubscribedFilesCallback"/>.</returns>
-        public JobID EnumerateUserSubscribedFiles( EnumerationUserDetails details )
+        public AsyncJob<UserSubscribedFilesCallback> EnumerateUserSubscribedFiles( EnumerationUserDetails details )
         {
             var enumRequest = new ClientMsgProtobuf<CMsgClientUCMEnumerateUserSubscribedFiles>( EMsg.ClientUCMEnumerateUserSubscribedFiles );
             enumRequest.SourceJobID = Client.GetNextJobID();
@@ -103,16 +105,17 @@ public JobID EnumerateUserSubscribedFiles( EnumerationUserDetails details )
 
             Client.Send( enumRequest );
 
-            return enumRequest.SourceJobID;
+            return new AsyncJob<UserSubscribedFilesCallback>( this.Client, enumRequest.SourceJobID );
         }
 
         /// <summary>
         /// Enumerates the list of published files for the current logged in user based on user action.
         /// Results are returned in a <see cref="UserActionPublishedFilesCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="details">The specific details of the request.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="UserActionPublishedFilesCallback"/>.</returns>
-        public JobID EnumeratePublishedFilesByUserAction( EnumerationUserDetails details )
+        public AsyncJob<UserActionPublishedFilesCallback> EnumeratePublishedFilesByUserAction( EnumerationUserDetails details )
         {
             var enumRequest = new ClientMsgProtobuf<CMsgClientUCMEnumeratePublishedFilesByUserAction>( EMsg.ClientUCMEnumeratePublishedFilesByUserAction );
             enumRequest.SourceJobID = Client.GetNextJobID();
@@ -123,7 +126,7 @@ public JobID EnumeratePublishedFilesByUserAction( EnumerationUserDetails details
 
             Client.Send( enumRequest );
 
-            return enumRequest.SourceJobID;
+            return new AsyncJob<UserActionPublishedFilesCallback>( this.Client, enumRequest.SourceJobID );
         }
 
         /// <summary>
@@ -193,10 +196,11 @@ public EnumerationDetails()
         /// <summary>
         /// Enumerates the list of all published files on the Steam workshop.
         /// Results are returned in a <see cref="PublishedFilesCallback"/>.
+        /// The returned <see cref="AsyncJob{T}"/> can also be awaited to retrieve the callback result.
         /// </summary>
         /// <param name="details">The specific details of the request.</param>
         /// <returns>The Job ID of the request. This can be used to find the appropriate <see cref="PublishedFilesCallback"/>.</returns>
-        public JobID EnumeratePublishedFiles( EnumerationDetails details )
+        public AsyncJob<PublishedFilesCallback> EnumeratePublishedFiles( EnumerationDetails details )
         {
             var enumRequest = new ClientMsgProtobuf<CMsgCREEnumeratePublishedFiles>( EMsg.CREEnumeratePublishedFiles );
             enumRequest.SourceJobID = Client.GetNextJobID();
@@ -215,7 +219,7 @@ public JobID EnumeratePublishedFiles( EnumerationDetails details )
 
             Client.Send( enumRequest );
 
-            return enumRequest.SourceJobID;
+            return new AsyncJob<PublishedFilesCallback>( this.Client, enumRequest.SourceJobID );
         }
 
         /// <summary>
diff --git a/SteamKit2/SteamKit2/Steam/SteamClient/AsyncJobManager.cs b/SteamKit2/SteamKit2/Steam/SteamClient/AsyncJobManager.cs
new file mode 100644
index 000000000..8610708ac
--- /dev/null
+++ b/SteamKit2/SteamKit2/Steam/SteamClient/AsyncJobManager.cs
@@ -0,0 +1,204 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SteamKit2
+{
+    class AsyncJobManager
+    {
+        internal ConcurrentDictionary<JobID, AsyncJob> asyncJobs;
+        internal ScheduledFunction jobTimeoutFunc;
+
+        public AsyncJobManager()
+        {
+            asyncJobs = new ConcurrentDictionary<JobID, AsyncJob>();
+
+            jobTimeoutFunc = new ScheduledFunction( CancelTimedoutJobs, TimeSpan.FromSeconds( 1 ) );
+        }
+
+
+        /// <summary>
+        /// Tracks a job with this manager.
+        /// </summary>
+        /// <param name="asyncJob">The asynchronous job to track.</param>
+        public void StartJob( AsyncJob asyncJob )
+        {
+            asyncJobs.TryAdd( asyncJob, asyncJob );
+        }
+        /// <summary>
+        /// Passes a callback to a pending async job.
+        /// If the given callback completes the job, the job is removed from this manager.
+        /// </summary>
+        /// <param name="jobId">The JobID.</param>
+        /// <param name="callback">The callback.</param>
+        public void TryCompleteJob( JobID jobId, CallbackMsg callback )
+        {
+            AsyncJob asyncJob = GetJob( jobId );
+
+            if ( asyncJob == null )
+            {
+                // not a job we are tracking ourselves, can ignore it
+                return;
+            }
+
+            // pass this callback into the job so it can determine if the job is finished (in the case of multiple responses to a job)
+            bool jobFinished = asyncJob.AddResult( callback );
+
+            if ( jobFinished )
+            {
+                // if the job is finished, we can stop tracking it
+                asyncJobs.TryRemove( jobId, out asyncJob );
+            }
+        }
+
+        /// <summary>
+        /// Extends the lifetime of a job.
+        /// </summary>
+        /// <param name="jobId">The job identifier.</param>
+        public void HeartbeatJob( JobID jobId )
+        {
+            AsyncJob asyncJob = GetJob( jobId );
+
+            if ( asyncJob == null )
+            {
+                // ignore heartbeats for jobs we're not tracking
+                return;
+            }
+
+            asyncJob.Heartbeat();
+        }
+        /// <summary>
+        /// Marks a certain job as remotely failed.
+        /// </summary>
+        /// <param name="jobId">The job identifier.</param>
+        public void FailJob( JobID jobId )
+        {
+            AsyncJob asyncJob = GetJob( jobId, andRemove: true );
+
+            if ( asyncJob == null )
+            {
+                // ignore remote failures for jobs we're not tracking
+                return;
+            }
+
+            asyncJob.SetFailed( dueToRemoteFailure: true );
+            
+        }
+
+        /// <summary>
+        /// Cancels and clears all jobs being tracked.
+        /// </summary>
+        public void CancelPendingJobs()
+        {
+            foreach ( AsyncJob asyncJob in asyncJobs.Values )
+            {
+                asyncJob.SetFailed( dueToRemoteFailure: false );
+            }
+
+            asyncJobs.Clear();
+        }
+
+
+        /// <summary>
+        /// Enables or disables periodic checks for job timeouts.
+        /// </summary>
+        /// <param name="enable">Whether or not job timeout checks should be enabled.</param>
+        public void SetTimeoutsEnabled( bool enable )
+        {
+            if ( enable )
+            {
+                jobTimeoutFunc.Start();
+            }
+            else
+            {
+                jobTimeoutFunc.Stop();
+            }
+        }
+
+
+        /// <summary>
+        /// This is called periodically to cancel and clear out any jobs that have timed out (no response from Steam).
+        /// </summary>
+        void CancelTimedoutJobs()
+        {
+            // ConcurrentDictionary.Values performs a full copy, so this iteration is safe
+            // see: http://referencesource.microsoft.com/#mscorlib/system/Collections/Concurrent/ConcurrentDictionary.cs,fe55c11912af21d2
+            foreach ( AsyncJob job in asyncJobs.Values )
+            {
+                if ( job.IsTimedout )
+                {
+                    job.SetFailed( dueToRemoteFailure: false );
+
+                    AsyncJob ignored;
+                    asyncJobs.TryRemove( job, out ignored );
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Retrieves a job from this manager, and optionally removes it from tracking.
+        /// </summary>
+        /// <param name="jobId">The JobID.</param>
+        /// <param name="andRemove">If set to <c>true</c>, this job is removed from tracking.</param>
+        /// <returns></returns>
+        AsyncJob GetJob( JobID jobId, bool andRemove = false )
+        {
+            AsyncJob asyncJob;
+            bool foundJob = false;
+
+            if ( andRemove )
+            {
+                foundJob = asyncJobs.TryRemove( jobId, out asyncJob );
+            }
+            else
+            {
+                foundJob = asyncJobs.TryGetValue( jobId, out asyncJob );
+            }
+
+            if ( !foundJob )
+            {
+                // requested a job we're not tracking
+                return null;
+            }
+
+            return asyncJob;
+        }
+    }
+
+
+    /// <summary>
+    /// Thrown when Steam encounters a remote error with a pending <see cref="AsyncJob"/>.
+    /// </summary>
+    public class AsyncJobFailedException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncJobFailedException"/> class.
+        /// </summary>
+        public AsyncJobFailedException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncJobFailedException"/> class.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public AsyncJobFailedException( string message )
+            : base( message )
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncJobFailedException"/> class.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
+        public AsyncJobFailedException( string message, Exception innerException )
+            : base( message, innerException )
+        {
+        }
+    }
+}
diff --git a/SteamKit2/SteamKit2/Steam/SteamClient/SteamClient.cs b/SteamKit2/SteamKit2/Steam/SteamClient/SteamClient.cs
index d621e0dc4..0c3356ae7 100644
--- a/SteamKit2/SteamKit2/Steam/SteamClient/SteamClient.cs
+++ b/SteamKit2/SteamKit2/Steam/SteamClient/SteamClient.cs
@@ -6,6 +6,7 @@
 
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net.Sockets;
@@ -31,6 +32,8 @@ public sealed partial class SteamClient : CMClient
 
         Dictionary<EMsg, Action<IPacketMsg>> dispatchMap;
 
+        internal AsyncJobManager jobManager;
+
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SteamClient"/> class with a specific connection type.
@@ -69,7 +72,13 @@ public SteamClient( ProtocolType type = ProtocolType.Tcp )
 
                 { EMsg.ClientCMList, HandleCMList },
                 { EMsg.ClientServerList, HandleServerList },
+
+                // to support asyncjob life time
+                { EMsg.JobHeartbeat, HandleJobHeartbeat },
+                { EMsg.DestJobFailed, HandleJobFailed },
             };
+
+            jobManager = new AsyncJobManager();
         }
 
 
@@ -245,10 +254,13 @@ public void PostCallback( CallbackMsg msg )
                 callbackQueue.Enqueue( msg );
                 Monitor.Pulse( callbackLock );
             }
+
+            jobManager.TryCompleteJob( msg.JobID, msg );
         }
         #endregion
 
 
+        #region Jobs
         /// <summary>
         /// Returns the next available JobID for job based messages.
         /// This function is thread-safe.
@@ -265,6 +277,11 @@ public JobID GetNextJobID()
                 StartTime = processStartTime
             };
         }
+        internal void StartJob( AsyncJob job )
+        {
+            jobManager.StartJob( job );
+        }
+        #endregion
 
 
         /// <summary>
@@ -316,6 +333,11 @@ protected override bool OnClientMsgReceived( IPacketMsg packetMsg )
         /// </summary>
         protected override void OnClientDisconnected( bool userInitiated )
         {
+            // if we are disconnected, cancel all pending jobs
+            jobManager.CancelPendingJobs();
+
+            jobManager.SetTimeoutsEnabled( false );
+
             PostCallback( new DisconnectedCallback( userInitiated ) );
         }
 
@@ -326,6 +348,8 @@ void HandleEncryptResult( IPacketMsg packetMsg )
 
             if ( encResult.Body.Result == EResult.OK )
             {
+                jobManager.SetTimeoutsEnabled( true );
+
                 PostCallback( new ConnectedCallback( encResult.Body ) );
             }
         }
@@ -336,7 +360,6 @@ void HandleCMList( IPacketMsg packetMsg )
 
             PostCallback( new CMListCallback( cmMsg.Body ) );
         }
-
         void HandleServerList( IPacketMsg packetMsg )
         {
             var listMsg = new ClientMsgProtobuf<CMsgClientServerList>( packetMsg );
@@ -344,5 +367,14 @@ void HandleServerList( IPacketMsg packetMsg )
             PostCallback( new ServerListCallback( listMsg.Body ) );
         }
 
+        void HandleJobHeartbeat( IPacketMsg packetMsg )
+        {
+            jobManager.HeartbeatJob( packetMsg.TargetJobID );
+        }
+        void HandleJobFailed( IPacketMsg packetMsg )
+        {
+            jobManager.FailJob( packetMsg.TargetJobID );
+        }
+
     }
 }
diff --git a/SteamKit2/SteamKit2/SteamKit2.csproj b/SteamKit2/SteamKit2/SteamKit2.csproj
index d707bd2e2..34bec535b 100644
--- a/SteamKit2/SteamKit2/SteamKit2.csproj
+++ b/SteamKit2/SteamKit2/SteamKit2.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SteamKit2</RootNamespace>
     <AssemblyName>SteamKit2</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
@@ -47,6 +47,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\SteamKit2.XML</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -59,6 +60,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\SteamKit2.xml</DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
@@ -145,6 +147,7 @@
     <Compile Include="Steam\Handlers\SteamWorkshop\Callbacks.cs" />
     <Compile Include="Steam\Handlers\SteamWorkshop\SteamWorkshop.cs" />
     <Compile Include="Steam\Handlers\SteamUserStats\SteamUserStats.cs" />
+    <Compile Include="Steam\SteamClient\AsyncJobManager.cs" />
     <Compile Include="Steam\SteamClient\CallbackMgr\CallbackMgr.cs" />
     <Compile Include="Steam\UFSClient\Callbacks.cs" />
     <Compile Include="Steam\UFSClient\UFSClient.cs" />
@@ -152,6 +155,7 @@
     <Compile Include="Steam\WebAPI\WebAPI.cs" />
     <Compile Include="Types\GlobalID.cs" />
     <Compile Include="Types\DepotManifest.cs" />
+    <Compile Include="Types\JobID.cs" />
     <Compile Include="Types\MessageObject.cs" />
     <Compile Include="Types\PubFile.cs" />
     <Compile Include="Util\AsnKeyParser.cs" />
diff --git a/SteamKit2/SteamKit2/Types/GlobalID.cs b/SteamKit2/SteamKit2/Types/GlobalID.cs
index 8fbf0e8ae..8a84ab95c 100644
--- a/SteamKit2/SteamKit2/Types/GlobalID.cs
+++ b/SteamKit2/SteamKit2/Types/GlobalID.cs
@@ -224,59 +224,6 @@ public override string ToString()
 
     }
 
-    /// <summary>
-    /// Represents an identifier of a network task known as a job.
-    /// </summary>
-    public sealed class JobID : GlobalID
-    {
-        /// <summary>
-        /// Represents an invalid JobID.
-        /// </summary>
-        public static readonly JobID Invalid = new JobID();
-
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JobID"/> class.
-        /// </summary>
-        public JobID()
-            : base()
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JobID"/> class.
-        /// </summary>
-        /// <param name="jobId">The Job ID to initialize this instance with.</param>
-        public JobID( ulong jobId )
-            : base( jobId )
-        {
-        }
-
-
-        /// <summary>
-        /// Performs an implicit conversion from <see cref="SteamKit2.JobID"/> to <see cref="System.UInt64"/>.
-        /// </summary>
-        /// <param name="jobId">The Job ID.</param>
-        /// <returns>
-        /// The result of the conversion.
-        /// </returns>
-        public static implicit operator ulong( JobID jobId )
-        {
-            return jobId.Value;
-        }
-
-        /// <summary>
-        /// Performs an implicit conversion from <see cref="System.UInt64"/> to <see cref="SteamKit2.JobID"/>.
-        /// </summary>
-        /// <param name="jobId">The Job ID.</param>
-        /// <returns>
-        /// The result of the conversion.
-        /// </returns>
-        public static implicit operator JobID( ulong jobId )
-        {
-            return new JobID( jobId );
-        }
-    }
-
     /// <summary>
     /// Represents a single unique handle to a piece of User Generated Content.
     /// </summary>
diff --git a/SteamKit2/SteamKit2/Types/JobID.cs b/SteamKit2/SteamKit2/Types/JobID.cs
new file mode 100644
index 000000000..282e3ee0d
--- /dev/null
+++ b/SteamKit2/SteamKit2/Types/JobID.cs
@@ -0,0 +1,377 @@
+/*
+ * This file is subject to the terms and conditions defined in
+ * file 'license.txt', which is part of this source code package.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SteamKit2
+{
+    /// <summary>
+    /// Represents an identifier of a network task known as a job.
+    /// </summary>
+    public class JobID : GlobalID
+    {
+        /// <summary>
+        /// Represents an invalid JobID.
+        /// </summary>
+        public static readonly JobID Invalid = new JobID();
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JobID"/> class.
+        /// </summary>
+        public JobID()
+            : base()
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JobID"/> class.
+        /// </summary>
+        /// <param name="jobId">The Job ID to initialize this instance with.</param>
+        public JobID( ulong jobId )
+            : base( jobId )
+        {
+        }
+
+
+        /// <summary>
+        /// Performs an implicit conversion from <see cref="SteamKit2.JobID"/> to <see cref="System.UInt64"/>.
+        /// </summary>
+        /// <param name="jobId">The Job ID.</param>
+        /// <returns>
+        /// The result of the conversion.
+        /// </returns>
+        public static implicit operator ulong ( JobID jobId )
+        {
+            return jobId.Value;
+        }
+
+        /// <summary>
+        /// Performs an implicit conversion from <see cref="System.UInt64"/> to <see cref="SteamKit2.JobID"/>.
+        /// </summary>
+        /// <param name="jobId">The Job ID.</param>
+        /// <returns>
+        /// The result of the conversion.
+        /// </returns>
+        public static implicit operator JobID( ulong jobId )
+        {
+            return new JobID( jobId );
+        }
+
+        /// <summary>
+        /// Performs an implicit conversion from <see cref="AsyncJob"/> to <see cref="JobID"/>.
+        /// </summary>
+        /// <param name="asyncJob">The asynchronous job.</param>
+        /// <returns>
+        /// The result of the conversion.
+        /// </returns>
+        public static implicit operator JobID( AsyncJob asyncJob )
+        {
+            return asyncJob.JobID;
+        }
+    }
+
+    /// <summary>
+    /// The base class for awaitable versions of a <see cref="JobID"/>.
+    /// Should not be used or constructed directly, but rather with <see cref="AsyncJob{T}"/>.
+    /// </summary>
+    public abstract class AsyncJob
+    {
+        DateTime jobStart;
+
+
+        /// <summary>
+        /// Gets the <see cref="JobID"/> for this job.
+        /// </summary>
+        public JobID JobID { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the period of time before this job will be considered timed out and will be canceled. By default this is 10 seconds.
+        /// </summary>
+        public TimeSpan Timeout { get; set; } = TimeSpan.FromSeconds( 10 );
+
+        internal bool IsTimedout
+        {
+            get { return DateTime.UtcNow >= jobStart + Timeout; }
+        }
+
+
+        internal AsyncJob( SteamClient client, ulong jobId )
+        {
+            jobStart = DateTime.UtcNow;
+            JobID = jobId;
+
+            client.StartJob( this );
+        }
+
+
+        /// <summary>
+        /// Adds a callback to the async job's result set.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        /// <returns><c>true</c> if this result completes the set; otherwise, <c>false</c>.</returns>
+        internal abstract bool AddResult( CallbackMsg callback );
+
+        /// <summary>
+        /// Sets this job as failed, either remotely or due to a message timeout.
+        /// </summary>
+        /// <param name="dueToRemoteFailure">
+        /// If set to <c>true</c> this job is marked as failed because Steam informed us of a job failure;
+        /// otherwise, this job has failed due to a message timeout.
+        /// </param>
+        internal abstract void SetFailed( bool dueToRemoteFailure );
+
+        /// <summary>
+        /// Marks this job as having received a heartbeat and extends the job's timeout.
+        /// </summary>
+        internal void Heartbeat()
+        {
+            // extend timeout for this job, as Steam is informing us that more messages will follow
+            Timeout += TimeSpan.FromSeconds( 10 );
+        }
+    }
+
+    /// <summary>
+    /// Represents an awaitable version of a <see cref="JobID"/>.
+    /// Can either be converted to a TPL <see cref="Task"/> with <see cref="ToTask"/> or can be awaited directly.
+    /// </summary>
+    /// <typeparam name="T">The callback type that will be returned by this async job.</typeparam>
+    public sealed class AsyncJob<T> : AsyncJob
+        where T : CallbackMsg
+    {
+        TaskCompletionSource<T> tcs;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncJob{T}" /> class.
+        /// </summary>
+        /// <param name="client">The <see cref="SteamClient"/> that this job will be associated with.</param>
+        /// <param name="jobId">The Job ID value associated with this async job.</param>
+        public AsyncJob( SteamClient client, JobID jobId )
+            : base( client, jobId )
+        {
+            tcs = new TaskCompletionSource<T>();
+        }
+
+
+        /// <summary>
+        /// Converts this <see cref="AsyncJob{T}"/> instance into a TPL <see cref="Task{T}"/>.
+        /// </summary>
+        /// <returns></returns>
+        public Task<T> ToTask()
+        {
+            return tcs.Task;
+        }
+
+        /// <summary>Gets an awaiter used to await this <see cref="AsyncJob{T}"/>.</summary>
+        /// <returns>An awaiter instance.</returns>
+        /// <remarks>This method is intended for compiler use rather than use directly in code.</remarks>
+        public TaskAwaiter<T> GetAwaiter()
+        {
+            return ToTask().GetAwaiter();
+        }
+
+
+        /// <summary>
+        /// Adds a callback to the async job's result set. For an <see cref="AsyncJob{T}"/>, this always completes the set.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        /// <returns>Always <c>true</c>.</returns>
+        internal override bool AddResult( CallbackMsg callback )
+        {
+            if ( callback == null )
+            {
+                throw new ArgumentNullException( nameof( callback ) );
+            }
+
+            // we're complete with just this callback
+            tcs.TrySetResult( (T)callback );
+
+            // inform steamclient that this job wishes to be removed from tracking since we've recieved the single callback we were waiting for
+            return true;
+        }
+
+        /// <summary>
+        /// Sets this job as failed, either remotely or due to a message timeout.
+        /// </summary>
+        /// <param name="dueToRemoteFailure">
+        /// If set to <c>true</c> this job is marked as failed because Steam informed us of a job failure;
+        /// otherwise, this job has failed due to a message timeout.
+        /// </param>
+        internal override void SetFailed( bool dueToRemoteFailure )
+        {
+            if ( dueToRemoteFailure )
+            {
+                // if steam informs us of a remote failure, we cancel with our exception
+                tcs.TrySetException( new AsyncJobFailedException() );
+            }
+            else
+            {
+                // if we time out, we trigger a normal cancellation
+                tcs.TrySetCanceled();
+            }
+            
+        }
+    }
+
+    /// <summary>
+    /// Represents an awaitable version of a <see cref="JobID"/>.
+    /// Can either be converted to a TPL <see cref="Task"/> with <see cref="ToTask"/> or can be awaited directly.
+    /// This type of async job can contain multiple callback results.
+    /// </summary>
+    /// <typeparam name="T">The callback type that will be returned by this async job.</typeparam>
+    public sealed class AsyncJobMultiple<T> : AsyncJob
+        where T : CallbackMsg
+    {
+        /// <summary>
+        /// The set of callback results for an <see cref="AsyncJobMultiple{T}"/>.
+        /// </summary>
+        public sealed class ResultSet
+        {
+            /// <summary>
+            /// Gets a value indicating whether this <see cref="AsyncJobMultiple{T}.ResultSet" /> is complete and contains every result sent by Steam.
+            /// </summary>
+            public bool Complete { get; internal set; }
+
+            /// <summary>
+            /// Gets a value indicating whether the parent <see cref="AsyncJobMultiple{T}" /> received an incomplete result set and then encountered a remote failure.
+            /// </summary>
+            public bool Failed { get; internal set; }
+
+            /// <summary>
+            /// Gets a read only collection of callback results for this async job.
+            /// </summary>
+            public ReadOnlyCollection<T> Results { get; internal set; }
+        }
+
+
+        TaskCompletionSource<ResultSet> tcs;
+        Predicate<T> finishCondition;
+
+        List<T> results = new List<T>();
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AsyncJob{T}" /> class.
+        /// </summary>
+        /// <param name="client">The <see cref="SteamClient"/> that this job will be associated with.</param>
+        /// <param name="jobId">The Job ID value associated with this async job.</param>
+        /// <param name="finishCondition">The condition that must be fulfilled for the result set to be considered complete.</param>
+        public AsyncJobMultiple( SteamClient client, JobID jobId, Predicate<T> finishCondition )
+                    : base( client, jobId )
+        {
+            tcs = new TaskCompletionSource<ResultSet>();
+
+            this.finishCondition = finishCondition;
+        }
+
+
+        /// <summary>
+        /// Converts this <see cref="AsyncJob{T}"/> instance into a TPL <see cref="Task{T}"/>.
+        /// </summary>
+        /// <returns></returns>
+        public Task<ResultSet> ToTask()
+        {
+            return tcs.Task;
+        }
+
+        /// <summary>Gets an awaiter used to await this <see cref="AsyncJob{T}"/>.</summary>
+        /// <returns>An awaiter instance.</returns>
+        /// <remarks>This method is intended for compiler use rather than use directly in code.</remarks>
+        public TaskAwaiter<ResultSet> GetAwaiter()
+        {
+            return ToTask().GetAwaiter();
+        }
+
+
+        /// <summary>
+        /// Adds a callback to the async job's result set.
+        /// </summary>
+        /// <param name="callback">The callback.</param>
+        /// <returns><c>true</c> if this result completes the set; otherwise, <c>false</c>.</returns>
+        internal override bool AddResult( CallbackMsg callback )
+        {
+            if ( callback == null )
+            {
+                throw new ArgumentNullException( nameof( callback ) );
+            }
+
+            T callbackMsg = (T)callback;
+
+            // add this callback to our result set
+            results.Add( callbackMsg );
+
+            if ( finishCondition( callbackMsg ) )
+            {
+                // if we've passed our finish condition based on this callback
+                // (for instance, if steam tells us we have no more pending messages for this job)
+                // then we're complete
+
+                tcs.TrySetResult( new ResultSet { Complete = true, Results = new ReadOnlyCollection<T>( results ) } );
+
+                return true;
+            }
+            else
+            {
+                // otherwise, we're not complete and we'll wait for the next message
+                // trigger heartbeat logic to keep this job alive as it waits for the next message
+                Heartbeat();
+
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Sets this job as failed, either remotely or due to a message timeout.
+        /// </summary>
+        /// <param name="dueToRemoteFailure">
+        /// If set to <c>true</c> this job is marked as failed because Steam informed us of a job failure;
+        /// otherwise, this job has failed due to a message timeout.
+        /// </param>
+        internal override void SetFailed( bool dueToRemoteFailure )
+        {
+            // steamclient is informing this async job that we've either timed out or failed while waiting for an additional callback
+            // now we have to determine what to do:
+
+            if ( results.Count == 0 )
+            {
+                // if we have zero callbacks in our result set, we cancel this task
+
+                if ( dueToRemoteFailure )
+                {
+                    // if we're canceling with a remote failure, post a job failure exception
+                    tcs.TrySetException( new AsyncJobFailedException() );
+                }
+                else
+                {
+                    // otherwise, normal task cancelation for timeouts
+                    tcs.TrySetCanceled();
+                }
+            }
+            else
+            {
+                // if we do have a partial result set, we can complete this job with the results we have and let consumers
+                // work out what they want to do with the incomplete set
+
+                var resultSet = new ResultSet
+                {
+                    // we're not a complete set
+                    Complete = false,
+                    // let consumers know if we've failed because of a remote failure
+                    Failed = dueToRemoteFailure,
+
+                    Results = new ReadOnlyCollection<T>( results ),
+                };
+
+                tcs.TrySetResult( resultSet );
+            }
+        }
+    }
+}
diff --git a/SteamKit2/SteamKit2/packages.config b/SteamKit2/SteamKit2/packages.config
index b32f14f4f..9dbdc9cd9 100644
--- a/SteamKit2/SteamKit2/packages.config
+++ b/SteamKit2/SteamKit2/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="protobuf-net" version="2.0.0.668" targetFramework="net40" />
+  <package id="protobuf-net" version="2.0.0.668" targetFramework="net4" />
 </packages>
\ No newline at end of file
diff --git a/SteamKit2/Tests/AsyncJobFacts.cs b/SteamKit2/Tests/AsyncJobFacts.cs
new file mode 100644
index 000000000..e251d0da9
--- /dev/null
+++ b/SteamKit2/Tests/AsyncJobFacts.cs
@@ -0,0 +1,364 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SteamKit2;
+using Xunit;
+
+namespace Tests
+{
+    public class AsyncJobFacts
+    {
+        class Callback : CallbackMsg
+        {
+            public bool IsFinished { get; set; }
+        }
+
+        [Fact]
+        public void AsyncJobCtorRegistersJob()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+
+            Assert.True( client.jobManager.asyncJobs.ContainsKey( asyncJob ), "Async job dictionary should contain the jobid key" );
+            Assert.True( client.jobManager.asyncJobs.ContainsKey( 123 ), "Async job dictionary should contain jobid key as a value type" );
+        }
+
+        [Fact]
+        public void AysncJobCompletesOnCallback()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+            Task<Callback> asyncTask = asyncJob.ToTask();
+
+            client.PostCallback( new Callback { JobID = 123 } );
+
+            Assert.True( asyncTask.IsCompleted, "Async job should be completed after callback is posted" );
+            Assert.False( asyncTask.IsCanceled, "Async job should not be canceled after callback is posted" );
+            Assert.False( asyncTask.IsFaulted, "Async job should not be faulted after callback is posted" );
+        }
+
+        [Fact]
+        public void AsyncJobClearsOnCompletion()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+
+            client.PostCallback( new Callback { JobID = 123 } );
+
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( asyncJob ), "Async job dictionary should no longer contain jobid key after callback is posted" );
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( 123 ), "Async job dictionary should no longer contain jobid key (as value type) after callback is posted" );
+        }
+
+        [Fact]
+        public async void AsyncJobClearsOnTimeout()
+        {
+            SteamClient client = new SteamClient();
+            client.jobManager.SetTimeoutsEnabled( true );
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+            asyncJob.Timeout = TimeSpan.FromSeconds( 1 );
+
+            await Task.Delay( TimeSpan.FromSeconds( 5 ) );
+
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( asyncJob ), "Async job dictionary should no longer contain jobid key after timeout" );
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( 123 ), "Async job dictionary should no longer contain jobid key (as value type) after timeout" );
+        }
+
+        [Fact]
+        public async void AsyncJobCancelsOnSetFailedTimeout()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+            Task<Callback> asyncTask = asyncJob.ToTask();
+
+            asyncJob.SetFailed( dueToRemoteFailure: false );
+            
+            Assert.True( asyncTask.IsCompleted, "Async job should be completed on message timeout" );
+            Assert.True( asyncTask.IsCanceled, "Async job should be canceled on message timeout" );
+            Assert.False( asyncTask.IsFaulted, "Async job should not be faulted on message timeout" );
+
+            await Assert.ThrowsAsync( typeof( TaskCanceledException ), async () => await asyncTask );
+        }
+
+        [Fact]
+        public void AsyncJobGivesBackCallback()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+            Task<Callback> jobTask = asyncJob.ToTask();
+
+            Callback ourCallback = new Callback { JobID = 123 };
+
+            client.PostCallback( ourCallback );
+
+            Assert.Same( jobTask.Result, ourCallback );
+        }
+
+        [Fact]
+        public async void AsyncJobTimesout()
+        {
+            SteamClient client = new SteamClient();
+            client.jobManager.SetTimeoutsEnabled( true );
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+            asyncJob.Timeout = TimeSpan.FromSeconds( 1 );
+
+            Task<Callback> asyncTask = asyncJob.ToTask();
+
+            await Task.Delay( TimeSpan.FromSeconds( 5 ) );
+
+            Assert.True( asyncTask.IsCompleted, "Async job should be completed after 5 seconds of a 1 second job timeout" );
+            Assert.True( asyncTask.IsCanceled, "Async job should be canceled after 5 seconds of a 1 second job timeout" );
+            Assert.False( asyncTask.IsFaulted, "Async job should not be faulted after 5 seconds of a 1 second job timeout" );
+
+            await Assert.ThrowsAsync( typeof( TaskCanceledException ), async () => await asyncTask );
+        }
+
+        [Fact]
+        public void AsyncJobThrowsExceptionOnNullCallback()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+
+            Assert.Throws<ArgumentNullException>( () => asyncJob.AddResult( null ) );
+        }
+
+        [Fact]
+        public async void AsyncJobThrowsFailureExceptionOnFailure()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJob<Callback> asyncJob = new AsyncJob<Callback>( client, 123 );
+            Task<Callback> asyncTask = asyncJob.ToTask();
+
+            asyncJob.SetFailed( dueToRemoteFailure: true );
+
+            Assert.True( asyncTask.IsCompleted, "Async job should be completed after job failure" );
+            Assert.False( asyncTask.IsCanceled, "Async job should not be canceled after job failure" );
+            Assert.True( asyncTask.IsFaulted, "Async job should be faulted after job failure" );
+
+            await Assert.ThrowsAsync( typeof( AsyncJobFailedException ), async () => await asyncTask );
+        }
+
+        [Fact]
+        public void AsyncJobMultipleFinishedOnEmptyPredicate()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => true );
+            Task<AsyncJobMultiple<Callback>.ResultSet> asyncTask = asyncJob.ToTask();
+
+            bool jobFinished = asyncJob.AddResult( new Callback { JobID = 123 } );
+
+            Assert.True( jobFinished, "Async job should inform that it is completed when completion predicate is always true and a result is given" );
+            Assert.True( asyncTask.IsCompleted, "Async job should be completed when empty predicate result is given" );
+            Assert.False( asyncTask.IsCanceled, "Async job should not be canceled when empty predicate result is given" );
+            Assert.False( asyncTask.IsFaulted, "Async job should not be faulted when empty predicate result is given" );
+        }
+
+        [Fact]
+        public void AsyncJobMultipleFinishedOnPredicate()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => call.IsFinished );
+            Task<AsyncJobMultiple<Callback>.ResultSet> asyncTask = asyncJob.ToTask();
+
+            bool jobFinished = asyncJob.AddResult( new Callback { JobID = 123, IsFinished = false } );
+
+            Assert.False( jobFinished, "Async job should not inform that it is finished when completion predicate is false after a result is given" );
+            Assert.False( asyncTask.IsCompleted, "Async job should not be completed when completion predicate is false" );
+            Assert.False( asyncTask.IsCanceled, "Async job should not be canceled when completion predicate is false" );
+            Assert.False( asyncTask.IsFaulted, "Async job should not be faulted when completion predicate is false" );
+
+            jobFinished = asyncJob.AddResult( new Callback { JobID = 123, IsFinished = true } );
+
+            Assert.True( jobFinished, "Async job should inform completion when completion predicat is passed after a result is given" );
+            Assert.True( asyncTask.IsCompleted, "Async job should be completed when completion predicate is true" );
+            Assert.False( asyncTask.IsCanceled, "Async job should not be canceled when completion predicate is true" );
+            Assert.False( asyncTask.IsFaulted, "Async job should not be faulted when completion predicate is true" );
+        }
+
+        [Fact]
+        public void AsyncJobMultipleClearsOnCompletion()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => call.IsFinished );
+
+            client.PostCallback( new Callback { JobID = 123, IsFinished = true } );
+
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( asyncJob ), "Async job dictionary should not contain jobid key for AsyncJobMultiple on completion" );
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( 123 ), "Async job dictionary should not contain jobid key (as value type) for AsyncJobMultiple on completion" );
+        }
+
+        [Fact]
+        public async void AsyncJobMultipleClearsOnTimeout()
+        {
+            SteamClient client = new SteamClient();
+            client.jobManager.SetTimeoutsEnabled( true );
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, ccall => true );
+            asyncJob.Timeout = TimeSpan.FromSeconds( 1 );
+
+            await Task.Delay( TimeSpan.FromSeconds( 5 ) );
+
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( asyncJob ), "Async job dictionary should no longer contain jobid key after timeout" );
+            Assert.False( client.jobManager.asyncJobs.ContainsKey( 123 ), "Async job dictionary should no longer contain jobid key (as value type) after timeout" );
+        }
+
+        [Fact]
+        public async void AsyncJobMultipleExtendsTimeoutOnMessage()
+        {
+            SteamClient client = new SteamClient();
+            client.jobManager.SetTimeoutsEnabled( true );
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => call.IsFinished );
+            asyncJob.Timeout = TimeSpan.FromSeconds( 5 );
+
+            Task<AsyncJobMultiple<Callback>.ResultSet> asyncTask = asyncJob.ToTask();
+
+            // wait 3 seconds before we post any results to this job at all
+            await Task.Delay( TimeSpan.FromSeconds( 3 ) );
+
+            // we should not be completed or canceled yet
+            Assert.False( asyncTask.IsCompleted, "AsyncJobMultiple should not be completed after 3 seconds of 5 second timeout" );
+            Assert.False( asyncTask.IsCanceled, "AsyncJobMultiple should not be canceled after 3 seconds of 5 second timeout" );
+            Assert.False( asyncTask.IsFaulted, "AsyncJobMultiple should not be faulted after 3 econds of 5 second timeout" );
+
+            // give result 1 of 2
+            asyncJob.AddResult( new Callback { JobID = 123, IsFinished = false } );
+
+            // delay for what the original timeout would have been
+            await Task.Delay( TimeSpan.FromSeconds( 5 ) );
+
+            // we still shouldn't be completed or canceled (timed out)
+            Assert.False( asyncTask.IsCompleted, "AsyncJobMultiple should not be completed 5 seconds after a result was added (result should extend timeout)" );
+            Assert.False( asyncTask.IsCanceled, "AsyncJobMultiple should not be canceled 5 seconds after a result was added (result should extend timeout)" );
+            Assert.False( asyncTask.IsFaulted, "AsyncJobMultiple should not be faulted 5 seconds aftr a result was added (result should extend timeout)" );
+
+            asyncJob.AddResult( new Callback { JobID = 123, IsFinished = true } );
+
+            // we should be completed but not canceled or faulted
+            Assert.True( asyncTask.IsCompleted, "AsyncJobMultiple should be completed when final result is added to set" );
+            Assert.False( asyncTask.IsCanceled, "AsyncJobMultiple should not be canceled when final result is added to set" );
+            Assert.False( asyncTask.IsFaulted, "AsyncJobMultiple should not be faulted when final result is added to set" );
+        }
+
+        [Fact]
+        public async void AsyncJobMultipleTimesout()
+        {
+            SteamClient client = new SteamClient();
+            client.jobManager.SetTimeoutsEnabled( true );
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => false );
+            asyncJob.Timeout = TimeSpan.FromSeconds( 1 );
+
+            Task<AsyncJobMultiple<Callback>.ResultSet> asyncTask = asyncJob.ToTask();
+
+            await Task.Delay( TimeSpan.FromSeconds( 5 ) );
+
+            Assert.True( asyncTask.IsCompleted, "AsyncJobMultiple should be completed after 5 seconds of a 1 second job timeout" );
+            Assert.True( asyncTask.IsCanceled, "AsyncJobMultiple should be canceled after 5 seconds of a 1 second job timeout" );
+            Assert.False( asyncTask.IsFaulted, "AsyncJobMultiple should not be faulted after 5 seconds of a 1 second job timeout" );
+
+            await Assert.ThrowsAsync( typeof( TaskCanceledException ), async () => await asyncTask );
+        }
+
+        [Fact]
+        public async void AsyncJobMultipleCompletesOnIncompleteResult()
+        {
+            SteamClient client = new SteamClient();
+            client.jobManager.SetTimeoutsEnabled( true );
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => call.IsFinished );
+            asyncJob.Timeout = TimeSpan.FromSeconds( 1 );
+
+            Task<AsyncJobMultiple<Callback>.ResultSet> asyncTask = asyncJob.ToTask();
+
+            Callback onlyResult = new Callback { JobID = 123, IsFinished = false };
+
+            asyncJob.AddResult( onlyResult );
+
+            // adding a result will extend the job's timeout, but we'll cheat here and decrease it
+            asyncJob.Timeout = TimeSpan.FromSeconds( 1 );
+
+            await Task.Delay( TimeSpan.FromSeconds( 5 ) );
+
+            Assert.True( asyncTask.IsCompleted, "AsyncJobMultiple should be completed on partial (timed out) result set" );
+            Assert.False( asyncTask.IsCanceled, "AsyncJobMultiple should not be canceled on partial (timed out) result set" );
+            Assert.False( asyncTask.IsFaulted, "AsyncJobMultiple should not be faulted on a partial (failed) result set" );
+
+            AsyncJobMultiple<Callback>.ResultSet result = asyncTask.Result;
+
+            Assert.False( result.Complete, "ResultSet should be incomplete" );
+            Assert.False( result.Failed, "ResultSet should not be failed" );
+            Assert.Equal( result.Results.Count, 1 );
+            Assert.Contains( onlyResult, result.Results );
+        }
+
+        [Fact]
+        public void AsyncJobMultipleCompletesOnIncompleteResultAndFailure()
+        {
+            SteamClient client = new SteamClient();
+            client.jobManager.SetTimeoutsEnabled( true );
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => call.IsFinished );
+            asyncJob.Timeout = TimeSpan.FromSeconds( 1 );
+
+            Task<AsyncJobMultiple<Callback>.ResultSet> asyncTask = asyncJob.ToTask();
+
+            Callback onlyResult = new Callback { JobID = 123, IsFinished = false };
+
+            asyncJob.AddResult( onlyResult );
+
+            asyncJob.SetFailed( dueToRemoteFailure: true );
+
+            Assert.True( asyncTask.IsCompleted, "AsyncJobMultiple should be completed on partial (failed) result set" );
+            Assert.False( asyncTask.IsCanceled, "AsyncJobMultiple should not be canceled on partial (failed) result set" );
+            Assert.False( asyncTask.IsFaulted, "AsyncJobMultiple should not be faulted on a partial (failed) result set" );
+
+            AsyncJobMultiple<Callback>.ResultSet result = asyncTask.Result;
+
+            Assert.False( result.Complete, "ResultSet should be incomplete" );
+            Assert.True( result.Failed, "ResultSet should be failed" );
+            Assert.Equal( result.Results.Count, 1 );
+            Assert.Contains( onlyResult, result.Results );
+        }
+
+        [Fact]
+        public void AsyncJobMultipleThrowsExceptionOnNullCallback()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => true );
+
+            Assert.Throws<ArgumentNullException>( () => asyncJob.AddResult( null ) );
+        }
+
+        [Fact]
+        public async void AsyncJobMultipleThrowsFailureExceptionOnFailure()
+        {
+            SteamClient client = new SteamClient();
+
+            AsyncJobMultiple<Callback> asyncJob = new AsyncJobMultiple<Callback>( client, 123, call => false );
+            Task<AsyncJobMultiple<Callback>.ResultSet> asyncTask = asyncJob.ToTask();
+
+            asyncJob.SetFailed( dueToRemoteFailure: true );
+
+            Assert.True( asyncTask.IsCompleted, "AsyncJobMultiple should be completed after job failure" );
+            Assert.False( asyncTask.IsCanceled, "AsyncJobMultiple should not be canceled after job failure" );
+            Assert.True( asyncTask.IsFaulted, "AsyncJobMultiple should be faulted after job failure" );
+
+            await Assert.ThrowsAsync( typeof( AsyncJobFailedException ), async () => await asyncTask );
+        }
+    }
+}
diff --git a/SteamKit2/Tests/ClientMsgFacts.cs b/SteamKit2/Tests/ClientMsgFacts.cs
index e0b72c3d2..1cb66b5b8 100644
--- a/SteamKit2/Tests/ClientMsgFacts.cs
+++ b/SteamKit2/Tests/ClientMsgFacts.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using SteamKit2;
@@ -39,6 +40,16 @@ public class ClientMsgFacts
             0x00,
         };
 
+        public ClientMsgFacts()
+        {
+            // Debug.Assert's default behavior is to display a dialog if the default trace listener is still installed
+            // xunit prior to 2.0 would disable the default trace listener and prevent the assert dialog
+            // since we're now on 2.0, we need to restore this behavior ourselves
+
+            Debug.Listeners.Clear();
+            Debug.Listeners.Add( new TraceAssertListener() );
+        }
+
         [Fact]
         public void PayloadReaderReadsNullTermString()
         {
diff --git a/SteamKit2/Tests/DebugLogFacts.cs b/SteamKit2/Tests/DebugLogFacts.cs
index 79e4f3c05..e034d0056 100644
--- a/SteamKit2/Tests/DebugLogFacts.cs
+++ b/SteamKit2/Tests/DebugLogFacts.cs
@@ -1,5 +1,6 @@
 using Xunit;
 using SteamKit2;
+using Xunit.Sdk;
 
 namespace Tests
 {
diff --git a/SteamKit2/Tests/HandlerTestBase.cs b/SteamKit2/Tests/Helpers/HandlerTestBase.cs
similarity index 100%
rename from SteamKit2/Tests/HandlerTestBase.cs
rename to SteamKit2/Tests/Helpers/HandlerTestBase.cs
diff --git a/SteamKit2/Tests/Helpers/TraceAssertListener.cs b/SteamKit2/Tests/Helpers/TraceAssertListener.cs
new file mode 100644
index 000000000..f17ae7e9f
--- /dev/null
+++ b/SteamKit2/Tests/Helpers/TraceAssertListener.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tests
+{
+    class TraceAssertListener : TraceListener
+    {
+        public override void Fail( string message, string detailMessage )
+        {
+            throw new TraceAssertException( message, detailMessage );
+        }
+
+        public override void Write( string message )
+        {
+        }
+
+        public override void WriteLine( string message )
+        {
+        }
+    }
+
+    class TraceAssertException : Exception
+    {
+        public string AssertMessage { get; private set; }
+        public string AssertDetailedMessage { get; private set; }
+
+
+        public TraceAssertException( string message, string detailMessage )
+        {
+            AssertMessage = message;
+            AssertDetailedMessage = detailMessage;
+        }
+    }
+}
diff --git a/SteamKit2/Tests/SteamUserFacts.cs b/SteamKit2/Tests/SteamUserFacts.cs
index da150ec62..25704711a 100644
--- a/SteamKit2/Tests/SteamUserFacts.cs
+++ b/SteamKit2/Tests/SteamUserFacts.cs
@@ -97,7 +97,7 @@ public void LogOnThrowsExceptionIfLoginKeyProvidedWithoutShouldRememberPassword(
         [Fact]
         public void LogOnDoesNotThrowExceptionIfUserNameAndPasswordProvided()
         {
-            Assert.DoesNotThrow(() =>
+            var ex = Record.Exception(() =>
             {
                 Handler.LogOn(new SteamUser.LogOnDetails
                 {
@@ -105,12 +105,14 @@ public void LogOnDoesNotThrowExceptionIfUserNameAndPasswordProvided()
                     Password = "def"
                 });
             });
+
+            Assert.Null( ex );
         }
         
         [Fact]
         public void LogOnDoesNotThrowExceptionIfUserNameAndLoginKeyProvided()
         {
-            Assert.DoesNotThrow(() =>
+            var ex = Record.Exception(() =>
             {
                 Handler.LogOn(new SteamUser.LogOnDetails
                 {
@@ -119,6 +121,8 @@ public void LogOnDoesNotThrowExceptionIfUserNameAndLoginKeyProvided()
                     ShouldRememberPassword = true,
                 });
             });
+
+            Assert.Null( ex );
         }
 
         [Fact]
diff --git a/SteamKit2/Tests/Tests.csproj b/SteamKit2/Tests/Tests.csproj
index 78ef72590..df6efd5dc 100644
--- a/SteamKit2/Tests/Tests.csproj
+++ b/SteamKit2/Tests/Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -10,12 +11,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>bd026ff8</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +27,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +36,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
@@ -46,18 +50,28 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AsyncJobFacts.cs" />
     <Compile Include="CallbackManagerFacts.cs" />
     <Compile Include="CallbackManagerFacts_LegacyBehavior.cs" />
     <Compile Include="ClientMsgFacts.cs" />
     <Compile Include="CMClientFacts.cs" />
     <Compile Include="DebugLogFacts.cs" />
-    <Compile Include="HandlerTestBase.cs" />
+    <Compile Include="Helpers\HandlerTestBase.cs" />
+    <Compile Include="Helpers\TraceAssertListener.cs" />
     <Compile Include="KeyValueFacts.cs" />
     <Compile Include="NetworkListenerFacts.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -81,12 +95,14 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
   </Target>
   <!-- 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.
diff --git a/SteamKit2/Tests/packages.config b/SteamKit2/Tests/packages.config
index 15c3bd217..8d71445a5 100644
--- a/SteamKit2/Tests/packages.config
+++ b/SteamKit2/Tests/packages.config
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="protobuf-net" version="2.0.0.668" targetFramework="net40" />
-  <package id="xunit" version="1.9.2" targetFramework="net40" />
-  <package id="xunit.runner.visualstudio" version="2.0.1" targetFramework="net40" />
+  <package id="protobuf-net" version="2.0.0.668" targetFramework="net4" />
+  <package id="xunit" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.assert" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.0.1" targetFramework="net4" />
 </packages>
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 3eb7383c6..5563c4ef8 100644
--- a/readme.md
+++ b/readme.md
@@ -39,7 +39,7 @@ SteamKit2 is released under the [LGPL-2.1 license](http://www.tldrlegal.com/lice
 
 In order to use SteamKit2 at runtime, the following dependencies are required:
 
-  - .NET 4.0 or [Mono ≥2.8](http://mono-project.com)
+  - .NET 4.5 or [Mono ≥3.0](http://mono-project.com)
 
 To compile SteamKit2, the following is required: