diff --git a/README.MD b/README.MD
index fc0f53d4..d3aae16f 100644
--- a/README.MD
+++ b/README.MD
@@ -1,11 +1,9 @@
-[![Build Status](https://travis-ci.org/stormpath/stormpath-sdk-csharp.svg)](https://travis-ci.org/stormpath/stormpath-sdk-csharp)
-
-# Stormpath .NET SDK #
+# Stormpath .NET SDK  [![Build Status](https://travis-ci.org/stormpath/stormpath-sdk-csharp.svg)](https://travis-ci.org/stormpath/stormpath-sdk-csharp)
 
 *An advanced, reliable and easy-to-use user management API for .NET by security experts*
 
 [Stormpath](https://stormpath.com) is a complete user management API.  This
-library gives your ASP.NET web application access to all of Stormpath's features:
+library gives your ASP.NET or C# application access to all of Stormpath's features:
 
 - Robust authentication and authorization.
 - Schemaless user data and profiles.
@@ -14,19 +12,237 @@ library gives your ASP.NET web application access to all of Stormpath's features
 - Secure API key authentication for your service.
 - Servlet support for Java web applications.
 
+In addition to these core Stormpath features, this SDK provides:
+
+- Support for .NET 4.5 and later
+- Support for Mono on Linux
+- Easy installation using NuGet
+- Fully asynchronous design using the [TPL](https://msdn.microsoft.com/en-us/library/dd460717(v=vs.110).aspx)
+
 If you have feedback about this library, please get in touch and share your
 thoughts! support@stormpath.com
 
 ## Current status
 
-This library is currently under initial development. If you would like to be notified when we publish our first release candidate, watch this repository or send an email to nate@stormpath.com.
+This library is currently under active development. If you would like to be notified when we publish releases, watch this repository or send an email to support@stormpath.com.
+
+## Installation instructions
+
+The Stormpath C# SDK consists of three packages: `Stormpath.SDK.Core`, `Stormpath.SDK.JsonNetSerializer`, and `Stormpath.SDK.RestSharpClient`. The latter two contain dependencies on external libraries ([JSON.NET](https://github.com/JamesNK/Newtonsoft.Json) and [RestSharp](https://github.com/restsharp/RestSharp)). These are required for the SDK to run properly.
+
+For convenience, the meta-package `Stormpath.SDK` contains everything you need to get up an running quickly. :thumbsup:
+
+#### Using the Nuget Package Manager
+
+ 1. Right-click on the new project in the Solution Explorer and choose **Manage Nuget Packages...**
+ 2. Search for Stormpath. Install the Stormpath.SDK package.
+
+#### Using the Package Manager Console
+
+Simply run `install-package Stormpath.SDK`. Done!
+
+#### Using Mono
+
+It's as easy as `mono nuget.exe install Stormpath.SDK`.
+
+## Quickstart
+
+In this quickstart, you'll use Visual Studio to make a simple console application that creates a user and logs them into an application.
+
+#### Get an API Key
+
+ 1. If you haven't already, [sign up for Stormpath here](https://api.stormpath.com/register). Check your email for a verification link.
+ 2. Click the link in the verification email.
+ 3. Log in to the [Stormpath Admin Console](https://api.stormpath.com/) using the email address and password you used to register with Stormpath.
+ 4. Click the **Create API Key** or **Manage Existing Keys** button in the middle of the page.
+ 5. Under **Security Credentials**, click **Create API Key**. This will generate your API Key and download it to your computer as an `apiKey.properties` file. If you open the file in a text editor, you will see something similar to the following:
+ ```
+ apiKey.id = 144JVZINOF5EBNCMG9EXAMPLE
+ apiKey.secret = lWxOiKqKPNwJmSldbiSkEbkNjgh2uRSNAb+AEXAMPLE
+ ```
+ 
+ Save this file in a secure location, such as a `.stormpath` directory in your home directory. (This is the default location the SDK checks, but you can specify a different location if you'd like.)
+ 
+ For example:
+ 
+ ```
+ C:\>cd %homedrive%%homepath%
+ C:\Users\yourname>mkdir .stormpath
+ C:\Users\yourname>cd .stormpath
+ C:\Users\yourname\.stormpath>copy C:\Users\yourname\Downloads\apiKey.properties apiKey.Properties
+ ```
+
+The `apiKey.properties` file holds your API key information, and can be used to easily authenticate with the Stormpath SDK. Treat it as a sensitive file!
+
+#### Creating a project
+
+Next, create a simple Visual Studio project and add the Stormpath SDK.
+
+ 1. Create a new Console Application project.
+ 2. Use the [instructions above](#installation-instructions) to install the Stormpath SDK into your project.
+ 3. Add the following using statements to the top of your `Program.cs` file:
+ 
+ ```csharp
+ using Stormpath.SDK;
+ using Stormpath.SDK.Client;
+ using Stormpath.SDK.Error;
+ ```
+ 
+#### `await` a minute
+
+The Stormpath SDK performs `await`able asynchronous operations by default. This makes it possible to make requests to the Stormpath API without tying up a worker thread - super cool for ASP.NET projects!
+
+In the Console Application template, however, the entry point is `static void Main()`, so you can't use the `await` keyword. (In an ASP.NET application, you could just change the method signature to `async Task`, but that doesn't work well in a console app.)
+
+You can work around this by writing a separate method instead:
+
+```csharp
+static Task MainAsync()
+{
+}
+```
+
+and calling it synchronously from `Main()`:
+
+```csharp
+static void Main(string[] args)
+{
+    MainAsync().GetAwaiter().GetResult();
+}
+```
+
+If you are confused by all this `async` business, check out Stephen Cleary's [excellent introductory blog post](http://blog.stephencleary.com/2012/02/async-and-await.html) on the subject.
+
+#### Creating a client
+
+The first thing you need to connect to the Stormpath API is a `IClient` object. Create one in your new `MainAsync` method:
+
+```csharp
+// If you put the apiKey.properties file in the default location
+// (%homedrive%%homepath\.stormpath\apiKey.properties), you can skip this!
+IClientApiKey myApiKey = ClientApiKeys.Builder()
+    .SetFileLocation("path\\to\\apiKey.properties")
+    .Build();
+
+// Create an IClient object. Everything starts here!
+IClient client = Clients.Builder()
+    .SetApiKey(myApiKey)
+    .Build();
+```
+
+You can skip building the `IClientApiKey` object and the call to `.SetApiKey()` if you put your `apiKey.properties` file in the default location. Calling `.Build()` without specifying an API Key will check the default location. :thumbsup:
+
+Once you have built a `IClient`, keep it around! You should only need to create it **once** per application. It's thread-safe, so you can safely reuse it, even in an ASP.NET application.
+
+#### Retrieving your application
+
+Now that you have a `IClient`, you need to get an `IApplication` object that represents an Application in Stormpath. You should have a default application called "My Application" in your Stormpath account. It's easy to retrieve:
+
+```csharp
+var myApp = await client.GetApplications()
+    .Where(x => x.Name == "My Application")
+    .SingleAsync();
+```
+
+You can use this `IApplication` object to create user accounts, log in user accounts, and all sorts of other cool stuff.
+
+#### Creating a user account
+
+You can create a new user by calling `CreateAccountAsync`:
+
+```csharp
+var joe = await myApp.CreateAccountAsync("Joe", "Stormtrooper",
+                                         "tk421@galacticempire.co",
+                                         "Changeme123!");
+Console.WriteLine("User " + joe.FullName + " created");
+```
+
+The returned `IAccount` object will contain all the account's data. Easy! :smile: 
+
+#### Logging in
+
+Now that you have a valid user in the Stormpath application, you can perform a login request.
+
+```csharp
+// Imagine that we got these values from a web request:
+var usernameOrEmail = "tk421@galacticempire.co";
+var password = "Changeme123!";
+
+try
+{
+     var loginResult = await myApp.AuthenticateAccountAsync(usernameOrEmail, password);
+     var loggedInAccount = await loginResult.GetAccountAsync();
+     Console.WriteLine("User {0} logged in", loggedInAccount.FullName);
+}
+catch (ResourceException rex)
+{
+    Console.WriteLine("Could not log in. Error: " + rex.Message);
+}
+```
+
+:bulb: You can also use the `TryAuthenticateAccountAsync(username, password)` overload to get a `bool` result if you don't need to access the account's data after login.
+
+#### Clean up
+
+Cleaning up your Stormpath application is easy:
+
+```csharp
+try
+{
+    await joe.DeleteAsync();
+}
+catch (ResourceException rex)
+{
+    Console.WriteLine("Unexpected error when deleting " + joe.Email + ". Error: " + rex.Message);
+}
+Console.WriteLine("Done!");
+```
+
+As a final touch, you can add this line at the end so the console window doesn't disappear immediately:
+
+```csharp
+Console.ReadKey(false);
+```
+
+#### Other things you can do with the SDK
+
+ * Create and delete entire applications
+ * Search for accounts using LINQ
+ * Modify and save account data
+ * Reset an account's password
+
+## Build Instructions
+
+#### Building with Visual Studio
+
+Building the SDK requires Visual Studio 2015.
+
+ 1. Use `git clone` or the Visual Studio GitHub extension to clone the branch you want to build (`master` or `develop`).
+ 2. Open `stormpath-sdk-csharp\Stormpath.SDK\Stormpath.SDK.sln` in Visual Studio.
+ 3. On first build, the required NuGet packages should resore. If not, [enable automatic package restore](http://stackoverflow.com/a/29708080/3191599).
+
+#### Building with MSBuild
+
+ 1. Clone the repository: `git clone https://github.com/stormpath/stormpath-sdk-csharp.git`
+ 2. `cd stormpath-sdk-csharp\Stormpath.SDK`
+ 2. Assuming you have [nuget.exe](https://docs.nuget.org/consume/installing-nuget#command-line-utility) in your `PATH`: `nuget restore Stormpath.SDK.sln`
+ 3. `msbuild Stormpath.SDK.sln`
+
+#### Building with Mono
+
+Building with Mono requires Mono 4.0 or greater installed on your machine.
+
+ 1. Clone the repository: `git clone https://github.com/stormpath/stormpath-sdk-csharp.git`
+ 2. `cd stormpath-sdk-csharp\Stormpath.SDK`
+ 3. If you don't have NuGet available otherwise, use your favorite command line tool to download NuGet: `wget https://nuget.org/nuget.exe`
+ 4. `mono nuget.exe restore Stormpath.SDK.sln`
+ 5. `xbuild Stormpath.SDK.sln`
 
 ## Contributing
 
 Contributions, bug reports and issues are very welcome. Stormpath regularly maintains this repository, and are quick to review pull requests and accept changes!
 
-You can make your own contributions by forking the develop branch of this
-repository, making your changes, and issuing pull request on the develop branch.
+You can make your own contributions by forking the develop branch of this repository, making your changes, and issuing pull request on the develop branch.
 
 ## Copyright
 
diff --git a/Stormpath.SDK.Core.nuspec b/Stormpath.SDK.Core.nuspec
index 29d4a5d0..49398e37 100644
--- a/Stormpath.SDK.Core.nuspec
+++ b/Stormpath.SDK.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Stormpath.SDK.Core</id>
-        <version>0.1.0-rc</version>
+        <version>0.1.0</version>
         <authors>Nate Barbettini</authors>
         <owners>Stormpath,Inc.</owners>
         <licenseUrl>https://github.com/stormpath/stormpath-sdk-csharp/blob/master/LICENSE</licenseUrl>
@@ -14,7 +14,7 @@
         <language>en-US</language>
         <tags>Stormpath API Authentication Authorization REST</tags>
         <dependencies>
-            <dependency id="Remotion.Linq" version="[1.15.15.0,2.0.0-alpha)" />
+            <dependency id="Remotion.Linq" version="[1.15.15.0]" />
         </dependencies>
     </metadata>
     <files>
diff --git a/Stormpath.SDK.JsonNetSerializer.nuspec b/Stormpath.SDK.JsonNetSerializer.nuspec
index 50791fc0..0e97a88f 100644
--- a/Stormpath.SDK.JsonNetSerializer.nuspec
+++ b/Stormpath.SDK.JsonNetSerializer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Stormpath.SDK.JsonNetSerializer</id>
-        <version>0.1.0-rc</version>
+        <version>0.1.0</version>
         <authors>Nate Barbettini</authors>
         <owners>Stormpath,Inc.</owners>
         <licenseUrl>https://github.com/stormpath/stormpath-sdk-csharp/blob/master/LICENSE</licenseUrl>
@@ -15,7 +15,7 @@
         <tags>Stormpath API Authentication Authorization REST</tags>
         <dependencies>
             <dependency id="Newtonsoft.Json" version="7.0.1" />
-            <dependency id="Stormpath.SDK.Core" version="0.1.0-rc" />
+            <dependency id="Stormpath.SDK.Core" version="0.1.0" />
         </dependencies>
     </metadata>
     <files>
diff --git a/Stormpath.SDK.RestSharpClient.nuspec b/Stormpath.SDK.RestSharpClient.nuspec
index 18dcafac..db42e744 100644
--- a/Stormpath.SDK.RestSharpClient.nuspec
+++ b/Stormpath.SDK.RestSharpClient.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Stormpath.SDK.RestSharpClient</id>
-        <version>0.1.0-rc</version>
+        <version>0.1.0</version>
         <authors>Nate Barbettini</authors>
         <owners>Stormpath,Inc.</owners>
         <licenseUrl>https://github.com/stormpath/stormpath-sdk-csharp/blob/master/LICENSE</licenseUrl>
@@ -15,7 +15,7 @@
         <tags>Stormpath API Authentication Authorization REST</tags>
         <dependencies>
             <dependency id="RestSharp" version="105.2.2" />
-            <dependency id="Stormpath.SDK.Core" version="0.1.0-rc" />
+            <dependency id="Stormpath.SDK.Core" version="0.1.0" />
         </dependencies>
     </metadata>
     <files>
diff --git a/Stormpath.SDK.nuspec b/Stormpath.SDK.nuspec
index ad989fb0..2cc2a08b 100644
--- a/Stormpath.SDK.nuspec
+++ b/Stormpath.SDK.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Stormpath.SDK</id>
-        <version>0.1.0-rc</version>
+        <version>0.1.0</version>
         <authors>Nate Barbettini</authors>
         <owners>Stormpath,Inc.</owners>
         <licenseUrl>https://github.com/stormpath/stormpath-sdk-csharp/blob/master/LICENSE</licenseUrl>
@@ -14,9 +14,9 @@
         <language>en-US</language>
         <tags>Stormpath API Authentication Authorization REST</tags>
         <dependencies>
-            <dependency id="Stormpath.SDK.Core" version="0.1.0-rc" />
-            <dependency id="Stormpath.SDK.RestSharpClient" version="0.1.0-rc" />
-            <dependency id="Stormpath.SDK.JsonNetSerializer" version="0.1.0-rc" />
+            <dependency id="Stormpath.SDK.Core" version="0.1.0" />
+            <dependency id="Stormpath.SDK.RestSharpClient" version="0.1.0" />
+            <dependency id="Stormpath.SDK.JsonNetSerializer" version="0.1.0" />
         </dependencies>
     </metadata>
     <files />
diff --git a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/Stormpath.SDK.JsonNetSerializer.Tests.csproj b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/Stormpath.SDK.JsonNetSerializer.Tests.csproj
index fcc1932c..fb7d50ee 100644
--- a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/Stormpath.SDK.JsonNetSerializer.Tests.csproj
+++ b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/Stormpath.SDK.JsonNetSerializer.Tests.csproj
@@ -84,8 +84,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/packages.config b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/packages.config
index 3e021cf0..6ccb764d 100644
--- a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/packages.config
+++ b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer.Tests/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
   <package id="Shouldly" version="2.6.0" targetFramework="net452" />
-  <package id="StyleCop.Analyzers" version="1.0.0-beta011" targetFramework="net45" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta012" targetFramework="net45" developmentDependency="true" />
   <package id="xunit" version="2.0.0" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
   <package id="xunit.assert" version="2.0.0" targetFramework="net452" />
diff --git a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/Stormpath.SDK.JsonNetSerializer.csproj b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/Stormpath.SDK.JsonNetSerializer.csproj
index 03e0f010..967464f4 100644
--- a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/Stormpath.SDK.JsonNetSerializer.csproj
+++ b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/Stormpath.SDK.JsonNetSerializer.csproj
@@ -60,8 +60,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/packages.config b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/packages.config
index 6d624271..b4372935 100644
--- a/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/packages.config
+++ b/Stormpath.SDK/Stormpath.SDK.JsonNetSerializer/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
-  <package id="StyleCop.Analyzers" version="1.0.0-beta011" targetFramework="net45" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta012" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Properties/AssemblyInfo.cs b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Properties/AssemblyInfo.cs
index 0e46608f..8073b25b 100644
--- a/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Properties/AssemblyInfo.cs
+++ b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Properties/AssemblyInfo.cs
@@ -1,8 +1,24 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+// <copyright file="AssemblyInfo.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Stormpath.SDK.RestSharpClient.Tests")]
@@ -14,8 +30,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,12 +41,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]
diff --git a/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Stormpath.SDK.RestSharpClient.Tests.csproj b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Stormpath.SDK.RestSharpClient.Tests.csproj
index 67a18aa5..3f513f28 100644
--- a/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Stormpath.SDK.RestSharpClient.Tests.csproj
+++ b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/Stormpath.SDK.RestSharpClient.Tests.csproj
@@ -24,6 +24,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>..\Stormpath.SDK\Stormpath.SDK.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -82,6 +84,11 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config" />
+    <AdditionalFiles Include="stylecop.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/packages.config b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/packages.config
index 15603ff0..4538d885 100644
--- a/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/packages.config
+++ b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/packages.config
@@ -3,6 +3,7 @@
   <package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
   <package id="RestSharp" version="105.2.3" targetFramework="net45" />
   <package id="Shouldly" version="2.6.0" targetFramework="net45" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta012" targetFramework="net45" developmentDependency="true" />
   <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" />
diff --git a/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/stylecop.json b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/stylecop.json
new file mode 100644
index 00000000..1ce61c72
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.RestSharpClient.Tests/stylecop.json
@@ -0,0 +1,8 @@
+{
+  "settings": {
+    "documentationRules": {
+      "companyName": "Stormpath, Inc.",
+      "copyrightText": "Copyright (c) 2015 Stormpath, Inc."
+    }
+  }
+}
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK.RestSharpClient/RestSharpClient.cs b/Stormpath.SDK/Stormpath.SDK.RestSharpClient/RestSharpClient.cs
index 6349bb0f..6e0a13ae 100644
--- a/Stormpath.SDK/Stormpath.SDK.RestSharpClient/RestSharpClient.cs
+++ b/Stormpath.SDK/Stormpath.SDK.RestSharpClient/RestSharpClient.cs
@@ -40,7 +40,7 @@ public sealed class RestSharpClient : SDK.Http.ISynchronousHttpClient, SDK.Http.
 
         IWebProxy SDK.Http.IHttpClient.Proxy => this.proxy;
 
-        bool SDK.Http.IHttpClient.IsSynchronousSupported => false; // TODO
+        bool SDK.Http.IHttpClient.IsSynchronousSupported => true;
 
         bool SDK.Http.IHttpClient.IsAsynchronousSupported => true;
 
diff --git a/Stormpath.SDK/Stormpath.SDK.RestSharpClient/Stormpath.SDK.RestSharpClient.csproj b/Stormpath.SDK/Stormpath.SDK.RestSharpClient/Stormpath.SDK.RestSharpClient.csproj
index f6f289f0..6fec6107 100644
--- a/Stormpath.SDK/Stormpath.SDK.RestSharpClient/Stormpath.SDK.RestSharpClient.csproj
+++ b/Stormpath.SDK/Stormpath.SDK.RestSharpClient/Stormpath.SDK.RestSharpClient.csproj
@@ -54,8 +54,8 @@
   </ItemGroup>
   <ItemGroup>
     <Analyzer Include="..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Stormpath.SDK\Stormpath.SDK.csproj">
diff --git a/Stormpath.SDK/Stormpath.SDK.RestSharpClient/packages.config b/Stormpath.SDK/Stormpath.SDK.RestSharpClient/packages.config
index 36f8df3c..ea5ec04c 100644
--- a/Stormpath.SDK/Stormpath.SDK.RestSharpClient/packages.config
+++ b/Stormpath.SDK/Stormpath.SDK.RestSharpClient/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net452" developmentDependency="true" />
   <package id="RestSharp" version="105.2.3" targetFramework="net45" />
-  <package id="StyleCop.Analyzers" version="1.0.0-beta011" targetFramework="net45" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta012" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Stormpath.SDK.Tests.Integration.csproj b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Stormpath.SDK.Tests.Integration.csproj
index 9da4c5af..ad7754fe 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Stormpath.SDK.Tests.Integration.csproj
+++ b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Stormpath.SDK.Tests.Integration.csproj
@@ -74,6 +74,11 @@
     <Compile Include="Error_tests.cs" />
     <Compile Include="Helpers\TestClientBuilder.cs" />
     <Compile Include="Meta_tests.cs" />
+    <Compile Include="Sync\Sync_Application_tests.cs" />
+    <Compile Include="Sync\Sync_Directory_tests.cs" />
+    <Compile Include="Sync\Sync_Account_tests.cs" />
+    <Compile Include="Sync\Sync_Error_tests.cs" />
+    <Compile Include="Sync\Sync_Tenant_tests.cs" />
     <Compile Include="Tenant_tests.cs" />
     <Compile Include="Sanity_checks.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -103,8 +108,11 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Folder Include="Async\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Account_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Account_tests.cs
new file mode 100644
index 00000000..86393c2c
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Account_tests.cs
@@ -0,0 +1,489 @@
+// <copyright file="Sync_Account_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Application;
+using Stormpath.SDK.Auth;
+using Stormpath.SDK.Error;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Integration.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Integration
+{
+    [Collection("Live tenant tests")]
+    public class Sync_Account_tests
+    {
+        private readonly IntegrationTestFixture fixture;
+
+        public Sync_Account_tests(IntegrationTestFixture fixture)
+        {
+            this.fixture = fixture;
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Getting_tenant_accounts(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            var accounts = tenant.GetAccounts().Synchronously().ToList();
+
+            accounts.Any().ShouldBeTrue();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Getting_accounts(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var accounts = application.GetAccounts().Synchronously().ToList();
+
+            // Verify data from IntegrationTestData
+            accounts.Count.ShouldBe(8);
+
+            var luke = accounts.Where(x => x.GivenName == "Luke").Single();
+            luke.FullName.ShouldBe("Luke Skywalker");
+            luke.Email.ShouldBe("lskywalker@tattooine.rim");
+            luke.Username.ShouldStartWith("sonofthesuns");
+            luke.Status.ShouldBe(AccountStatus.Enabled);
+
+            var vader = accounts.Where(x => x.Surname == "Vader").Single();
+            vader.FullName.ShouldBe("Darth Vader");
+            vader.Email.ShouldStartWith("vader@galacticempire.co");
+            vader.Username.ShouldStartWith("lordvader");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Updating_account(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var leia = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(a => a.Email == "leia.organa@alderaan.core")
+                .Single();
+
+            leia.SetMiddleName("Organa");
+            leia.SetSurname("Solo");
+            var saveResult = leia.Save();
+
+            // In 8 ABY of course
+            saveResult.FullName.ShouldBe("Leia Organa Solo");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Getting_account_directory(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var luke = application
+                .GetAccounts()
+                .Synchronously()
+                .Filter("Luke")
+                .Single();
+
+            // Verify data from IntegrationTestData
+            var directoryHref = luke.GetDirectory().Href;
+            directoryHref.ShouldBe(this.fixture.PrimaryDirectoryHref);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Getting_account_tenant(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var leia = application
+                .GetAccounts()
+                .Synchronously()
+                .Filter("Leia")
+                .Single();
+
+            // Verify data from IntegrationTestData
+            var tenantHref = leia.GetTenant().Href;
+            tenantHref.ShouldBe(this.fixture.TenantHref);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_email(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var coreCitizens = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(acct => acct.Email.EndsWith(".core"))
+                .ToList();
+
+            // Verify data from IntegrationTestData
+            coreCitizens.Count.ShouldBe(2);
+
+            var han = coreCitizens.Where(x => x.GivenName == "Han").Single();
+            han.Email.ShouldBe("han.solo@corellia.core");
+            han.Username.ShouldStartWith("cptsolo");
+
+            var leia = coreCitizens.Where(x => x.GivenName == "Leia").Single();
+            leia.Email.ShouldStartWith("leia.organa@alderaan.core");
+            leia.Username.ShouldStartWith("princessleia");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_firstname(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var chewie = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(a => a.GivenName == "Chewbacca")
+                .Single();
+
+            // Verify data from IntegrationTestData
+            chewie.FullName.ShouldBe("Chewbacca the Wookiee");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_lastname(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var palpatine = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(a => a.Surname == "Palpatine")
+                .Single();
+
+            // Verify data from IntegrationTestData
+            palpatine.FullName.ShouldBe("Emperor Palpatine");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_middle_name(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var chewie = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(a => a.MiddleName == "the")
+                .Single();
+
+            // Verify data from IntegrationTestData
+            chewie.FullName.ShouldBe("Chewbacca the Wookiee");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_username(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var vader = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(a => a.Username.Equals($"lordvader-{this.fixture.TestRunIdentifier}"))
+                .Single();
+
+            // Verify data from IntegrationTestData
+            vader.Email.ShouldBe("vader@galacticempire.co");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_status(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var tarkin = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(x => x.Status == AccountStatus.Disabled)
+                .Single();
+
+            // Verify data from IntegrationTestData
+            tarkin.FullName.ShouldBe("Wilhuff Tarkin");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_creation_date(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            // Make a new account that's created now
+            var createdAfter = DateTime.Now.Subtract(TimeSpan.FromSeconds(10));
+            var newAccount = application.CreateAccount("Wedge", "Antilles", "wedge@gus-treta.corellia.core", new RandomPassword(12));
+            this.fixture.CreatedAccountHrefs.Add(newAccount.Href);
+
+            var rightBeforeCreation = newAccount.CreatedAt.Subtract(TimeSpan.FromSeconds(1));
+            var createdRecently = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(x => x.CreatedAt >= rightBeforeCreation)
+                .ToList();
+            var wedge = createdRecently.Where(x => x.Email == "wedge@gus-treta.corellia.core").Single();
+            wedge.FullName.ShouldBe("Wedge Antilles");
+
+            // Clean up
+            var didDelete = newAccount.Delete();
+            if (didDelete)
+                this.fixture.CreatedAccountHrefs.Remove(newAccount.Href);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_by_creation_date_within_shorthand(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var firstAccount = application.GetAccounts().Synchronously().First();
+            var created = firstAccount.CreatedAt;
+
+            var createdToday = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(x => x.CreatedAt.Within(created.Year, created.Month, created.Day))
+                .Count();
+            createdToday.ShouldNotBe(0);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_accounts_using_filter(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var filtered = application
+                .GetAccounts()
+                .Synchronously()
+                .Filter("lo")
+                .ToList();
+
+            filtered.Count.ShouldBeGreaterThanOrEqualTo(3);
+            filtered.ShouldContain(acct => acct.FullName == "Han Solo");
+            filtered.ShouldContain(acct => acct.Username.StartsWith("lottanerve"));
+            filtered.ShouldContain(acct => acct.Username.StartsWith("lordvader"));
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Sorting_accounts_by_lastname(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var accountsSortedByLastName = application
+                .GetAccounts()
+                .Synchronously()
+                .OrderBy(x => x.Surname)
+                .ToList();
+
+            var lando = accountsSortedByLastName.First();
+            lando.FullName.ShouldBe("Lando Calrissian");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Sorting_accounts_by_username_and_lastname(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var accountsSortedByMultiple = application
+                .GetAccounts()
+                .Synchronously()
+                .OrderByDescending(x => x.Username)
+                .OrderByDescending(x => x.Surname)
+                .ToList();
+
+            var tarkin = accountsSortedByMultiple.First();
+            tarkin.FullName.ShouldBe("Wilhuff Tarkin");
+            var luke = accountsSortedByMultiple.ElementAt(1);
+            luke.FullName.ShouldBe("Luke Skywalker");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Taking_only_two_accounts(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var firstTwo = application
+                .GetAccounts()
+                .Synchronously()
+                .Take(2)
+                .ToList();
+
+            firstTwo.Count.ShouldBe(2);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Counting_accounts(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var count = application.GetAccounts().Synchronously().Count();
+            count.ShouldBe(8);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Any_returns_false_for_empty_filtered_set(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var anyDroids = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(x => x.Email.EndsWith("droids.co"))
+                .Any();
+
+            anyDroids.ShouldBeFalse();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Any_returns_true_for_nonempty_filtered_set(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var anyWookiees = application
+                .GetAccounts()
+                .Synchronously()
+                .Where(x => x.Email.EndsWith("kashyyyk.rim"))
+                .Any();
+
+            anyWookiees.ShouldBeTrue();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Creating_and_deleting_account(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var account = application.CreateAccount("Gial", "Ackbar", "admiralackbar@dac.rim", new RandomPassword(12));
+
+            account.Href.ShouldNotBeNullOrEmpty();
+            this.fixture.CreatedAccountHrefs.Add(account.Href);
+
+            account.FullName.ShouldBe("Gial Ackbar");
+            account.Email.ShouldBe("admiralackbar@dac.rim");
+            account.Username.ShouldBe("admiralackbar@dac.rim");
+            account.Status.ShouldBe(AccountStatus.Enabled);
+            account.CreatedAt.ShouldBe(DateTimeOffset.Now, TimeSpan.FromSeconds(10));
+            account.ModifiedAt.ShouldBe(DateTimeOffset.Now, TimeSpan.FromSeconds(10));
+
+            var deleted = account.Delete(); // It's a trap! :(
+            if (deleted)
+                this.fixture.CreatedAccountHrefs.Remove(account.Href);
+            deleted.ShouldBeTrue();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Authenticating_account(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var username = $"sonofthesuns-{this.fixture.TestRunIdentifier}";
+            var result = application.AuthenticateAccount(username, "whataPieceofjunk$1138");
+            result.ShouldBeAssignableTo<IAuthenticationResult>();
+
+            var account = result.GetAccount();
+            account.FullName.ShouldBe("Luke Skywalker");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void TryAuthenticating_account(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var username = $"sonofthesuns-{this.fixture.TestRunIdentifier}";
+
+            application
+                .TryAuthenticateAccount(username, "whataPieceofjunk$1138")
+                .ShouldBeTrue();
+
+            application
+                .TryAuthenticateAccount(username, "notLukesPassword?")
+                .ShouldBeFalse();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Authenticating_throws_for_invalid_credentials(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var username = $"sonofthesuns-{this.fixture.TestRunIdentifier}";
+            var password = "notLukesPassword?";
+
+            bool didFailCorrectly = false;
+            try
+            {
+                var result = application.AuthenticateAccount(username, password);
+            }
+            catch (ResourceException rex)
+            {
+                didFailCorrectly = rex.HttpStatus == 400;
+            }
+            catch
+            {
+                didFailCorrectly = false;
+            }
+
+            Assert.True(didFailCorrectly);
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Application_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Application_tests.cs
new file mode 100644
index 00000000..297baaa4
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Application_tests.cs
@@ -0,0 +1,162 @@
+// <copyright file="Sync_Application_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Application;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Integration.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Integration
+{
+    [Collection("Live tenant tests")]
+    public class Sync_Application_tests
+    {
+        private readonly IntegrationTestFixture fixture;
+
+        public Sync_Application_tests(IntegrationTestFixture fixture)
+        {
+            this.fixture = fixture;
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Getting_tenant_applications(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+            var applications = tenant.GetApplications().Synchronously().ToList();
+
+            applications.Count.ShouldNotBe(0);
+            applications
+                .Any(app => app.Status == ApplicationStatus.Enabled)
+                .ShouldBeTrue();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Creating_application_without_directory(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            var newApplicationName = $".NET IT {this.fixture.TestRunIdentifier} Application #2";
+            var createdApplication = tenant.CreateApplication(newApplicationName, createDirectory: false);
+
+            createdApplication.Href.ShouldNotBeNullOrEmpty();
+            this.fixture.CreatedApplicationHrefs.Add(createdApplication.Href);
+            createdApplication.Name.ShouldBe(newApplicationName);
+            createdApplication.Status.ShouldBe(ApplicationStatus.Enabled);
+
+            var defaultAccountStore = createdApplication.GetDefaultAccountStore();
+            if (!string.IsNullOrEmpty(defaultAccountStore?.Href))
+                this.fixture.CreatedDirectoryHrefs.Add(defaultAccountStore.Href);
+
+            defaultAccountStore.ShouldBeNull(); // no auto-created directory = no default account store
+
+            // Clean up
+            var deleted = createdApplication.Delete();
+            if (deleted)
+                this.fixture.CreatedApplicationHrefs.Remove(createdApplication.Href);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Updating_application(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            var application = tenant.GetApplications()
+                .Synchronously()
+                .Where(app => app.Name.StartsWith($".NET IT (disabled) {this.fixture.TestRunIdentifier}"))
+                .Single();
+
+            application.SetDescription("The Battle of Yavin - Victory!");
+            var saveResult = application.Save();
+
+            saveResult.Description.ShouldBe("The Battle of Yavin - Victory!");
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_by_name(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            var application = tenant.GetApplications()
+                .Synchronously()
+                .Where(app => app.Name.StartsWith($".NET IT (primary) {this.fixture.TestRunIdentifier}"))
+                .Single();
+
+            application.Description.ShouldBe("The Battle of Endor");
+            application.Status.ShouldBe(ApplicationStatus.Enabled);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_by_description(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            var applications = tenant.GetApplications()
+                .Synchronously()
+                .Where(app => app.Description == "The Battle Of Endor")
+                .ToList();
+
+            applications
+                .Any(app => app.Name.StartsWith($".NET IT (primary) {this.fixture.TestRunIdentifier}"))
+                .ShouldBeTrue();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Searching_by_status(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            var applications = tenant.GetApplications()
+                .Synchronously()
+                .Where(app => app.Status == ApplicationStatus.Disabled)
+                .ToList();
+
+            applications
+                .Any(app => app.Name.StartsWith($".NET IT (disabled) {this.fixture.TestRunIdentifier}"))
+                .ShouldBeTrue();
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Reset_password_for_valid_account(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var application = client.GetResource<IApplication>(this.fixture.PrimaryApplicationHref);
+
+            var token = application.SendPasswordResetEmail("vader@galacticempire.co");
+
+            var validTokenResponse = application.VerifyPasswordResetToken(token.GetValue());
+            validTokenResponse.Email.ShouldBe("vader@galacticempire.co");
+
+            var resetPasswordResponse = application.ResetPassword(token.GetValue(), "Ifindyourlackofsecuritydisturbing!1");
+            resetPasswordResponse.Email.ShouldBe("vader@galacticempire.co");
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Directory_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Directory_tests.cs
new file mode 100644
index 00000000..cfb0178e
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Directory_tests.cs
@@ -0,0 +1,51 @@
+// <copyright file="Sync_Directory_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Integration.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Integration
+{
+    [Collection("Live tenant tests")]
+    public class Sync_Directory_tests
+    {
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Getting_tenant_directories(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+            var directories = tenant.GetDirectories().Synchronously().ToList();
+
+            directories.Count.ShouldNotBe(0);
+        }
+
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Creating_a_directory_via_instantiation(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+            var directories = tenant.GetDirectories().Synchronously().ToList();
+
+            directories.Count.ShouldNotBe(0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Error_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Error_tests.cs
new file mode 100644
index 00000000..506c710a
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Error_tests.cs
@@ -0,0 +1,50 @@
+// <copyright file="Sync_Error_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Error;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Integration.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Integration.Sync
+{
+    public class Sync_Error_tests
+    {
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void When_resource_does_not_exist(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            try
+            {
+                var bad = client.GetResource<IAccount>(tenant.Href + "/foobar");
+            }
+            catch (ResourceException rex)
+            {
+                rex.Code.ShouldBe(404);
+                rex.DeveloperMessage.ShouldBe("The requested resource does not exist.");
+                rex.Message.ShouldNotBe(null);
+                rex.MoreInfo.ShouldNotBe(null);
+                rex.HttpStatus.ShouldBe(404);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Tenant_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Tenant_tests.cs
new file mode 100644
index 00000000..0f9e2265
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/Sync/Sync_Tenant_tests.cs
@@ -0,0 +1,40 @@
+// <copyright file="Sync_Tenant_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Shouldly;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Integration.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Integration.Sync
+{
+    [CollectionDefinition("Live tenant tests")]
+    public class Sync_Tenant_tests
+    {
+        [Theory]
+        [MemberData(nameof(IntegrationTestClients.GetClients), MemberType = typeof(IntegrationTestClients))]
+        public void Getting_current_tenant(TestClientBuilder clientBuilder)
+        {
+            var client = clientBuilder.Build();
+            var tenant = client.GetCurrentTenant();
+
+            tenant.ShouldNotBe(null);
+            tenant.Href.ShouldNotBe(null);
+            tenant.Name.ShouldNotBe(null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/packages.config b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/packages.config
index 947dd088..40e60008 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests.Integration/packages.config
+++ b/Stormpath.SDK/Stormpath.SDK.Tests.Integration/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Shouldly" version="2.6.0" targetFramework="net45" />
-  <package id="StyleCop.Analyzers" version="1.0.0-beta011" targetFramework="net45" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta012" targetFramework="net45" developmentDependency="true" />
   <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" />
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeAccount.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeAccount.cs
index a17a91a7..25d58af0 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeAccount.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeAccount.cs
@@ -19,7 +19,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Stormpath.SDK.Account;
-using Stormpath.SDK.Resource;
 
 namespace Stormpath.SDK.Tests.Fakes
 {
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeDataStore.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeDataStore.cs
index b8106175..82afd00a 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeDataStore.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/FakeDataStore.cs
@@ -29,7 +29,7 @@
 
 namespace Stormpath.SDK.Tests.Fakes
 {
-    public sealed class FakeDataStore<TType> : IInternalDataStore
+    public sealed class FakeDataStore<TType> : IInternalDataStore, IInternalDataStoreSync
     {
         private static int defaultLimit = 25;
         private static int defaultOffset = 0;
@@ -66,15 +66,17 @@ public IEnumerable<string> GetCalls()
 
         private IInternalDataStore AsInterface => this;
 
+        private IInternalDataStoreSync AsSyncInterface => this;
+
         async Task<CollectionResponsePage<T>> IInternalDataStore.GetCollectionAsync<T>(string href, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
             await Task.Yield();
 
-            return this.AsInterface.GetCollection<T>(href);
+            return this.AsSyncInterface.GetCollection<T>(href);
         }
 
-        CollectionResponsePage<T> IInternalDataStore.GetCollection<T>(string href)
+        CollectionResponsePage<T> IInternalDataStoreSync.GetCollection<T>(string href)
         {
             bool typesMatch = typeof(T) == typeof(TType);
             if (!typesMatch)
@@ -161,37 +163,37 @@ Task<bool> IInternalDataStore.DeleteAsync<T>(T resource, CancellationToken cance
             throw new NotImplementedException();
         }
 
-        T IInternalDataStore.GetResource<T>(string href)
+        T IDataStoreSync.GetResource<T>(string href)
         {
             throw new NotImplementedException();
         }
 
-        T IInternalDataStore.Create<T>(string parentHref, T resource)
+        T IInternalDataStoreSync.Create<T>(string parentHref, T resource)
         {
             throw new NotImplementedException();
         }
 
-        T IInternalDataStore.Create<T>(string parentHref, T resource, ICreationOptions options)
+        T IInternalDataStoreSync.Create<T>(string parentHref, T resource, ICreationOptions options)
         {
             throw new NotImplementedException();
         }
 
-        TReturned IInternalDataStore.Create<T, TReturned>(string parentHref, T resource)
+        TReturned IInternalDataStoreSync.Create<T, TReturned>(string parentHref, T resource)
         {
             throw new NotImplementedException();
         }
 
-        TReturned IInternalDataStore.Create<T, TReturned>(string parentHref, T resource, ICreationOptions options)
+        TReturned IInternalDataStoreSync.Create<T, TReturned>(string parentHref, T resource, ICreationOptions options)
         {
             throw new NotImplementedException();
         }
 
-        T IInternalDataStore.Save<T>(T resource)
+        T IInternalDataStoreSync.Save<T>(T resource)
         {
             throw new NotImplementedException();
         }
 
-        bool IInternalDataStore.Delete<T>(T resource)
+        bool IInternalDataStoreSync.Delete<T>(T resource)
         {
             throw new NotImplementedException();
         }
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/StubDataStore.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/StubDataStore.cs
index 04c4c854..f3fd43be 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/StubDataStore.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Fakes/StubDataStore.cs
@@ -29,9 +29,13 @@
 
 namespace Stormpath.SDK.Tests.Fakes
 {
-    public sealed class StubDataStore : IInternalDataStore, IDisposable
+    public sealed class StubDataStore : IInternalDataStore, IInternalDataStoreSync, IDisposable
     {
-        private readonly IInternalDataStore fakeDataStore;
+        private readonly DefaultDataStore instance;
+
+        private IInternalDataStore FakeDataStore => this.instance;
+
+        private IInternalDataStoreSync FakeDataStoreSync => this.instance;
 
         public StubDataStore(string resourceJson, string baseHref, ILogger logger = null)
         {
@@ -40,46 +44,46 @@ public StubDataStore(string resourceJson, string baseHref, ILogger logger = null
                 ? new SDK.Impl.NullLogger()
                 : logger;
 
-            this.fakeDataStore = new DefaultDataStore(fakeRequestExecutor.Object, baseHref, new JsonNetSerializer(), useLogger, new NullCacheProvider());
+            this.instance = new DefaultDataStore(fakeRequestExecutor.Object, baseHref, new JsonNetSerializer(), useLogger, new NullCacheProvider());
         }
 
-        string IInternalDataStore.BaseUrl => this.fakeDataStore.BaseUrl;
+        string IInternalDataStore.BaseUrl => this.FakeDataStore.BaseUrl;
 
-        IRequestExecutor IInternalDataStore.RequestExecutor => this.fakeDataStore.RequestExecutor;
+        IRequestExecutor IInternalDataStore.RequestExecutor => this.FakeDataStore.RequestExecutor;
 
-        T IInternalDataStore.Create<T>(string parentHref, T resource) => this.fakeDataStore.Create(parentHref, resource);
+        T IInternalDataStoreSync.Create<T>(string parentHref, T resource) => this.FakeDataStoreSync.Create(parentHref, resource);
 
-        T IInternalDataStore.Create<T>(string parentHref, T resource, ICreationOptions options) => this.fakeDataStore.Create(parentHref, resource, options);
+        T IInternalDataStoreSync.Create<T>(string parentHref, T resource, ICreationOptions options) => this.FakeDataStoreSync.Create(parentHref, resource, options);
 
-        TReturned IInternalDataStore.Create<T, TReturned>(string parentHref, T resource) => this.fakeDataStore.Create<T, TReturned>(parentHref, resource);
+        TReturned IInternalDataStoreSync.Create<T, TReturned>(string parentHref, T resource) => this.FakeDataStoreSync.Create<T, TReturned>(parentHref, resource);
 
-        TReturned IInternalDataStore.Create<T, TReturned>(string parentHref, T resource, ICreationOptions options) => this.fakeDataStore.Create<T, TReturned>(parentHref, resource);
+        TReturned IInternalDataStoreSync.Create<T, TReturned>(string parentHref, T resource, ICreationOptions options) => this.FakeDataStoreSync.Create<T, TReturned>(parentHref, resource);
 
-        Task<T> IInternalDataStore.CreateAsync<T>(string parentHref, T resource, CancellationToken cancellationToken) => this.fakeDataStore.CreateAsync(parentHref, resource, cancellationToken);
+        Task<T> IInternalDataStore.CreateAsync<T>(string parentHref, T resource, CancellationToken cancellationToken) => this.FakeDataStore.CreateAsync(parentHref, resource, cancellationToken);
 
-        Task<T> IInternalDataStore.CreateAsync<T>(string parentHref, T resource, ICreationOptions options, CancellationToken cancellationToken) => this.fakeDataStore.CreateAsync(parentHref, resource, options, cancellationToken);
+        Task<T> IInternalDataStore.CreateAsync<T>(string parentHref, T resource, ICreationOptions options, CancellationToken cancellationToken) => this.FakeDataStore.CreateAsync(parentHref, resource, options, cancellationToken);
 
-        Task<TReturned> IInternalDataStore.CreateAsync<T, TReturned>(string parentHref, T resource, CancellationToken cancellationToken) => this.fakeDataStore.CreateAsync<T, TReturned>(parentHref, resource, cancellationToken);
+        Task<TReturned> IInternalDataStore.CreateAsync<T, TReturned>(string parentHref, T resource, CancellationToken cancellationToken) => this.FakeDataStore.CreateAsync<T, TReturned>(parentHref, resource, cancellationToken);
 
-        Task<TReturned> IInternalDataStore.CreateAsync<T, TReturned>(string parentHref, T resource, ICreationOptions options, CancellationToken cancellationToken) => this.fakeDataStore.CreateAsync<T, TReturned>(parentHref, resource, options, cancellationToken);
+        Task<TReturned> IInternalDataStore.CreateAsync<T, TReturned>(string parentHref, T resource, ICreationOptions options, CancellationToken cancellationToken) => this.FakeDataStore.CreateAsync<T, TReturned>(parentHref, resource, options, cancellationToken);
 
-        bool IInternalDataStore.Delete<T>(T resource) => this.fakeDataStore.Delete(resource);
+        bool IInternalDataStoreSync.Delete<T>(T resource) => this.FakeDataStoreSync.Delete(resource);
 
-        Task<bool> IInternalDataStore.DeleteAsync<T>(T resource, CancellationToken cancellationToken) => this.fakeDataStore.DeleteAsync(resource, cancellationToken);
+        Task<bool> IInternalDataStore.DeleteAsync<T>(T resource, CancellationToken cancellationToken) => this.FakeDataStore.DeleteAsync(resource, cancellationToken);
 
-        CollectionResponsePage<T> IInternalDataStore.GetCollection<T>(string href) => this.fakeDataStore.GetCollection<T>(href);
+        CollectionResponsePage<T> IInternalDataStoreSync.GetCollection<T>(string href) => this.FakeDataStoreSync.GetCollection<T>(href);
 
-        Task<CollectionResponsePage<T>> IInternalDataStore.GetCollectionAsync<T>(string href, CancellationToken cancellationToken) => this.fakeDataStore.GetCollectionAsync<T>(href, cancellationToken);
+        Task<CollectionResponsePage<T>> IInternalDataStore.GetCollectionAsync<T>(string href, CancellationToken cancellationToken) => this.FakeDataStore.GetCollectionAsync<T>(href, cancellationToken);
 
-        T IInternalDataStore.GetResource<T>(string resourcePath) => this.fakeDataStore.GetResource<T>(resourcePath);
+        T IDataStoreSync.GetResource<T>(string href) => this.FakeDataStoreSync.GetResource<T>(href);
 
-        Task<T> IDataStore.GetResourceAsync<T>(string href, CancellationToken cancellationToken) => this.fakeDataStore.GetResourceAsync<T>(href, cancellationToken);
+        Task<T> IDataStore.GetResourceAsync<T>(string href, CancellationToken cancellationToken) => this.FakeDataStore.GetResourceAsync<T>(href, cancellationToken);
 
-        T IDataStore.Instantiate<T>() => this.fakeDataStore.Instantiate<T>();
+        T IDataStore.Instantiate<T>() => this.FakeDataStore.Instantiate<T>();
 
-        T IInternalDataStore.Save<T>(T resource) => this.fakeDataStore.Save(resource);
+        T IInternalDataStoreSync.Save<T>(T resource) => this.FakeDataStoreSync.Save(resource);
 
-        Task<T> IInternalDataStore.SaveAsync<T>(T resource, CancellationToken cancellationToken) => this.fakeDataStore.SaveAsync(resource, cancellationToken);
+        Task<T> IInternalDataStore.SaveAsync<T>(T resource, CancellationToken cancellationToken) => this.FakeDataStore.SaveAsync(resource, cancellationToken);
 
 #pragma warning disable SA1124 // Do not use regions
         #region IDisposable Support
@@ -93,7 +97,7 @@ private void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    this.fakeDataStore.Dispose();
+                    this.instance.Dispose();
                 }
 
                 this.isDisposed = true;
@@ -106,7 +110,6 @@ public void Dispose()
             // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
             this.Dispose(true);
         }
-
         #endregion
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Helpers/LinqAssertExtensions.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Helpers/LinqAssertExtensions.cs
index fe8f6e5b..2d7ee97e 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Helpers/LinqAssertExtensions.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Helpers/LinqAssertExtensions.cs
@@ -15,6 +15,7 @@
 // limitations under the License.
 // </remarks>
 
+using System.Linq;
 using System.Threading;
 using NSubstitute;
 using Shouldly;
@@ -28,13 +29,38 @@ namespace Stormpath.SDK.Tests.Helpers
 {
     public static class LinqAssertExtensions
     {
-        public static void GeneratedArgumentsWere<T>(this IAsyncQueryable<T> queryable, string href, string arguments)
+        public static string GetGeneratedHref<T>(this IAsyncQueryable<T> queryable)
         {
             var resourceQueryable = queryable as CollectionResourceQueryable<T>;
             if (resourceQueryable == null)
                 Assertly.Fail("This queryable is not a CollectionResourceQueryable.");
 
-            resourceQueryable.CurrentHref.ShouldBe($"{href}?{arguments}");
+            return resourceQueryable.CurrentHref;
+        }
+
+        public static string GetGeneratedHref<T>(this IQueryable<T> queryable)
+        {
+            var resourceQueryable = queryable as CollectionResourceQueryable<T>;
+            if (resourceQueryable == null)
+                Assertly.Fail("This queryable is not a CollectionResourceQueryable.");
+
+            return resourceQueryable.CurrentHref;
+        }
+
+        public static void GeneratedArgumentsWere<T>(this IAsyncQueryable<T> queryable, string href, string arguments)
+        {
+            if (string.IsNullOrEmpty(arguments))
+                queryable.GetGeneratedHref().ShouldBe($"{href}");
+            else
+                queryable.GetGeneratedHref().ShouldBe($"{href}?{arguments}");
+        }
+
+        public static void GeneratedSynchronousArgumentsWere<T>(this IQueryable<T> queryable, string href, string arguments)
+        {
+            if (string.IsNullOrEmpty(arguments))
+                queryable.GetGeneratedHref().ShouldBe($"{href}");
+            else
+                queryable.GetGeneratedHref().ShouldBe($"{href}?{arguments}");
         }
 
         // The same thing as above, but for testing whether a FakeDataStore received a particular URL call
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/AnyAsync_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/AnyAsync_tests.cs
index 27138ff3..bd289772 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/AnyAsync_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/AnyAsync_tests.cs
@@ -15,7 +15,6 @@
 // limitations under the License.
 // </remarks>
 
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Shouldly;
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Complicated_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Complicated_tests.cs
new file mode 100644
index 00000000..0cbfe641
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Complicated_tests.cs
@@ -0,0 +1,81 @@
+// <copyright file="Complicated_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    /// <summary>
+    /// Tests that combine many different query expressions and formats.
+    /// These are especially important for any refactoring of the underlying LINQ code.
+    /// </summary>
+    public class Complicated_tests : Linq_tests
+    {
+        private static string[] GetArguments(string href)
+        {
+            return href.Split('?')[1].Split('&');
+        }
+
+        [Fact]
+        public void Case_1()
+        {
+            var query = this.Harness.Queryable
+                .Filter("vader")
+                .Where(x => x.Email.EndsWith("@galacticempire.co") &&
+                            x.Status == AccountStatus.Enabled)
+                .Where(x => x.CreatedAt.Within(2015))
+                .Skip(0)
+                .Take(1);
+
+            var arguments = GetArguments(query.GetGeneratedHref());
+
+            arguments.ShouldContain("q=vader");
+            arguments.ShouldContain("email=*@galacticempire.co");
+            arguments.ShouldContain("status=ENABLED");
+            arguments.ShouldContain("createdAt=2015");
+            arguments.ShouldContain("limit=1");
+            arguments.Count().ShouldBe(5);
+        }
+
+        [Fact]
+        public void Case_2()
+        {
+            var query = this.Harness.Queryable
+                .OrderBy(x => x.Email)
+                .ThenByDescending(x => x.Username)
+                .Skip(10)
+                .Where(x => x.ModifiedAt.Within(2015, 1) && x.MiddleName == "test")
+                .Where(x => x.GivenName.Equals("foo"))
+                .Where(x => x.CreatedAt >= new DateTimeOffset(2015, 1, 1, 0, 0, 0, TimeSpan.Zero) && x.CreatedAt < new DateTimeOffset(2015, 6, 30, 0, 0, 0, TimeSpan.Zero));
+
+            var arguments = GetArguments(query.GetGeneratedHref());
+
+            arguments.ShouldContain("orderBy=email,username desc");
+            arguments.ShouldContain("offset=10");
+            arguments.ShouldContain("modifiedAt=2015-01");
+            arguments.ShouldContain("middleName=test");
+            arguments.ShouldContain("givenName=foo");
+            arguments.ShouldContain("createdAt=[2015-01-01T00:00:00Z,2015-06-30T00:00:00Z)");
+            arguments.Count().ShouldBe(6);
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Filter_extension_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Filter_extension_tests.cs
index 27363b80..05bcffaa 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Filter_extension_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Filter_extension_tests.cs
@@ -15,6 +15,8 @@
 // limitations under the License.
 // </remarks>
 
+using System;
+using Shouldly;
 using Stormpath.SDK.Tests.Helpers;
 using Xunit;
 
@@ -34,14 +36,16 @@ public void With_simple_parameter()
         }
 
         [Fact]
-        public void Multiple_calls_are_LIFO()
+        public void Throws_for_multiple_serial_calls()
         {
             var query = this.Harness.Queryable
                 .Filter("Joe")
                 .Filter("Joey");
 
-            // Expected behavior: the last call will be kept
-            query.GeneratedArgumentsWere(this.Href, "q=Joey");
+            Should.Throw<NotSupportedException>(() =>
+            {
+                query.GeneratedArgumentsWere(this.Href, "q=Joey");
+            });
         }
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/FirstOrDefaultAsync_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/FirstOrDefaultAsync_tests.cs
index f9d7f54a..e65566d9 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/FirstOrDefaultAsync_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/FirstOrDefaultAsync_tests.cs
@@ -15,7 +15,6 @@
 // limitations under the License.
 // </remarks>
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/OrderBy_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/OrderBy_tests.cs
index f8ce87e8..a15501bf 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/OrderBy_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/OrderBy_tests.cs
@@ -40,6 +40,26 @@ public void Sort_by_field_descending()
             query.GeneratedArgumentsWere(this.Href, "orderBy=email desc");
         }
 
+        [Fact]
+        public void Sort_with_additional_expressions_before()
+        {
+            var query = this.Harness.Queryable
+                .Take(10)
+                .OrderBy(x => x.GivenName);
+
+            query.GeneratedArgumentsWere(this.Href, "limit=10&orderBy=givenName");
+        }
+
+        [Fact]
+        public void Sort_with_additional_expressions_after()
+        {
+            var query = this.Harness.Queryable
+                .OrderByDescending(x => x.GivenName)
+                .Take(10);
+
+            query.GeneratedArgumentsWere(this.Href, "limit=10&orderBy=givenName desc");
+        }
+
         [Fact]
         public void Sort_by_multiple_fields()
         {
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Skip_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Skip_tests.cs
index db0bbbaf..8267f3ce 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Skip_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Skip_tests.cs
@@ -63,6 +63,16 @@ public void Multiple_calls_are_LIFO()
             query.GeneratedArgumentsWere(this.Href, "offset=5");
         }
 
+        [Fact]
+        public void Zero_is_ignored()
+        {
+            var query = this.Harness.Queryable
+                .Skip(0);
+
+            // Expected behavior: the last call will be kept
+            query.GeneratedArgumentsWere(this.Href, string.Empty);
+        }
+
         [Fact]
         public void Throws_for_invalid_value()
         {
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/SyncAdapter_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/SyncAdapter_tests.cs
new file mode 100644
index 00000000..b2444fe9
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/SyncAdapter_tests.cs
@@ -0,0 +1,60 @@
+// <copyright file="SyncAdapter_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class SyncAdapter_tests : Linq_tests
+    {
+        [Fact]
+        public void Iterates_through_collection()
+        {
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(
+                this.Href,
+                new FakeDataStore<IAccount>(Enumerable.Repeat(FakeAccounts.DarthVader, 52)));
+
+            var items = harness.Queryable
+                .Synchronously()
+                .Skip(10)
+                .ToList();
+
+            items.Count.ShouldBe(42);
+        }
+
+        [Fact]
+        public void Take_is_observed()
+        {
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(
+                this.Href,
+                new FakeDataStore<IAccount>(Enumerable.Repeat(FakeAccounts.DarthVader, 52)));
+
+            var items = harness.Queryable
+                .Synchronously()
+                .Take(5)
+                .ToList();
+
+            items.Count.ShouldBe(5);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Any_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Any_tests.cs
new file mode 100644
index 00000000..f2ff8fe6
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Any_tests.cs
@@ -0,0 +1,54 @@
+// <copyright file="Sync_Any_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_Any_tests : Linq_tests
+    {
+        [Fact]
+        public void Returns_false_for_empty_collection()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Empty<IAccount>());
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            harness.Queryable
+                .Synchronously()
+                .Any()
+                .ShouldBeFalse();
+        }
+
+        [Fact]
+        public void Returns_true_for_nonempty_collection()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Repeat(FakeAccounts.R2D2, 73));
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            harness.Queryable
+                .Synchronously()
+                .Any()
+                .ShouldBeTrue();
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_AsEnumerable_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_AsEnumerable_tests.cs
new file mode 100644
index 00000000..e7ae646a
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_AsEnumerable_tests.cs
@@ -0,0 +1,43 @@
+// <copyright file="Sync_AsEnumerable_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_AsEnumerable_tests : Linq_tests
+    {
+        [Fact]
+        public void AsEnumerable_is_idempotent()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(FakeAccounts.RebelAlliance);
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var alliance = harness.Queryable
+                .Synchronously()
+                .AsEnumerable();
+
+            alliance.Count().ShouldBe(FakeAccounts.RebelAlliance.Count);
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Count_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Count_tests.cs
new file mode 100644
index 00000000..35af75d8
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Count_tests.cs
@@ -0,0 +1,57 @@
+// <copyright file="Sync_Count_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_Count_tests : Linq_tests
+    {
+        [Fact]
+        public void Returns_count()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Repeat(FakeAccounts.C3PO, 73));
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var count = harness.Queryable
+                .Synchronously()
+                .Count();
+
+            count.ShouldBe(73);
+        }
+
+        [Fact]
+        public void Returns_long_count()
+        {
+            // Happy 13.0.0.0.0!
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Repeat(FakeAccounts.C3PO, 150)); // I realize that 150 is not an int64, it's just a simple test
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var count = harness.Queryable
+                .Synchronously()
+                .LongCount();
+
+            count.ShouldBe(150);
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_FirstOrDefault_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_FirstOrDefault_tests.cs
new file mode 100644
index 00000000..af873fb0
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_FirstOrDefault_tests.cs
@@ -0,0 +1,57 @@
+// <copyright file="Sync_FirstOrDefault_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Collections.Generic;
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_FirstOrDefault_tests : Linq_tests
+    {
+        [Fact]
+        public void Returns_first_item()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(new List<IAccount>()
+                {
+                    FakeAccounts.LukeSkywalker,
+                    FakeAccounts.HanSolo
+                });
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var luke = harness.Queryable.Synchronously().FirstOrDefault();
+
+            luke.Surname.ShouldBe("Skywalker");
+        }
+
+        [Fact]
+        public void Returns_null_when_no_items_exist()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Empty<IAccount>());
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var notLuke = harness.Queryable.Synchronously().FirstOrDefault();
+
+            notLuke.ShouldBeNull();
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_First_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_First_tests.cs
new file mode 100644
index 00000000..6b8b706d
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_First_tests.cs
@@ -0,0 +1,62 @@
+// <copyright file="Sync_First_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_First_tests : Linq_tests
+    {
+        [Fact]
+        public void Returns_first_item()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(new List<IAccount>()
+                {
+                    FakeAccounts.LukeSkywalker,
+                    FakeAccounts.HanSolo
+                });
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var luke = harness.Queryable
+                .Synchronously()
+                .First();
+
+            luke.Surname.ShouldBe("Skywalker");
+        }
+
+        [Fact]
+        public void Throws_when_no_items_exist()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Empty<IAccount>());
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            // TODO This should be InvalidOperationException, but under Mono it throws NullReferenceException for some undetermined reason
+            Should.Throw<Exception>(() =>
+            {
+                var jabba = harness.Queryable.Synchronously().First();
+            });
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_SingleOrDefault_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_SingleOrDefault_tests.cs
new file mode 100644
index 00000000..16b85d0b
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_SingleOrDefault_tests.cs
@@ -0,0 +1,74 @@
+// <copyright file="Sync_SingleOrDefault_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_SingleOrDefault_tests : Linq_tests
+    {
+        [Fact]
+        public void Returns_one_item()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(new List<IAccount>()
+                {
+                    FakeAccounts.HanSolo
+                });
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var han = harness.Queryable.Synchronously().SingleOrDefault();
+
+            han.Surname.ShouldBe("Solo");
+        }
+
+        [Fact]
+        public void Throws_when_more_than_one_item_exists()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(new List<IAccount>()
+                {
+                    FakeAccounts.HanSolo,
+                    FakeAccounts.LukeSkywalker
+                });
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            // TODO This should be InvalidOperationException, but under Mono it throws NullReferenceException for some undetermined reason
+            Should.Throw<Exception>(() =>
+            {
+                var han = harness.Queryable.Synchronously().SingleOrDefault();
+            });
+        }
+
+        [Fact]
+        public void Returns_null_when_no_items_exist()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Empty<IAccount>());
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var notHan = harness.Queryable.Synchronously().SingleOrDefault();
+
+            notHan.ShouldBeNull();
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Single_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Single_tests.cs
new file mode 100644
index 00000000..303719c7
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_Single_tests.cs
@@ -0,0 +1,76 @@
+// <copyright file="Sync_Single_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_Single_tests : Linq_tests
+    {
+        [Fact]
+        public void Returns_one_item()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(new List<IAccount>()
+                {
+                    FakeAccounts.HanSolo
+                });
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var han = harness.Queryable.Synchronously().Single();
+
+            han.Surname.ShouldBe("Solo");
+        }
+
+        [Fact]
+        public void Throws_when_more_than_one_item_exists()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(new List<IAccount>()
+                {
+                    FakeAccounts.HanSolo,
+                    FakeAccounts.LukeSkywalker
+                });
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            // TODO This should be InvalidOperationException, but under Mono it throws NullReferenceException for some undetermined reason
+            Should.Throw<Exception>(() =>
+            {
+                var han = harness.Queryable.Synchronously().Single();
+            });
+        }
+
+        [Fact]
+        public void Throws_when_no_items_exist()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Empty<IAccount>());
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            // TODO This should be InvalidOperationException, but under Mono it throws NullReferenceException for some undetermined reason
+            Should.Throw<Exception>(() =>
+            {
+                var jabba = harness.Queryable.Synchronously().Single();
+            });
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_ToList_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_ToList_tests.cs
new file mode 100644
index 00000000..b796a0e9
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_ToList_tests.cs
@@ -0,0 +1,68 @@
+// <copyright file="Sync_ToList_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_ToList_tests : Linq_tests
+    {
+        [Fact]
+        public void Returns_empty_list_for_no_items()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Empty<IAccount>());
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var empty = harness.Queryable.Synchronously().ToList();
+
+            empty.ShouldBeEmpty();
+        }
+
+        [Fact]
+        public void Retrieves_all_items()
+        {
+            var fakeDataStore = new FakeDataStore<IAccount>(FakeAccounts.RebelAlliance);
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var alliance = harness.Queryable.Synchronously().ToList();
+
+            alliance.Count.ShouldBe(FakeAccounts.RebelAlliance.Count);
+        }
+
+        [Fact]
+        public void Checks_for_new_items_after_last_page()
+        {
+            // Scenario: 51 items in a server-side collection. The default limit is 25,
+            // so two calls will return 25 items, and the 3rd will return 1. However, ToListAsync
+            // will make another call to the server, just to make sure another item hasn't been added
+            // to the end while we were enumerating.
+            var fakeDataStore = new FakeDataStore<IAccount>(Enumerable.Repeat(new FakeAccount(), 51));
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(this.Href, fakeDataStore);
+
+            var longList = harness.Queryable.Synchronously().ToList();
+
+            longList.Count.ShouldBe(51);
+            fakeDataStore.GetCalls().Count().ShouldBe(4);
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_foreach_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_foreach_tests.cs
new file mode 100644
index 00000000..aa2345f5
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_foreach_tests.cs
@@ -0,0 +1,46 @@
+// <copyright file="Sync_foreach_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Collections.Generic;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_foreach_tests : Linq_tests
+    {
+        [Fact]
+        public void Operates_on_every_item()
+        {
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(
+                this.Href,
+                new FakeDataStore<IAccount>(FakeAccounts.RebelAlliance));
+            var gmailAlliance = new List<string>();
+
+            foreach (var rebel in harness.Queryable.Synchronously())
+            {
+                gmailAlliance.Add($"{rebel.GivenName.ToLower()}@gmail.com");
+            }
+
+            gmailAlliance.Count.ShouldBe(FakeAccounts.RebelAlliance.Count);
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_unsupported_methods_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_unsupported_methods_tests.cs
new file mode 100644
index 00000000..ea42b16a
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Sync_unsupported_methods_tests.cs
@@ -0,0 +1,301 @@
+// <copyright file="Sync_unsupported_methods_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NSubstitute;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Sync_unsupported_methods_tests : Linq_tests
+    {
+        [Fact]
+        public void Aggregate_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().Aggregate((x, y) => x);
+            });
+        }
+
+        [Fact]
+        public void All_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().All(x => x.Email == "foo");
+            });
+        }
+
+        [Fact]
+        public void Average_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().Average(x => 1.0);
+            });
+        }
+
+        [Fact]
+        public void Cast_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Cast<Tenant.ITenant>();
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Concat_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Concat(Enumerable.Empty<IAccount>());
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Contains_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().Contains(Substitute.For<IAccount>());
+            });
+        }
+
+        [Fact]
+        public void Distinct_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Distinct();
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Except_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Except(Enumerable.Empty<IAccount>());
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void GroupBy_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().GroupBy(x => x.Email);
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void GroupJoin_clause_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().GroupJoin(
+                    Enumerable.Empty<IAccount>(),
+                    outer => outer.Email,
+                    inner => inner.Username,
+                    (outer, results) => new { outer.CreatedAt, results });
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Intersect_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Intersect(Enumerable.Empty<IAccount>());
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Join_clause_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Join(
+                    Enumerable.Empty<IAccount>(),
+                    outer => outer.Email,
+                    inner => inner.Username,
+                    (outer, inner) => outer.CreatedAt);
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Last_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().Last();
+            });
+
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().LastOrDefault();
+            });
+        }
+
+        [Fact]
+        public void Max_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().Max();
+            });
+        }
+
+        [Fact]
+        public void Min_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().Min();
+            });
+        }
+
+        [Fact]
+        public void OfType_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().OfType<IAccount>();
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Order_throws_for_complex_overloads()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable
+                    .Synchronously()
+                    .OrderBy(x => x.GivenName, Substitute.For<IComparer<string>>()).ToList();
+            });
+        }
+
+        [Fact]
+        public void Reverse_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Reverse();
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Select_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable
+                    .Synchronously()
+                    .Select(x => x.Email);
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void SelectMany_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().SelectMany(x => x.Email);
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void SequenceEqual_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().SequenceEqual(Enumerable.Empty<IAccount>());
+            });
+        }
+
+        [Fact]
+        public void SkipWhile_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().SkipWhile(x => x.Email == "foobar");
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Sum_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                this.Harness.Queryable.Synchronously().Sum(x => 1);
+            });
+        }
+
+        [Fact]
+        public void TakeWhile_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().TakeWhile(x => x.Email == "foobar");
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Union_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Union(Enumerable.Empty<IAccount>());
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Zip_is_unsupported()
+        {
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var query = this.Harness.Queryable.Synchronously().Zip(
+                    Enumerable.Empty<IAccount>(),
+                    (first, second) => first.Email == second.Email);
+                query.GeneratedSynchronousArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Synchronously_extension_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Synchronously_extension_tests.cs
new file mode 100644
index 00000000..50dee079
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Synchronously_extension_tests.cs
@@ -0,0 +1,61 @@
+// <copyright file="Synchronously_extension_tests.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Linq;
+using Shouldly;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Sync;
+using Stormpath.SDK.Tests.Fakes;
+using Stormpath.SDK.Tests.Helpers;
+using Xunit;
+
+namespace Stormpath.SDK.Tests.Impl.Linq
+{
+    public class Synchronously_extension_tests : Linq_tests
+    {
+        [Fact]
+        public void Throws_if_not_called_first()
+        {
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(
+                this.Href,
+                new FakeDataStore<IAccount>(Enumerable.Repeat(FakeAccounts.DarthVader, 52)));
+
+            Should.Throw<NotSupportedException>(() =>
+            {
+                var synchronousQueryable = harness.Queryable
+                    .Skip(10)
+                    .Synchronously();
+            });
+        }
+
+        [Fact]
+        public void Returns_a_vanilla_queryable()
+        {
+            var harness = CollectionTestHarness<IAccount>.Create<IAccount>(
+                this.Href,
+                new FakeDataStore<IAccount>(Enumerable.Repeat(FakeAccounts.DarthVader, 52)));
+
+            var synchronousQueryable = harness.Queryable
+                .Synchronously()
+                .Skip(10);
+
+            synchronousQueryable.ShouldBeAssignableTo<IQueryable<IAccount>>();
+            synchronousQueryable.ShouldNotBeNull();
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Take_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Take_tests.cs
index 04b85406..705fb599 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Take_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Take_tests.cs
@@ -67,6 +67,16 @@ public void Multiple_calls_are_LIFO()
             query.GeneratedArgumentsWere(this.Href, "limit=5");
         }
 
+        [Fact]
+        public void Zero_is_ignored()
+        {
+            var query = this.Harness.Queryable
+                .Take(0);
+
+            // Expected behavior: the last call will be kept
+            query.GeneratedArgumentsWere(this.Href, string.Empty);
+        }
+
         [Fact]
         public void Throws_for_invalid_value()
         {
@@ -80,7 +90,7 @@ public void Throws_for_invalid_value()
         }
 
         [Fact]
-        public async Task Observes_take_limit()
+        public async Task ToListAsync_observes_take_limit()
         {
             // Scenario: .Take() functions a little differently than the limit=? parameter
             // in Stormpath, even though that's what it translates to. .Take() represents an
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/ToListAsync_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/ToListAsync_tests.cs
index 5a74ebd5..1b67fff3 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/ToListAsync_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/ToListAsync_tests.cs
@@ -15,10 +15,7 @@
 // limitations under the License.
 // </remarks>
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Shouldly;
 using Stormpath.SDK.Account;
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Within_extension_tests.cs b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Within_extension_tests.cs
index 85fc3dc1..e6cfd777 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Within_extension_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Within_extension_tests.cs
@@ -27,13 +27,90 @@ public class Within_extension_tests : Linq_tests
         [Fact]
         public void Within_throws_when_using_outside_LINQ()
         {
+            var dto = new DateTimeOffset(DateTime.Now);
+
             Should.Throw<NotSupportedException>(() =>
             {
-                var dto = new DateTimeOffset(DateTime.Now);
                 var test = dto.Within(2015);
             });
         }
 
+        [Fact]
+        public void Throws_for_multiple_series_calls()
+        {
+            var query = this.Harness.Queryable
+                .Where(x => x.CreatedAt.Within(2015))
+                .Where(x => x.CreatedAt.Within(2015, 01, 01));
+
+            Should.Throw<NotSupportedException>(() =>
+            {
+                query.GeneratedArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Throws_for_multiple_parallel_calls()
+        {
+            var query = this.Harness.Queryable
+                .Where(x => x.CreatedAt.Within(2015) && x.CreatedAt.Within(2015, 01, 01));
+
+            Should.Throw<NotSupportedException>(() =>
+            {
+                query.GeneratedArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Throws_when_mixing_Within_and_date_comparison()
+        {
+            var query = this.Harness.Queryable
+                .Where(x => x.CreatedAt.Within(2015))
+                .Where(x => x.CreatedAt > DateTime.Now);
+
+            Should.Throw<NotSupportedException>(() =>
+            {
+                query.GeneratedArgumentsWere(this.Href, "<not evaluated>");
+            });
+        }
+
+        [Fact]
+        public void Both_created_and_modified_fields_in_series()
+        {
+            var query = this.Harness.Queryable
+                .Where(x => x.CreatedAt.Within(2015))
+                .Where(x => x.ModifiedAt.Within(2015, 1));
+
+            query.GeneratedArgumentsWere(this.Href, "createdAt=2015&modifiedAt=2015-01");
+        }
+
+        [Fact]
+        public void Both_created_and_modified_fields_in_parallel()
+        {
+            var query = this.Harness.Queryable
+                .Where(x => x.CreatedAt.Within(2015) && x.ModifiedAt.Within(2015, 1));
+
+            query.GeneratedArgumentsWere(this.Href, "createdAt=2015&modifiedAt=2015-01");
+        }
+
+        [Fact]
+        public void With_other_Where_terms_in_series()
+        {
+            var query = this.Harness.Queryable
+                .Where(x => x.Email == "foo@bar.co")
+                .Where(x => x.CreatedAt.Within(2015));
+
+            query.GeneratedArgumentsWere(this.Href, "email=foo@bar.co&createdAt=2015");
+        }
+
+        [Fact]
+        public void With_other_Where_terms_in_parallel()
+        {
+            var query = this.Harness.Queryable
+                .Where(x => x.Email == "foo@bar.co" && x.CreatedAt.Within(2015, 1));
+
+            query.GeneratedArgumentsWere(this.Href, "email=foo@bar.co&createdAt=2015-01");
+        }
+
         [Fact]
         public void Where_date_using_shorthand_for_year()
         {
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Stormpath.SDK.Tests.csproj b/Stormpath.SDK/Stormpath.SDK.Tests/Stormpath.SDK.Tests.csproj
index d07c6a2e..55ceb3f2 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Stormpath.SDK.Tests.csproj
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/Stormpath.SDK.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\xunit.runner.visualstudio.2.1.0-rc2-build1126\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0-rc2-build1126\build\net20\xunit.runner.visualstudio.props')" />
   <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.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -109,10 +109,22 @@
     <Compile Include="Impl\FieldConverterList_tests.cs" />
     <Compile Include="Impl\FilterChain_tests.cs" />
     <Compile Include="Impl\HttpHeaders_tests.cs" />
+    <Compile Include="Impl\Linq\Complicated_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_SingleOrDefault_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_Single_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_foreach_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_FirstOrDefault_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_First_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_Count_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_Any_tests.cs" />
     <Compile Include="Impl\Linq\AnyAsync_tests.cs" />
     <Compile Include="Impl\Linq\FirstOrDefaultAsync_tests.cs" />
     <Compile Include="Impl\Linq\SingleOrDefaultAsync_tests.cs" />
     <Compile Include="Impl\Linq\ForEachAsync_tests.cs" />
+    <Compile Include="Impl\Linq\SyncAdapter_tests.cs" />
+    <Compile Include="Impl\Linq\Synchronously_extension_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_AsEnumerable_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_ToList_tests.cs" />
     <Compile Include="Impl\PasswordResetToken_tests.cs" />
     <Compile Include="Impl\ResourceTypeLookup_tests.cs" />
     <Compile Include="Impl\UriQualifier_tests.cs" />
@@ -127,7 +139,7 @@
     <Compile Include="Impl\Linq\OrderBy_tests.cs" />
     <Compile Include="Impl\Linq\SingleAsync_tests.cs" />
     <Compile Include="Impl\Linq\ToListAsync_tests.cs" />
-    <Compile Include="Impl\Linq\Unsupported_filters_tests.cs" />
+    <Compile Include="Impl\Linq\Sync_unsupported_methods_tests.cs" />
     <Compile Include="Impl\Linq\Where_tests.cs" />
     <Compile Include="Impl\Linq\Within_extension_tests.cs" />
     <Compile Include="Impl\QueryString_tests.cs" />
@@ -164,16 +176,16 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </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. Use 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.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\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'))" />
+    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0-rc2-build1126\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0-rc2-build1126\build\net20\xunit.runner.visualstudio.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/Stormpath.SDK/Stormpath.SDK.Tests/packages.config b/Stormpath.SDK/Stormpath.SDK.Tests/packages.config
index 546ffbb6..e879ce7b 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/packages.config
+++ b/Stormpath.SDK/Stormpath.SDK.Tests/packages.config
@@ -4,12 +4,12 @@
   <package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
   <package id="Remotion.Linq" version="1.15.15.0" targetFramework="net45" />
   <package id="Shouldly" version="2.6.0" targetFramework="net45" />
-  <package id="StyleCop.Analyzers" version="1.0.0-beta011" targetFramework="net45" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta012" targetFramework="net45" developmentDependency="true" />
   <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.console" version="2.1.0-beta4-build3109" targetFramework="net45" />
-  <package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />
+  <package id="xunit.runner.console" version="2.1.0-rc2-build3176" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.1.0-rc2-build1126" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK/Account/IAccount.cs b/Stormpath.SDK/Stormpath.SDK/Account/IAccount.cs
index ca22da91..5aef5bef 100644
--- a/Stormpath.SDK/Stormpath.SDK/Account/IAccount.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Account/IAccount.cs
@@ -132,14 +132,14 @@ public interface IAccount : IResource, ISaveable<IAccount>, IDeletable, IAuditab
         /// Gets the account's parent <see cref="IDirectory"/> (where the account is stored).
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A Task whose result is the directory.</returns>
+        /// <returns>A Task whose result is this account's directory.</returns>
         Task<IDirectory> GetDirectoryAsync(CancellationToken cancellationToken = default(CancellationToken));
 
         /// <summary>
         /// Gets the Stormpath <see cref="ITenant"/> that owns this Account resource.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A Task whose result is the tenant.</returns>
+        /// <returns>A Task whose result is this account's tenant.</returns>
         Task<ITenant> GetTenantAsync(CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Account/IAccountCreation.cs b/Stormpath.SDK/Stormpath.SDK/Account/IAccountCreationActions.cs
similarity index 97%
rename from Stormpath.SDK/Stormpath.SDK/Account/IAccountCreation.cs
rename to Stormpath.SDK/Stormpath.SDK/Account/IAccountCreationActions.cs
index b5048d63..4db5bafd 100644
--- a/Stormpath.SDK/Stormpath.SDK/Account/IAccountCreation.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Account/IAccountCreationActions.cs
@@ -1,4 +1,4 @@
-// <copyright file="IAccountCreation.cs" company="Stormpath, Inc.">
+// <copyright file="IAccountCreationActions.cs" company="Stormpath, Inc.">
 //      Copyright (c) 2015 Stormpath, Inc.
 // </copyright>
 // <remarks>
@@ -21,7 +21,7 @@
 
 namespace Stormpath.SDK.Account
 {
-    public interface IAccountCreation
+    public interface IAccountCreationActions
     {
         /// <summary>
         /// Creates a new <see cref="IAccount"/> that may login to this application.
diff --git a/Stormpath.SDK/Stormpath.SDK/Application/IApplication.cs b/Stormpath.SDK/Stormpath.SDK/Application/IApplication.cs
index e5be3c94..df7288b8 100644
--- a/Stormpath.SDK/Stormpath.SDK/Application/IApplication.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Application/IApplication.cs
@@ -28,7 +28,7 @@ namespace Stormpath.SDK.Application
     /// <summary>
     /// Represents a Stormpath registered application.
     /// </summary>
-    public interface IApplication : IResource, ISaveable<IApplication>, IDeletable, IAuditable, IAccountCreation
+    public interface IApplication : IResource, ISaveable<IApplication>, IDeletable, IAuditable, IAccountCreationActions
     {
         /// <summary>
         /// Gets the application's name.
diff --git a/Stormpath.SDK/Stormpath.SDK/Client/IClient.cs b/Stormpath.SDK/Stormpath.SDK/Client/IClient.cs
index c9ecce32..99b04614 100644
--- a/Stormpath.SDK/Stormpath.SDK/Client/IClient.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Client/IClient.cs
@@ -15,7 +15,6 @@
 // limitations under the License.
 // </remarks>
 
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using Stormpath.SDK.DataStore;
diff --git a/Stormpath.SDK/Stormpath.SDK/Http/CanonicalUri.cs b/Stormpath.SDK/Stormpath.SDK/Http/CanonicalUri.cs
index 5dbceaa6..22e0fe12 100644
--- a/Stormpath.SDK/Stormpath.SDK/Http/CanonicalUri.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Http/CanonicalUri.cs
@@ -16,7 +16,6 @@
 // </remarks>
 
 using System;
-using System.Collections.Generic;
 using Stormpath.SDK.Impl.Extensions;
 using Stormpath.SDK.Impl.Http.Support;
 
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultAccount.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultAccount.cs
index c54b5b57..85d22238 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultAccount.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultAccount.cs
@@ -28,7 +28,7 @@
 
 namespace Stormpath.SDK.Impl.Account
 {
-    internal sealed class DefaultAccount : AbstractExtendableInstanceResource, IAccount
+    internal sealed class DefaultAccount : AbstractExtendableInstanceResource, IAccount, IAccountSync
     {
         private static readonly string AccessTokensPropertyName = "accessTokens";
         private static readonly string ApiKeysPropertyName = "apiKeys";
@@ -151,23 +151,27 @@ IAccount IAccount.SetUsername(string username)
         }
 
         Task<IDirectory> IAccount.GetDirectoryAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().GetResourceAsync<IDirectory>(this.Directory.Href);
-        }
+            => this.GetInternalDataStore().GetResourceAsync<IDirectory>(this.Directory.Href, cancellationToken);
+
+        IDirectory IAccountSync.GetDirectory()
+            => this.GetInternalDataStoreSync().GetResource<IDirectory>(this.Directory.Href);
 
         Task<ITenant> IAccount.GetTenantAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().GetResourceAsync<ITenant>(this.Tenant.Href);
-        }
+            => this.GetInternalDataStore().GetResourceAsync<ITenant>(this.Tenant.Href, cancellationToken);
+
+        ITenant IAccountSync.GetTenant()
+            => this.GetInternalDataStoreSync().GetResource<ITenant>(this.Tenant.Href);
 
         Task<bool> IDeletable.DeleteAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().DeleteAsync(this, cancellationToken);
-        }
+            => this.GetInternalDataStore().DeleteAsync(this, cancellationToken);
+
+        bool IDeletableSync.Delete()
+             => this.GetInternalDataStoreSync().Delete(this);
 
         Task<IAccount> ISaveable<IAccount>.SaveAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().SaveAsync<IAccount>(this, cancellationToken);
-        }
+             => this.GetInternalDataStore().SaveAsync<IAccount>(this, cancellationToken);
+
+        IAccount ISaveableSync<IAccount>.Save()
+             => this.GetInternalDataStoreSync().Save<IAccount>(this);
     }
 }
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultPasswordResetToken.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultPasswordResetToken.cs
index f6f08ec0..0f930cd2 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultPasswordResetToken.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Account/DefaultPasswordResetToken.cs
@@ -24,7 +24,7 @@
 
 namespace Stormpath.SDK.Impl.Account
 {
-    internal sealed class DefaultPasswordResetToken : AbstractResource, IPasswordResetToken
+    internal sealed class DefaultPasswordResetToken : AbstractResource, IPasswordResetToken, IPasswordResetTokenSync
     {
         private static readonly string TokenDelimiter = "/passwordResetTokens/";
 
@@ -61,9 +61,10 @@ public IPasswordResetToken SetPassword(string password)
         }
 
         Task<IAccount> IPasswordResetToken.GetAccountAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().GetResourceAsync<IAccount>(this.Account.Href, cancellationToken);
-        }
+             => this.GetInternalDataStore().GetResourceAsync<IAccount>(this.Account.Href, cancellationToken);
+
+        IAccount IPasswordResetTokenSync.GetAccount()
+            => this.GetInternalDataStoreSync().GetResource<IAccount>(this.Account.Href);
 
         string IPasswordResetToken.GetValue()
         {
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Account/IAccountCreationActionsSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Account/IAccountCreationActionsSync.cs
new file mode 100644
index 00000000..2f83957c
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Account/IAccountCreationActionsSync.cs
@@ -0,0 +1,75 @@
+// <copyright file="IAccountCreationActionsSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using Stormpath.SDK.Account;
+
+namespace Stormpath.SDK.Impl.Account
+{
+    internal interface IAccountCreationActionsSync
+    {
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application.
+        /// </summary>
+        /// <param name="account">The account to create/persist.</param>
+        /// <param name="creationOptionsAction">An inline builder for an instance of <see cref="IAccountCreationOptions"/>,
+        /// which will be used when sending the request.</param>
+        /// <example>
+        /// If you would like to force disabling the backing directory's account registration workflow:
+        /// <code>app.CreateAccount(theAccount, options => options.RegistrationWorkflowEnabled = false);</code>
+        /// </example>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The <see cref="SDK.Application.IApplication"/> does not have a dedicated
+        ///  <see cref="SDK.AccountStore.IAccountStore"/> or if the designated <see cref="SDK.AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        IAccount CreateAccount(IAccount account, Action<AccountCreationOptionsBuilder> creationOptionsAction);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application.
+        /// </summary>
+        /// <param name="account">The account to create/persist.</param>
+        /// <param name="creationOptions">An <see cref="IAccountCreationOptions"/> instance to use when sending the request.</param>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The <see cref="SDK.Application.IApplication"/> does not have a dedicated
+        ///  <see cref="SDK.AccountStore.IAccountStore"/> or if the designated <see cref="SDK.AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        IAccount CreateAccount(IAccount account, IAccountCreationOptions creationOptions);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application.
+        /// </summary>
+        /// <param name="account">The account to create/persist.</param>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="Error.ResourceException">The <see cref="SDK.Application.IApplication"/> does not have a dedicated
+        ///  <see cref="SDK.AccountStore.IAccountStore"/> or if the designated <see cref="SDK.AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        IAccount CreateAccount(IAccount account);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application, with the default creation options.
+        /// </summary>
+        /// <param name="givenName">The given name (aka 'first name' in Western cultures).</param>
+        /// <param name="surname">The surname (aka 'last name' in Western cultures).</param>
+        /// <param name="email">The account's email address, which must be unique among all other accounts within a <see cref="SDK.Directory.IDirectory"/>.</param>
+        /// <param name="password">The account's raw (plaintext) password.</param>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The <see cref="SDK.Application.IApplication"/> does not have a dedicated
+        ///  <see cref="SDK.AccountStore.IAccountStore"/> or if the designated <see cref="SDK.AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        IAccount CreateAccount(string givenName, string surname, string email, string password);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Account/IAccountSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Account/IAccountSync.cs
new file mode 100644
index 00000000..09466200
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Account/IAccountSync.cs
@@ -0,0 +1,39 @@
+// <copyright file="IAccountSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Directory;
+using Stormpath.SDK.Impl.Resource;
+using Stormpath.SDK.Tenant;
+
+namespace Stormpath.SDK.Impl.Account
+{
+    internal interface IAccountSync : ISaveableSync<IAccount>, IDeletableSync
+    {
+        /// <summary>
+        /// Synchronously gets the account's parent <see cref="IDirectory"/> (where the account is stored).
+        /// </summary>
+        /// <returns>The directory.</returns>
+        IDirectory GetDirectory();
+
+        /// <summary>
+        /// Synchronously gets the Stormpath <see cref="ITenant"/> that owns this Account resource.
+        /// </summary>
+        /// <returns>The tenant.</returns>
+        ITenant GetTenant();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Account/IPasswordResetTokenSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Account/IPasswordResetTokenSync.cs
new file mode 100644
index 00000000..4ebe69c2
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Account/IPasswordResetTokenSync.cs
@@ -0,0 +1,33 @@
+// <copyright file="IPasswordResetTokenSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+
+namespace Stormpath.SDK.Impl.Account
+{
+    /// <summary>
+    /// A token returned as part of the reset password workflow that can be accessed synchronously.
+    /// </summary>
+    internal interface IPasswordResetTokenSync
+    {
+        /// <summary>
+        /// Synchronously gets the <see cref="IAccount"/> associated with this password reset token.
+        /// </summary>
+        /// <returns>The <see cref="IAccount"/> in the reset password workflow.</returns>
+        IAccount GetAccount();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/AccountStore/DefaultAccountStoreMapping.cs b/Stormpath.SDK/Stormpath.SDK/Impl/AccountStore/DefaultAccountStoreMapping.cs
index 9616d69b..a7aa20cb 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/AccountStore/DefaultAccountStoreMapping.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/AccountStore/DefaultAccountStoreMapping.cs
@@ -25,7 +25,7 @@
 
 namespace Stormpath.SDK.Impl.AccountStore
 {
-    internal sealed class DefaultAccountStoreMapping : AbstractInstanceResource, IAccountStoreMapping
+    internal sealed class DefaultAccountStoreMapping : AbstractInstanceResource, IAccountStoreMapping, IAccountStoreMappingSync
     {
         private static readonly string AccountStorePropertyName = "accountStore";
         private static readonly string ApplicationPropertyName = "application";
@@ -54,13 +54,15 @@ public DefaultAccountStoreMapping(IInternalDataStore dataStore, IDictionary<stri
         int IAccountStoreMapping.ListIndex => GetProperty<int>(ListIndexPropertyName);
 
         Task<IAccountStore> IAccountStoreMapping.GetAccountStoreAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().GetResourceAsync<IAccountStore>(this.AccountStore.Href, cancellationToken);
-        }
+            => this.GetInternalDataStore().GetResourceAsync<IAccountStore>(this.AccountStore.Href, cancellationToken);
+
+        IAccountStore IAccountStoreMappingSync.GetAccountStore()
+            => this.GetInternalDataStoreSync().GetResource<IAccountStore>(this.AccountStore.Href);
 
         Task<IApplication> IAccountStoreMapping.GetApplicationAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().GetResourceAsync<IApplication>(this.Application.Href, cancellationToken);
-        }
+            => this.GetInternalDataStore().GetResourceAsync<IApplication>(this.Application.Href, cancellationToken);
+
+        IApplication IAccountStoreMappingSync.GetApplication()
+            => this.GetInternalDataStoreSync().GetResource<IApplication>(this.Application.Href);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/AccountStore/IAccountStoreMappingSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/AccountStore/IAccountStoreMappingSync.cs
new file mode 100644
index 00000000..8ba621bc
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/AccountStore/IAccountStoreMappingSync.cs
@@ -0,0 +1,41 @@
+// <copyright file="IAccountStoreMappingSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.AccountStore;
+using Stormpath.SDK.Application;
+
+namespace Stormpath.SDK.Impl.AccountStore
+{
+    /// <summary>
+    /// Represents the assignment of an <see cref="IAccountStore"/> AccountStore (either a Group or <see cref="SDK.Directory.IDirectory"/>) to an <see cref="IApplication"/> that can be accessed synchronously.
+    /// <para>When an <see cref="IAccountStoreMapping"/> is created, the accounts in the account store are granted access to become users of the linked <see cref="IApplication"/>. The order in which AccountStores are assigned to an application determines how login attempts work in Stormpath.</para>
+    /// </summary>
+    internal interface IAccountStoreMappingSync
+    {
+        /// <summary>
+        /// Synchronously gets this mapping's <see cref="IAccountStore"/> (either a Group or <see cref="SDK.Directory.IDirectory"/>), to be assigned to the application.
+        /// </summary>
+        /// <returns>The mapping's <see cref="IAccountStore"/>.</returns>
+        IAccountStore GetAccountStore();
+
+        /// <summary>
+        /// Synchronously gets the <see cref="IApplication"/> represented by this mapping.
+        /// </summary>
+        /// <returns>The mapping's <see cref="IApplication"/>.</returns>
+        IApplication GetApplication();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Api/DefaultClientApiKey.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Api/DefaultClientApiKey.cs
index 23b383e0..e80e63d7 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Api/DefaultClientApiKey.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Api/DefaultClientApiKey.cs
@@ -42,20 +42,12 @@ internal DefaultClientApiKey(string id, string secret)
             this.secret = secret;
         }
 
-        string IClientApiKey.GetId()
-        {
-            return this.id;
-        }
+        string IClientApiKey.GetId() => this.id;
 
-        string IClientApiKey.GetSecret()
-        {
-            return this.secret;
-        }
+        string IClientApiKey.GetSecret() => this.secret;
 
-        bool IClientApiKey.IsValid()
-        {
-            return !string.IsNullOrEmpty(this.id)
-                && !string.IsNullOrEmpty(this.secret);
-        }
+        bool IClientApiKey.IsValid() =>
+            !string.IsNullOrEmpty(this.id) &&
+            !string.IsNullOrEmpty(this.secret);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Application/DefaultApplication.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Application/DefaultApplication.cs
index 16d8ca6e..0592b814 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Application/DefaultApplication.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Application/DefaultApplication.cs
@@ -29,10 +29,11 @@
 using Stormpath.SDK.Impl.Resource;
 using Stormpath.SDK.Linq;
 using Stormpath.SDK.Resource;
+using Stormpath.SDK.Sync;
 
 namespace Stormpath.SDK.Impl.Application
 {
-    internal sealed class DefaultApplication : AbstractExtendableInstanceResource, IApplication
+    internal sealed class DefaultApplication : AbstractExtendableInstanceResource, IApplication, IApplicationSync
     {
         private static readonly string AccountStoreMappingsPropertyName = "accountStoreMappings";
         private static readonly string AccountsPropertyName = "accounts";
@@ -62,6 +63,8 @@ public DefaultApplication(IInternalDataStore dataStore, IDictionary<string, obje
 
         private IApplication AsInterface => this;
 
+        private IApplicationSync AsSyncInterface => this;
+
         internal LinkProperty AccountStoreMappings => this.GetLinkProperty(AccountStoreMappingsPropertyName);
 
         internal LinkProperty Accounts => this.GetLinkProperty(AccountsPropertyName);
@@ -123,6 +126,13 @@ Task<IAuthenticationResult> IApplication.AuthenticateAccountAsync(IAuthenticatio
             return dispatcher.AuthenticateAsync(this.GetInternalDataStore(), this, request, cancellationToken);
         }
 
+        IAuthenticationResult IApplicationSync.AuthenticateAccount(IAuthenticationRequest request)
+        {
+            var dispatcher = new AuthenticationRequestDispatcher();
+
+            return dispatcher.Authenticate(this.GetInternalDataStore(), this, request);
+        }
+
         Task<IAuthenticationResult> IApplication.AuthenticateAccountAsync(string username, string password, CancellationToken cancellationToken)
         {
             var request = new UsernamePasswordRequest(username, password) as IAuthenticationRequest;
@@ -130,6 +140,13 @@ Task<IAuthenticationResult> IApplication.AuthenticateAccountAsync(string usernam
             return this.AsInterface.AuthenticateAccountAsync(request, cancellationToken);
         }
 
+        IAuthenticationResult IApplicationSync.AuthenticateAccount(string username, string password)
+        {
+            var request = new UsernamePasswordRequest(username, password) as IAuthenticationRequest;
+
+            return this.AsSyncInterface.AuthenticateAccount(request);
+        }
+
         async Task<bool> IApplication.TryAuthenticateAccountAsync(string username, string password, CancellationToken cancellationToken)
         {
             try
@@ -143,7 +160,20 @@ async Task<bool> IApplication.TryAuthenticateAccountAsync(string username, strin
             }
         }
 
-        Task<IAccount> IAccountCreation.CreateAccountAsync(IAccount account, Action<AccountCreationOptionsBuilder> creationOptionsAction, CancellationToken cancellationToken)
+        bool IApplicationSync.TryAuthenticateAccount(string username, string password)
+        {
+            try
+            {
+                var loginResult = this.AsSyncInterface.AuthenticateAccount(username, password);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        Task<IAccount> IAccountCreationActions.CreateAccountAsync(IAccount account, Action<AccountCreationOptionsBuilder> creationOptionsAction, CancellationToken cancellationToken)
         {
             var builder = new AccountCreationOptionsBuilder();
             creationOptionsAction(builder);
@@ -152,17 +182,28 @@ Task<IAccount> IAccountCreation.CreateAccountAsync(IAccount account, Action<Acco
             return this.GetInternalDataStore().CreateAsync(this.Accounts.Href, account, options, cancellationToken);
         }
 
-        Task<IAccount> IAccountCreation.CreateAccountAsync(IAccount account, IAccountCreationOptions creationOptions, CancellationToken cancellationToken)
+        IAccount IAccountCreationActionsSync.CreateAccount(IAccount account, Action<AccountCreationOptionsBuilder> creationOptionsAction)
         {
-            return this.GetInternalDataStore().CreateAsync(this.Accounts.Href, account, creationOptions, cancellationToken);
-        }
+            var builder = new AccountCreationOptionsBuilder();
+            creationOptionsAction(builder);
+            var options = builder.Build();
 
-        Task<IAccount> IAccountCreation.CreateAccountAsync(IAccount account, CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().CreateAsync(this.Accounts.Href, account, cancellationToken);
+            return this.GetInternalDataStoreSync().Create(this.Accounts.Href, account, options);
         }
 
-        Task<IAccount> IAccountCreation.CreateAccountAsync(string givenName, string surname, string email, string password, CancellationToken cancellationToken)
+        Task<IAccount> IAccountCreationActions.CreateAccountAsync(IAccount account, IAccountCreationOptions creationOptions, CancellationToken cancellationToken)
+             => this.GetInternalDataStore().CreateAsync(this.Accounts.Href, account, creationOptions, cancellationToken);
+
+        IAccount IAccountCreationActionsSync.CreateAccount(IAccount account, IAccountCreationOptions creationOptions)
+             => this.GetInternalDataStoreSync().Create(this.Accounts.Href, account, creationOptions);
+
+        Task<IAccount> IAccountCreationActions.CreateAccountAsync(IAccount account, CancellationToken cancellationToken)
+             => this.GetInternalDataStore().CreateAsync(this.Accounts.Href, account, cancellationToken);
+
+        IAccount IAccountCreationActionsSync.CreateAccount(IAccount account)
+             => this.GetInternalDataStoreSync().Create(this.Accounts.Href, account);
+
+        Task<IAccount> IAccountCreationActions.CreateAccountAsync(string givenName, string surname, string email, string password, CancellationToken cancellationToken)
         {
             var account = this.GetInternalDataStore().Instantiate<IAccount>();
             account.SetGivenName(givenName);
@@ -173,15 +214,28 @@ Task<IAccount> IAccountCreation.CreateAccountAsync(string givenName, string surn
             return this.AsInterface.CreateAccountAsync(account, cancellationToken: cancellationToken);
         }
 
-        Task<bool> IDeletable.DeleteAsync(CancellationToken cancellationToken)
+        IAccount IAccountCreationActionsSync.CreateAccount(string givenName, string surname, string email, string password)
         {
-            return this.GetInternalDataStore().DeleteAsync(this, cancellationToken);
+            var account = this.GetInternalDataStore().Instantiate<IAccount>();
+            account.SetGivenName(givenName);
+            account.SetSurname(surname);
+            account.SetEmail(email);
+            account.SetPassword(password);
+
+            return this.AsSyncInterface.CreateAccount(account);
         }
 
+        Task<bool> IDeletable.DeleteAsync(CancellationToken cancellationToken)
+            => this.GetInternalDataStore().DeleteAsync(this, cancellationToken);
+
+        bool IDeletableSync.Delete()
+             => this.GetInternalDataStoreSync().Delete(this);
+
         Task<IApplication> ISaveable<IApplication>.SaveAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().SaveAsync<IApplication>(this, cancellationToken);
-        }
+             => this.GetInternalDataStore().SaveAsync<IApplication>(this, cancellationToken);
+
+        IApplication ISaveableSync<IApplication>.Save()
+            => this.GetInternalDataStoreSync().Save<IApplication>(this);
 
         Task<IPasswordResetToken> IApplication.SendPasswordResetEmailAsync(string email, CancellationToken cancellationToken)
         {
@@ -191,6 +245,14 @@ Task<IPasswordResetToken> IApplication.SendPasswordResetEmailAsync(string email,
             return this.GetInternalDataStore().CreateAsync(this.PasswordResetToken.Href, (IPasswordResetToken)token, cancellationToken);
         }
 
+        IPasswordResetToken IApplicationSync.SendPasswordResetEmail(string email)
+        {
+            var token = this.GetInternalDataStore().Instantiate<IPasswordResetToken>() as DefaultPasswordResetToken;
+            token.SetEmail(email);
+
+            return this.GetInternalDataStoreSync().Create(this.PasswordResetToken.Href, (IPasswordResetToken)token);
+        }
+
         async Task<IAccount> IApplication.VerifyPasswordResetTokenAsync(string token, CancellationToken cancellationToken)
         {
             string href = $"{this.PasswordResetToken.Href}/{token}";
@@ -199,6 +261,14 @@ async Task<IAccount> IApplication.VerifyPasswordResetTokenAsync(string token, Ca
             return await validTokenResponse.GetAccountAsync(cancellationToken).ConfigureAwait(false);
         }
 
+        IAccount IApplicationSync.VerifyPasswordResetToken(string token)
+        {
+            string href = $"{this.PasswordResetToken.Href}/{token}";
+
+            var validTokenResponse = this.GetInternalDataStore().GetResource<IPasswordResetToken>(href);
+            return validTokenResponse.GetAccount();
+        }
+
         async Task<IAccount> IApplication.ResetPasswordAsync(string token, string newPassword, CancellationToken cancellationToken)
         {
             if (string.IsNullOrEmpty(token))
@@ -214,15 +284,26 @@ async Task<IAccount> IApplication.ResetPasswordAsync(string token, string newPas
             return await responseToken.GetAccountAsync(cancellationToken).ConfigureAwait(false);
         }
 
-        IAsyncQueryable<IAccount> IApplication.GetAccounts()
+        IAccount IApplicationSync.ResetPassword(string token, string newPassword)
         {
-            return new CollectionResourceQueryable<IAccount>(this.Accounts.Href, this.GetInternalDataStore());
+            if (string.IsNullOrEmpty(token))
+                throw new ArgumentNullException(nameof(token));
+            if (string.IsNullOrEmpty(newPassword))
+                throw new ArgumentNullException(nameof(newPassword));
+
+            var href = $"{this.PasswordResetToken.Href}/{token}";
+            var passwordResetToken = this.GetInternalDataStore().Instantiate<IPasswordResetToken>() as DefaultPasswordResetToken;
+            passwordResetToken.SetPassword(newPassword);
+
+            var responseToken = this.GetInternalDataStoreSync().Create(href, (IPasswordResetToken)passwordResetToken);
+            return responseToken.GetAccount();
         }
 
+        IAsyncQueryable<IAccount> IApplication.GetAccounts()
+             => new CollectionResourceQueryable<IAccount>(this.Accounts.Href, this.GetInternalDataStore());
+
         IAsyncQueryable<IAccountStoreMapping> IApplication.GetAccountStoreMappings()
-        {
-            return new CollectionResourceQueryable<IAccountStoreMapping>(this.AccountStoreMappings.Href, this.GetInternalDataStore());
-        }
+             => new CollectionResourceQueryable<IAccountStoreMapping>(this.AccountStoreMappings.Href, this.GetInternalDataStore());
 
         async Task<IAccountStore> IApplication.GetDefaultAccountStoreAsync(CancellationToken cancellationToken)
         {
@@ -235,5 +316,17 @@ async Task<IAccountStore> IApplication.GetDefaultAccountStoreAsync(CancellationT
 
             return await accountStoreMapping.GetAccountStoreAsync().ConfigureAwait(false);
         }
+
+        IAccountStore IApplicationSync.GetDefaultAccountStore()
+        {
+            if (this.DefaultAccountStoreMapping.Href == null)
+                return null;
+
+            var accountStoreMapping = this.GetInternalDataStore().GetResource<IAccountStoreMapping>(this.DefaultAccountStoreMapping.Href);
+            if (accountStoreMapping == null)
+                return null;
+
+            return accountStoreMapping.GetAccountStore();
+        }
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Application/IApplicationSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Application/IApplicationSync.cs
new file mode 100644
index 00000000..7ab319ec
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Application/IApplicationSync.cs
@@ -0,0 +1,117 @@
+// <copyright file="IApplicationSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+using Stormpath.SDK.AccountStore;
+using Stormpath.SDK.Application;
+using Stormpath.SDK.Auth;
+using Stormpath.SDK.Impl.Account;
+using Stormpath.SDK.Impl.Resource;
+
+namespace Stormpath.SDK.Impl.Application
+{
+    internal interface IApplicationSync : ISaveableSync<IApplication>, IDeletableSync, IAccountCreationActionsSync
+    {
+        /// <summary>
+        /// Synchronously authenticates an account's submitted principals and credentials (e.g. username and password).
+        /// The account must be in one of the Application's assigned account stores.
+        /// If not in an assigned account store, the authentication attempt will fail.
+        /// </summary>
+        /// <param name="request">Any supported <see cref="IAuthenticationRequest"/> object (e.g. <see cref="UsernamePasswordRequest"/>).</param>
+        /// <returns>
+        /// The result of the authentication.
+        /// The authenticated account can be obtained from <see cref="Sync.SyncAuthenticationResultExtensions.GetAccount()"/>.
+        /// </returns>
+        /// <exception cref="SDK.Error.ResourceException">The authentication attempt failed.</exception>
+        /// <example>
+        ///     var loginRequest = new UsernamePasswordRequest("jsmith", "Password123#");
+        ///     var result = myApp.AuthenticateAccount(loginRequest);
+        /// </example>
+        IAuthenticationResult AuthenticateAccount(IAuthenticationRequest request);
+
+        /// <summary>
+        /// Synchronously authenticates an account's submitted principals and credentials (e.g. username and password).
+        /// The account must be in one of the Application's assigned account stores.
+        /// If not in an assigned account store, the authentication attempt will fail.
+        /// </summary>
+        /// <param name="username">The account's username.</param>
+        /// <param name="password">The account's raw (plaintext) password.</param>
+        /// <returns>
+        /// The result of the authentication.
+        /// The authenticated account can be obtained from <see cref="Sync.SyncAuthenticationResultExtensions.GetAccount()"/>.
+        /// </returns>
+        /// <exception cref="Error.ResourceException">The authentication attempt failed.</exception>
+        /// <example>
+        ///     var result = myApp.AuthenticateAccount("jsmith", "Password123#");
+        /// </example>
+        IAuthenticationResult AuthenticateAccount(string username, string password);
+
+        /// <summary>
+        /// Attempts to synchronously authenticate an account with the specified username and password.
+        /// <para>If you need to obtain the authenticated account details, use <see cref="AuthenticateAccount(string, string)"/> instead.</para>
+        /// </summary>
+        /// <param name="username">The account's username.</param>
+        /// <param name="password">The account's raw (plaintext) password</param>
+        /// <returns><c>true</c> if the authentication attempt succeeded; <c>false</c> otherwise.</returns>
+        /// <example>
+        ///     if (myApp.TryAuthenticateAccount("jsmith", "Password123#"))
+        ///     {
+        ///         // Login successful
+        ///     }
+        /// </example>
+        bool TryAuthenticateAccount(string username, string password);
+
+        /// <summary>
+        /// Synchronously gets the <see cref="IAccountStore"/> (either a Group or <see cref="SDK.Directory.IDirectory"/>)
+        /// used to persist new accounts created by the application.
+        /// </summary>
+        /// <returns>The default <see cref="IAccountStore"/>,
+        /// or <c>null</c> if no default <see cref="IAccountStore"/> has been designated.</returns>
+        IAccountStore GetDefaultAccountStore();
+
+        /// <summary>
+        /// Synchronously verifies the password reset token (received in the user's email) and immediately
+        /// changes the password in the same request, if the token is valid.
+        /// <para>Once the token has been successfully used, it is immediately invalidated and can't be used again.
+        /// If you need to change the password again, you will previously need to execute
+        /// <see cref="SendPasswordResetEmail(string)"/> again in order to obtain a new password reset token.</para>
+        /// </summary>
+        /// <param name="token">The verification token, usually obtained as a request parameter by your application.</param>
+        /// <param name="newPassword">The new password that will be set to the <see cref="IAccount"/> if the token is successfully validated.</param>
+        /// <returns>The account matching the specified token.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The token is not valid.</exception>
+        IAccount ResetPassword(string token, string newPassword);
+
+        /// <summary>
+        /// Synchronously sends a password reset email for the specified account email address.
+        /// The email will contain a password reset link that the user can click or copy into their browser address bar.
+        /// </summary>
+        /// <param name="email">An email address of an <see cref="IAccount"/> that may login to the application.</param>
+        /// <returns>The created <see cref="IPasswordResetToken"/>.
+        /// You can obtain the associated account via <see cref="Sync.SyncPasswordResetTokenExtensions.GetAccount()"/>.</returns>
+        /// <exception cref="SDK.Error.ResourceException">There is no account that matches the specified email address.</exception>
+        IPasswordResetToken SendPasswordResetEmail(string email);
+
+        /// <summary>
+        /// Synchronously verifies a password reset token.
+        /// </summary>
+        /// <param name="token">The verification token, usually obtained as a request paramter by your application.</param>
+        /// <returns>The <see cref="IAccount"/> matching the specified token.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The token is not valid.</exception>
+        IAccount VerifyPasswordResetToken(string token);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AbstractLoginAttempt.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AbstractLoginAttempt.cs
index a38efdcc..c00d2c26 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AbstractLoginAttempt.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AbstractLoginAttempt.cs
@@ -37,9 +37,6 @@ public AbstractLoginAttempt(IInternalDataStore dataStore, IDictionary<string, ob
 
         string ILoginAttempt.Type => this.GetProperty<string>(TypePropertyName);
 
-        void ILoginAttempt.SetType(string type)
-        {
-            this.SetProperty(TypePropertyName, type);
-        }
+        void ILoginAttempt.SetType(string type) => this.SetProperty(TypePropertyName, type);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AuthenticationRequestDispatcher.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AuthenticationRequestDispatcher.cs
index 1294f47b..2d88ff64 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AuthenticationRequestDispatcher.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/AuthenticationRequestDispatcher.cs
@@ -26,7 +26,7 @@ namespace Stormpath.SDK.Impl.Auth
 {
     internal sealed class AuthenticationRequestDispatcher
     {
-        public Task<IAuthenticationResult> AuthenticateAsync(IInternalDataStore dataStore, IApplication application, IAuthenticationRequest request, CancellationToken cancellationToken)
+        private static void Validate(IInternalDataStore dataStore, IApplication application, IAuthenticationRequest request)
         {
             if (dataStore == null)
                 throw new ArgumentNullException(nameof(dataStore));
@@ -34,11 +34,26 @@ public Task<IAuthenticationResult> AuthenticateAsync(IInternalDataStore dataStor
                 throw new ArgumentNullException(nameof(application));
             if (request == null)
                 throw new ArgumentNullException(nameof(request));
+        }
+
+        public Task<IAuthenticationResult> AuthenticateAsync(IInternalDataStore dataStore, IApplication application, IAuthenticationRequest request, CancellationToken cancellationToken)
+        {
+            Validate(dataStore, application, request);
 
             if (request is UsernamePasswordRequest)
                 return new BasicAuthenticator(dataStore).AuthenticateAsync(application.Href, request, cancellationToken);
 
             throw new InvalidOperationException($"The AuthenticationRequest {request.GetType().Name} is not supported by this implementation.");
         }
+
+        public IAuthenticationResult Authenticate(IInternalDataStore dataStore, IApplication application, IAuthenticationRequest request)
+        {
+            Validate(dataStore, application, request);
+
+            if (request is UsernamePasswordRequest)
+                return new BasicAuthenticator(dataStore).Authenticate(application.Href, request);
+
+            throw new InvalidOperationException($"The AuthenticationRequest {request.GetType().Name} is not supported by this implementation.");
+        }
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/BasicAuthenticator.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/BasicAuthenticator.cs
index b6b54c39..fe5b46a5 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/BasicAuthenticator.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/BasicAuthenticator.cs
@@ -28,22 +28,28 @@ namespace Stormpath.SDK.Impl.Auth
     internal sealed class BasicAuthenticator
     {
         private readonly IInternalDataStore dataStore;
+        private readonly IInternalDataStoreSync dataStoreSync;
 
         public BasicAuthenticator(IInternalDataStore dataStore)
         {
-            if (dataStore == null)
-                throw new ArgumentNullException(nameof(dataStore));
-
             this.dataStore = dataStore;
+            this.dataStoreSync = dataStore as IInternalDataStoreSync;
+
+            if (this.dataStore == null ||
+                this.dataStoreSync == null)
+                throw new ArgumentNullException("Internal data store could not be initialized.");
         }
 
-        public Task<IAuthenticationResult> AuthenticateAsync(string parentHref, IAuthenticationRequest request, CancellationToken cancellationToken)
+        private static void Validate(string parentHref, IAuthenticationRequest request)
         {
             if (string.IsNullOrEmpty(parentHref))
                 throw new ArgumentNullException(nameof(parentHref));
             if (!(request is UsernamePasswordRequest))
                 throw new ArgumentException("Only UsernamePasswordRequest instances are supported by this by this authenticator.");
+        }
 
+        private IBasicLoginAttempt BuildRequest(string parentHref, IAuthenticationRequest request)
+        {
             var username = request.Principals.Nullable() ?? string.Empty;
             var password = request.Credentials.Nullable() ?? string.Empty;
             var value = $"{username}:{password}";
@@ -53,9 +59,27 @@ public Task<IAuthenticationResult> AuthenticateAsync(string parentHref, IAuthent
             attempt.SetType("basic");
             attempt.SetValue(value);
 
+            return attempt;
+        }
+
+        public Task<IAuthenticationResult> AuthenticateAsync(string parentHref, IAuthenticationRequest request, CancellationToken cancellationToken)
+        {
+            Validate(parentHref, request);
+
+            var attempt = this.BuildRequest(parentHref, request);
             var href = $"{parentHref}/loginAttempts";
 
             return this.dataStore.CreateAsync<IBasicLoginAttempt, IAuthenticationResult>(href, attempt, cancellationToken);
         }
+
+        public IAuthenticationResult Authenticate(string parentHref, IAuthenticationRequest request)
+        {
+            Validate(parentHref, request);
+
+            var attempt = this.BuildRequest(parentHref, request);
+            var href = $"{parentHref}/loginAttempts";
+
+            return this.dataStoreSync.Create<IBasicLoginAttempt, IAuthenticationResult>(href, attempt);
+        }
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultAuthenticationResult.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultAuthenticationResult.cs
index 5f1c5f47..30ed5831 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultAuthenticationResult.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultAuthenticationResult.cs
@@ -25,7 +25,7 @@
 
 namespace Stormpath.SDK.Impl.Auth
 {
-    internal sealed class DefaultAuthenticationResult : AbstractResource, IAuthenticationResult
+    internal sealed class DefaultAuthenticationResult : AbstractResource, IAuthenticationResult, IAuthenticationResultSync
     {
         private static readonly string AccountPropertyName = "account";
 
@@ -42,8 +42,9 @@ public DefaultAuthenticationResult(IInternalDataStore dataStore, IDictionary<str
         internal LinkProperty Account => this.GetLinkProperty(AccountPropertyName);
 
         Task<IAccount> IAuthenticationResult.GetAccountAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().GetResourceAsync<IAccount>(this.Account.Href, cancellationToken);
-        }
+            => this.GetInternalDataStore().GetResourceAsync<IAccount>(this.Account.Href, cancellationToken);
+
+        IAccount IAuthenticationResultSync.GetAccount()
+            => this.GetInternalDataStoreSync().GetResource<IAccount>(this.Account.Href);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultBasicLoginAttempt.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultBasicLoginAttempt.cs
index d4f63534..90d47978 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultBasicLoginAttempt.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/DefaultBasicLoginAttempt.cs
@@ -36,9 +36,6 @@ public DefaultBasicLoginAttempt(IInternalDataStore dataStore, IDictionary<string
 
         string IBasicLoginAttempt.Value => this.GetProperty<string>(ValuePropertyName);
 
-        void IBasicLoginAttempt.SetValue(string value)
-        {
-            this.SetProperty(ValuePropertyName, value);
-        }
+        void IBasicLoginAttempt.SetValue(string value) => this.SetProperty(ValuePropertyName, value);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Auth/IAuthenticationResultSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/IAuthenticationResultSync.cs
new file mode 100644
index 00000000..39ca57a9
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Auth/IAuthenticationResultSync.cs
@@ -0,0 +1,34 @@
+// <copyright file="IAuthenticationResultSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+
+namespace Stormpath.SDK.Impl.Auth
+{
+    /// <summary>
+    /// Represents the return value of an <see cref="Application.IApplication"/> authentication attempt.
+    /// The successfully authenticated account may be obtained via <see cref="GetAccount()"/>.
+    /// </summary>
+    internal interface IAuthenticationResultSync
+    {
+        /// <summary>
+        /// Synchronously gets the successfully authenticated <see cref="IAccount"/>.
+        /// </summary>
+        /// <returns>The <see cref="IAccount"/> that was successfully authenticated.</returns>
+        IAccount GetAccount();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClient.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClient.cs
index bd28a587..7d8b300b 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClient.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClient.cs
@@ -30,14 +30,16 @@
 using Stormpath.SDK.Impl.DataStore;
 using Stormpath.SDK.Impl.Extensions;
 using Stormpath.SDK.Impl.Http;
+using Stormpath.SDK.Impl.Tenant;
 using Stormpath.SDK.Linq;
 using Stormpath.SDK.Serialization;
 using Stormpath.SDK.Shared;
+using Stormpath.SDK.Sync;
 using Stormpath.SDK.Tenant;
 
 namespace Stormpath.SDK.Impl.Client
 {
-    internal sealed class DefaultClient : IClient
+    internal sealed class DefaultClient : IClient, IClientSync
     {
         private readonly IClientApiKey apiKey;
         private readonly string baseUrl;
@@ -49,7 +51,8 @@ internal sealed class DefaultClient : IClient
         private readonly ILogger logger;
 
         private bool alreadyDisposed = false;
-        private string currentTenantHref;
+
+        private ITenant tenant;
 
         public DefaultClient(
             IClientApiKey apiKey,
@@ -84,7 +87,9 @@ public DefaultClient(
 
         private IClient AsInterface => this;
 
-        private string CurrentTenantHref => this.currentTenantHref.Nullable() ?? "tenants/current";
+        private IClientSync AsSyncInterface => this;
+
+        private string CurrentTenantHref => this.tenant?.Href.Nullable() ?? "tenants/current";
 
         internal IClientApiKey ApiKey => this.apiKey;
 
@@ -100,68 +105,112 @@ public DefaultClient(
 
         async Task<ITenant> IClient.GetCurrentTenantAsync(CancellationToken cancellationToken)
         {
-            var tenant = await this.dataStore
+            this.tenant = await this.dataStore
                 .GetResourceAsync<ITenant>(this.CurrentTenantHref, cancellationToken)
                 .ConfigureAwait(false);
 
-            cancellationToken.ThrowIfCancellationRequested();
-            this.currentTenantHref = tenant.Href;
+            return this.tenant;
+        }
+
+        ITenant IClientSync.GetCurrentTenant()
+        {
+            this.tenant = this.dataStore.GetResource<ITenant>(this.CurrentTenantHref);
 
-            return tenant;
+            return this.tenant;
         }
 
         Task<T> IDataStore.GetResourceAsync<T>(string href, CancellationToken cancellationToken)
+            => this.dataStore.GetResourceAsync<T>(href, cancellationToken);
+
+        T IDataStoreSync.GetResource<T>(string href)
+            => this.dataStore.GetResource<T>(href);
+
+        async Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication application, Action<ApplicationCreationOptionsBuilder> creationOptionsAction, CancellationToken cancellationToken)
         {
-            return this.dataStore.GetResourceAsync<T>(href, cancellationToken);
+            if (this.tenant == null)
+                await this.AsInterface.GetCurrentTenantAsync(cancellationToken).ConfigureAwait(false);
+
+            return await this.tenant.CreateApplicationAsync(application, creationOptionsAction, cancellationToken).ConfigureAwait(false);
         }
 
-        async Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication application, Action<ApplicationCreationOptionsBuilder> creationOptionsAction, CancellationToken cancellationToken)
+        IApplication ITenantActionsSync.CreateApplication(IApplication application, Action<ApplicationCreationOptionsBuilder> creationOptionsAction)
         {
-            var tenant = await this.AsInterface.GetCurrentTenantAsync().ConfigureAwait(false);
+            if (this.tenant == null)
+                this.AsSyncInterface.GetCurrentTenant();
 
-            return await tenant.CreateApplicationAsync(application, creationOptionsAction).ConfigureAwait(false);
+            return this.tenant.CreateApplication(application, creationOptionsAction);
         }
 
         async Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication application, IApplicationCreationOptions creationOptions, CancellationToken cancellationToken)
         {
-            var tenant = await this.AsInterface.GetCurrentTenantAsync().ConfigureAwait(false);
+            if (this.tenant == null)
+                await this.AsInterface.GetCurrentTenantAsync(cancellationToken).ConfigureAwait(false);
+
+            return await this.tenant.CreateApplicationAsync(application, creationOptions, cancellationToken).ConfigureAwait(false);
+        }
+
+        IApplication ITenantActionsSync.CreateApplication(IApplication application, IApplicationCreationOptions creationOptions)
+        {
+            if (this.tenant == null)
+                this.AsSyncInterface.GetCurrentTenant();
 
-            return await tenant.CreateApplicationAsync(application, creationOptions).ConfigureAwait(false);
+            return this.tenant.CreateApplication(application, creationOptions);
         }
 
         async Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication application, CancellationToken cancellationToken)
         {
-            var tenant = await this.AsInterface.GetCurrentTenantAsync().ConfigureAwait(false);
+            if (this.tenant == null)
+                await this.AsInterface.GetCurrentTenantAsync(cancellationToken).ConfigureAwait(false);
 
-            return await tenant.CreateApplicationAsync(application).ConfigureAwait(false);
+            return await this.tenant.CreateApplicationAsync(application, cancellationToken).ConfigureAwait(false);
+        }
+
+        IApplication ITenantActionsSync.CreateApplication(IApplication application)
+        {
+            if (this.tenant == null)
+                this.AsSyncInterface.GetCurrentTenant();
+
+            return this.tenant.CreateApplication(application);
         }
 
         async Task<IApplication> ITenantActions.CreateApplicationAsync(string name, bool createDirectory, CancellationToken cancellationToken)
         {
-            var tenant = await this.AsInterface.GetCurrentTenantAsync().ConfigureAwait(false);
+            if (this.tenant == null)
+                await this.AsInterface.GetCurrentTenantAsync(cancellationToken).ConfigureAwait(false);
+
+            return await this.tenant.CreateApplicationAsync(name, createDirectory, cancellationToken).ConfigureAwait(false);
+        }
+
+        IApplication ITenantActionsSync.CreateApplication(string name, bool createDirectory)
+        {
+            if (this.tenant == null)
+                this.AsSyncInterface.GetCurrentTenant();
 
-            return await tenant.CreateApplicationAsync(name, createDirectory).ConfigureAwait(false);
+            return this.tenant.CreateApplication(name, createDirectory);
         }
 
         IAsyncQueryable<IApplication> ITenantActions.GetApplications()
         {
-            var tenant = this.AsInterface.GetCurrentTenantAsync().Result;
+            if (this.tenant == null)
+                this.AsInterface.GetCurrentTenantAsync().GetAwaiter().GetResult();
 
-            return tenant.GetApplications();
+            return this.tenant.GetApplications();
         }
 
         IAsyncQueryable<IDirectory> ITenantActions.GetDirectories()
         {
-            var tenant = this.AsInterface.GetCurrentTenantAsync().Result;
+            if (this.tenant == null)
+                this.AsInterface.GetCurrentTenantAsync().GetAwaiter().GetResult();
 
-            return tenant.GetDirectories();
+            return this.tenant.GetDirectories();
         }
 
         IAsyncQueryable<IAccount> ITenantActions.GetAccounts()
         {
-            var tenant = this.AsInterface.GetCurrentTenantAsync().Result;
+            if (this.tenant == null)
+                this.AsInterface.GetCurrentTenantAsync().GetAwaiter().GetResult();
 
-            return tenant.GetAccounts();
+            return this.tenant.GetAccounts();
         }
 
         private void Dispose(bool disposing)
@@ -177,7 +226,6 @@ private void Dispose(bool disposing)
             }
         }
 
-        // This code added to correctly implement the disposable pattern.
         void IDisposable.Dispose()
         {
             // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClientBuilder.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClientBuilder.cs
index 47668e3b..66590b05 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClientBuilder.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Client/DefaultClientBuilder.cs
@@ -21,7 +21,6 @@
 using Stormpath.SDK.Cache;
 using Stormpath.SDK.Client;
 using Stormpath.SDK.Http;
-using Stormpath.SDK.Impl.Api;
 using Stormpath.SDK.Serialization;
 using Stormpath.SDK.Shared;
 
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Client/IClientSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Client/IClientSync.cs
new file mode 100644
index 00000000..01d810f5
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Client/IClientSync.cs
@@ -0,0 +1,32 @@
+// <copyright file="IClientSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Impl.DataStore;
+using Stormpath.SDK.Impl.Tenant;
+using Stormpath.SDK.Tenant;
+
+namespace Stormpath.SDK.Impl.Client
+{
+    internal interface IClientSync : ITenantActionsSync, IDataStoreSync
+    {
+        /// <summary>
+        /// Synchronously gets the sole <see cref="ITenant"/> associated to this <see cref="IClient"/>.
+        /// </summary>
+        /// <returns>The <see cref="ITenant"/> associated to this client.</returns>
+        ITenant GetCurrentTenant();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultDataStore.cs b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultDataStore.cs
index 4185b1ac..78e69751 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultDataStore.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultDataStore.cs
@@ -37,7 +37,7 @@
 
 namespace Stormpath.SDK.Impl.DataStore
 {
-    internal sealed class DefaultDataStore : IInternalDataStore, IDisposable
+    internal sealed class DefaultDataStore : IInternalDataStore, IInternalDataStoreSync, IDisposable
     {
         private readonly ILogger logger;
 
@@ -56,6 +56,8 @@ internal sealed class DefaultDataStore : IInternalDataStore, IDisposable
 
         private IInternalDataStore AsInterface => this;
 
+        private IInternalDataStoreSync AsSyncInterface => this;
+
         IRequestExecutor IInternalDataStore.RequestExecutor => this.requestExecutor;
 
         string IInternalDataStore.BaseUrl => this.baseUrl;
@@ -198,7 +200,7 @@ async Task<T> IDataStore.GetResourceAsync<T>(string resourcePath, CancellationTo
             return this.resourceFactory.Create<T>(result.Body);
         }
 
-        T IInternalDataStore.GetResource<T>(string resourcePath)
+        T IDataStoreSync.GetResource<T>(string resourcePath)
         {
             var canonicalUri = new CanonicalUri(this.uriQualifier.EnsureFullyQualified(resourcePath));
             this.logger.Trace($"Synchronously getting resource type {typeof(T).Name} from: {canonicalUri.ToString()}", "DefaultDataStore.GetResource<T>");
@@ -227,11 +229,11 @@ Task<CollectionResponsePage<T>> IInternalDataStore.GetCollectionAsync<T>(string
             return this.AsInterface.GetResourceAsync<CollectionResponsePage<T>>(href, cancellationToken);
         }
 
-        CollectionResponsePage<T> IInternalDataStore.GetCollection<T>(string href)
+        CollectionResponsePage<T> IInternalDataStoreSync.GetCollection<T>(string href)
         {
             this.logger.Trace($"Synchronously getting collection page of type {typeof(T).Name} from: {href}", "DefaultDataStore.GetCollection<T>");
 
-            return this.AsInterface.GetResource<CollectionResponsePage<T>>(href);
+            return this.AsSyncInterface.GetResource<CollectionResponsePage<T>>(href);
         }
 
         Task<T> IInternalDataStore.CreateAsync<T>(string parentHref, T resource, CancellationToken cancellationToken)
@@ -243,9 +245,9 @@ Task<T> IInternalDataStore.CreateAsync<T>(string parentHref, T resource, Cancell
                 cancellationToken: cancellationToken);
         }
 
-        T IInternalDataStore.Create<T>(string parentHref, T resource)
+        T IInternalDataStoreSync.Create<T>(string parentHref, T resource)
         {
-            return this.AsInterface.Create<T, T>(
+            return this.AsSyncInterface.Create<T, T>(
                 parentHref,
                 resource,
                 options: null);
@@ -260,9 +262,9 @@ Task<T> IInternalDataStore.CreateAsync<T>(string parentHref, T resource, ICreati
                 cancellationToken: cancellationToken);
         }
 
-        T IInternalDataStore.Create<T>(string parentHref, T resource, ICreationOptions options)
+        T IInternalDataStoreSync.Create<T>(string parentHref, T resource, ICreationOptions options)
         {
-            return this.AsInterface.Create<T, T>(
+            return this.AsSyncInterface.Create<T, T>(
                 parentHref,
                 resource,
                 options: options);
@@ -277,9 +279,9 @@ Task<TReturned> IInternalDataStore.CreateAsync<T, TReturned>(string parentHref,
                 cancellationToken: cancellationToken);
         }
 
-        TReturned IInternalDataStore.Create<T, TReturned>(string parentHref, T resource)
+        TReturned IInternalDataStoreSync.Create<T, TReturned>(string parentHref, T resource)
         {
-            return this.AsInterface.Create<T, TReturned>(
+            return this.AsSyncInterface.Create<T, TReturned>(
                 parentHref,
                 resource,
                 options: null);
@@ -294,7 +296,7 @@ Task<TReturned> IInternalDataStore.CreateAsync<T, TReturned>(string parentHref,
                 cancellationToken: cancellationToken);
         }
 
-        TReturned IInternalDataStore.Create<T, TReturned>(string parentHref, T resource, ICreationOptions options)
+        TReturned IInternalDataStoreSync.Create<T, TReturned>(string parentHref, T resource, ICreationOptions options)
         {
             return this.SaveCore<T, TReturned>(
                 resource, parentHref,
@@ -316,7 +318,7 @@ Task<T> IInternalDataStore.SaveAsync<T>(T resource, CancellationToken cancellati
                 cancellationToken: cancellationToken);
         }
 
-        T IInternalDataStore.Save<T>(T resource)
+        T IInternalDataStoreSync.Save<T>(T resource)
         {
             var href = resource?.Href;
             if (string.IsNullOrEmpty(href))
@@ -334,7 +336,7 @@ Task<bool> IInternalDataStore.DeleteAsync<T>(T resource, CancellationToken cance
             return this.DeleteCoreAsync(resource, cancellationToken);
         }
 
-        bool IInternalDataStore.Delete<T>(T resource)
+        bool IInternalDataStoreSync.Delete<T>(T resource)
         {
             return this.DeleteCore(resource);
         }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultResourceFactory.cs b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultResourceFactory.cs
index 6debd64f..beb86fee 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultResourceFactory.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/DefaultResourceFactory.cs
@@ -35,19 +35,13 @@ public DefaultResourceFactory(IInternalDataStore dataStore)
         private IResourceFactory AsInterface => this;
 
         T IResourceFactory.Create<T>()
-        {
-            return (T)this.AsInterface.Create(typeof(T), null);
-        }
+            => (T)this.AsInterface.Create(typeof(T), null);
 
         object IResourceFactory.Create(Type type)
-        {
-            return this.AsInterface.Create(type, null);
-        }
+            => this.AsInterface.Create(type, null);
 
         T IResourceFactory.Create<T>(IDictionary<string, object> properties)
-        {
-            return (T)this.AsInterface.Create(typeof(T), properties);
-        }
+            => (T)this.AsInterface.Create(typeof(T), properties);
 
         object IResourceFactory.Create(Type type, IDictionary<string, object> properties)
         {
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IDataStoreSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IDataStoreSync.cs
new file mode 100644
index 00000000..531064ba
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IDataStoreSync.cs
@@ -0,0 +1,31 @@
+// <copyright file="IDataStoreSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+namespace Stormpath.SDK.Impl.DataStore
+{
+    internal interface IDataStoreSync
+    {
+        /// <summary>
+        /// Synchronously retrieves the resource at the specified <paramref name="href"/> URL synchronously and returns the resource
+        /// as an instance of the specified class <typeparamref name="T"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the returned <see cref="SDK.Resource.IResource"/> value.</typeparam>
+        /// <param name="href">The resource URL of the resource to retrieve.</param>
+        /// <returns>An instance of the specified class based on data returned from the specified <paramref name="href"/> URL.</returns>
+        T GetResource<T>(string href);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IInternalDataStore.cs b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IInternalDataStore.cs
index 762b0608..3e68bda8 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IInternalDataStore.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IInternalDataStore.cs
@@ -52,30 +52,5 @@ Task<T> SaveAsync<T>(T resource, CancellationToken cancellationToken)
 
         Task<bool> DeleteAsync<T>(T resource, CancellationToken cancellationToken)
             where T : IResource, IDeletable;
-
-        // Synchronous path
-        T GetResource<T>(string resourcePath);
-
-        CollectionResponsePage<T> GetCollection<T>(string href);
-
-        T Create<T>(string parentHref, T resource)
-            where T : IResource;
-
-        T Create<T>(string parentHref, T resource, ICreationOptions options)
-            where T : IResource;
-
-        TReturned Create<T, TReturned>(string parentHref, T resource)
-            where T : IResource
-            where TReturned : IResource;
-
-        TReturned Create<T, TReturned>(string parentHref, T resource, ICreationOptions options)
-            where T : IResource
-            where TReturned : IResource;
-
-        T Save<T>(T resource)
-            where T : IResource, ISaveable<T>;
-
-        bool Delete<T>(T resource)
-            where T : IResource, IDeletable;
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IInternalDataStoreSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IInternalDataStoreSync.cs
new file mode 100644
index 00000000..6a61ff0f
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/DataStore/IInternalDataStoreSync.cs
@@ -0,0 +1,47 @@
+// <copyright file="IInternalDataStoreSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Impl.Resource;
+using Stormpath.SDK.Resource;
+
+namespace Stormpath.SDK.Impl.DataStore
+{
+    internal interface IInternalDataStoreSync : IDataStoreSync
+    {
+        CollectionResponsePage<T> GetCollection<T>(string href);
+
+        T Create<T>(string parentHref, T resource)
+            where T : IResource;
+
+        T Create<T>(string parentHref, T resource, ICreationOptions options)
+            where T : IResource;
+
+        TReturned Create<T, TReturned>(string parentHref, T resource)
+            where T : IResource
+            where TReturned : IResource;
+
+        TReturned Create<T, TReturned>(string parentHref, T resource, ICreationOptions options)
+            where T : IResource
+            where TReturned : IResource;
+
+        T Save<T>(T resource)
+            where T : IResource, ISaveable<T>;
+
+        bool Delete<T>(T resource)
+            where T : IResource, IDeletable;
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Directory/DefaultDirectory.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Directory/DefaultDirectory.cs
index 0992496e..d37a2414 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Directory/DefaultDirectory.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Directory/DefaultDirectory.cs
@@ -74,13 +74,9 @@ public DefaultDirectory(IInternalDataStore dataStore, IDictionary<string, object
         internal LinkProperty Tenant => this.GetLinkProperty(TenantPropertyName);
 
         IAsyncQueryable<IAccount> IDirectory.GetAccounts()
-        {
-            return new CollectionResourceQueryable<IAccount>(this.Accounts.Href, this.GetInternalDataStore());
-        }
+            => new CollectionResourceQueryable<IAccount>(this.Accounts.Href, this.GetInternalDataStore());
 
         Task<bool> IDeletable.DeleteAsync(CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().DeleteAsync(this, cancellationToken);
-        }
+            => this.GetInternalDataStore().DeleteAsync(this, cancellationToken);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/DateExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/DateExtensions.cs
index 010a42d9..59a93d53 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/DateExtensions.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/DateExtensions.cs
@@ -28,9 +28,6 @@ internal static class DateExtensions
         /// </summary>
         /// <param name="date">The date to convert.</param>
         /// <returns>Milliseconds since Unix epoch.</returns>
-        public static long ToUnixTimestamp(this DateTime date)
-        {
-            return (long)(date.ToUniversalTime() - UnixEpoch).TotalMilliseconds;
-        }
+        public static long ToUnixTimestamp(this DateTime date) => (long)(date.ToUniversalTime() - UnixEpoch).TotalMilliseconds;
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/UriExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/UriExtensions.cs
index 9bd535da..956a3b2e 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/UriExtensions.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Extensions/UriExtensions.cs
@@ -21,9 +21,6 @@ namespace Stormpath.SDK.Impl.Extensions
 {
     internal static class UriExtensions
     {
-        public static Uri WithoutQueryAndFragment(this Uri source)
-        {
-            return new Uri(source.GetLeftPart(UriPartial.Path), UriKind.Absolute);
-        }
+        public static Uri WithoutQueryAndFragment(this Uri source) => new Uri(source.GetLeftPart(UriPartial.Path), UriKind.Absolute);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Http/UserAgentBuilder.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Http/UserAgentBuilder.cs
index 231633ad..b8ebcd3f 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Http/UserAgentBuilder.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Http/UserAgentBuilder.cs
@@ -38,15 +38,9 @@ private static string GetSdkUserAgentImpl()
             .Trim();
         }
 
-        public static string GetUserAgent()
-        {
-            return SdkUserAgentValue.Value;
-        }
+        public static string GetUserAgent() => SdkUserAgentValue.Value;
 
-        private static IEnumerable<string> GetInstalledIntegrationsInfo()
-        {
-            return Enumerable.Empty<string>();
-        }
+        private static IEnumerable<string> GetInstalledIntegrationsInfo() => Enumerable.Empty<string>();
 
         private static string GetSdkInfo()
         {
@@ -73,9 +67,6 @@ private static string GetRuntimeInfo()
             return runtimeInfo;
         }
 
-        private static string GetPlatformInfo()
-        {
-            return $"{PlatformHelper.GetOSName()}/{PlatformHelper.GetOSVersion()}";
-        }
+        private static string GetPlatformInfo() => $"{PlatformHelper.GetOSName()}/{PlatformHelper.GetOSVersion()}";
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryExecutor.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryExecutor.cs
index b3298d51..6f94b30e 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryExecutor.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryExecutor.cs
@@ -20,6 +20,7 @@
 using System.Linq;
 using System.Reflection;
 using Remotion.Linq;
+using Remotion.Linq.Clauses.ResultOperators;
 using Stormpath.SDK.Impl.DataStore;
 using Stormpath.SDK.Impl.Linq.RequestModel;
 using Stormpath.SDK.Impl.Resource;
@@ -38,42 +39,70 @@ internal CollectionResourceQueryExecutor(string href, IInternalDataStore dataSto
 
         public IInternalDataStore DataStore { get; private set; }
 
-        public IEnumerable<T> ExecuteCollection<T>(CollectionResourceRequestModel requestModel)
+        public IEnumerable<T> ExecuteCollection<T>(QueryModel queryModel)
         {
-            var asyncCollection = new CollectionResourceQueryable<T>(this.Href, this.DataStore, requestModel);
-            var adapter = new Sync.SyncCollectionEnumeratorAdapter<T>(asyncCollection);
+            var model = GenerateRequestModel(queryModel);
 
-            return adapter;
+            return this.ExecuteCollection<T>(model);
         }
 
-        public IEnumerable<T> ExecuteCollection<T>(QueryModel queryModel)
+        public IEnumerable<T> ExecuteCollection<T>(CollectionResourceRequestModel requestModel)
         {
-            var model = GenerateRequestModel(queryModel);
+            return this.ExecuteCollection(requestModel, typeof(T)) as IEnumerable<T>;
+        }
+
+        private IEnumerable<object> ExecuteCollection(CollectionResourceRequestModel requestModel, Type collectionType)
+        {
+            var collectionResourceQueryableType = typeof(CollectionResourceQueryable<>).MakeGenericType(collectionType);
+            var syncAdapterType = typeof(Sync.SyncCollectionEnumeratorAdapter<>).MakeGenericType(collectionType);
 
-            return ExecuteCollection<T>(model);
+            var asyncCollection = Activator.CreateInstance(collectionResourceQueryableType, new object[] { this.Href, this.DataStore, requestModel });
+            var adapter = Activator.CreateInstance(syncAdapterType, new object[] { asyncCollection, null });
+
+            return adapter as IEnumerable<object>;
         }
 
         public T ExecuteScalar<T>(QueryModel queryModel)
         {
-            throw new NotSupportedException("Synchronous LINQ execution is not currently supported. Use async methods.");
+            var model = GenerateRequestModel(queryModel);
+
+            if (queryModel.ResultOperators.FirstOrDefault() is AnyResultOperator)
+                return (T)((object)this.ExecuteCollection(model, model.CollectionType).Any());
+
+            if (queryModel.ResultOperators.FirstOrDefault() is CountResultOperator ||
+                queryModel.ResultOperators.FirstOrDefault() is LongCountResultOperator)
+            {
+                var iterator = this.ExecuteCollection(model, model.CollectionType);
+                var collection = iterator
+                    .GetType()
+                    .GetField("collection", BindingFlags.NonPublic | BindingFlags.Instance)
+                    .GetValue(iterator);
+                var collectionType = collection.GetType();
+
+                var moveNextResult = (bool)collectionType
+                    .GetMethod("MoveNext", BindingFlags.NonPublic | BindingFlags.Instance)
+                    .Invoke(collection, null);
+
+                var count = collectionType
+                    .GetProperty("Size", BindingFlags.NonPublic | BindingFlags.Instance)
+                    .GetValue(collection);
+
+                if (typeof(T) == typeof(int))
+                    return (T)(object)Convert.ToInt32(count);
+                else
+                    return (T)count;
+            }
+
+            throw new NotSupportedException("One or more scalar result operators are unsupported.");
         }
 
         public T ExecuteSingle<T>(QueryModel queryModel, bool returnDefaultWhenEmpty)
         {
-            var model = GenerateRequestModel(queryModel);
-
             return returnDefaultWhenEmpty
                 ? ExecuteCollection<T>(queryModel).SingleOrDefault()
                 : ExecuteCollection<T>(queryModel).Single();
         }
 
-        private static MethodInfo GetGenericExecuteCollectionMethod(Type innerType)
-        {
-            var method = typeof(CollectionResourceQueryExecutor).GetMethod(nameof(ExecuteCollection), new Type[] { typeof(CollectionResourceRequestModel) });
-            var generic = method.MakeGenericMethod(innerType);
-            return generic;
-        }
-
         private static CollectionResourceRequestModel GenerateRequestModel(QueryModel queryModel)
         {
             return CollectionResourceQueryModelVisitor.GenerateRequestModel(queryModel);
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryModelVisitor.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryModelVisitor.cs
index 4906340d..286dd5ec 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryModelVisitor.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceQueryModelVisitor.cs
@@ -17,6 +17,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Linq.Expressions;
 using Remotion.Linq;
 using Remotion.Linq.Clauses;
@@ -32,9 +34,11 @@ internal sealed class CollectionResourceQueryModelVisitor : QueryModelVisitorBas
     {
         private static readonly int DefaultApiPageLimit = 100;
 
-        private static readonly List<Type> SupportedResultOperators = new List<Type>()
+        private static readonly List<Type> SupportedOperators = new List<Type>()
         {
             typeof(AnyResultOperator),
+            typeof(CountResultOperator),
+            typeof(LongCountResultOperator),
             typeof(FirstResultOperator),
             typeof(SingleResultOperator),
             typeof(TakeResultOperator),
@@ -51,9 +55,9 @@ public static CollectionResourceRequestModel GenerateRequestModel(QueryModel que
             return visitor.ParsedModel;
         }
 
-        private static bool IsSupportedResultOperator(ResultOperatorBase resultOperator)
+        private static bool IsSupportedOperator(ResultOperatorBase resultOperator)
         {
-            return SupportedResultOperators.Contains(resultOperator.GetType());
+            return SupportedOperators.Contains(resultOperator.GetType());
         }
 
         public override void VisitMainFromClause(MainFromClause fromClause, QueryModel queryModel)
@@ -62,24 +66,41 @@ public override void VisitMainFromClause(MainFromClause fromClause, QueryModel q
             // (see ExecuteScalar in CollectionResourceQueryExecutor for why we need this)
             this.ParsedModel.CollectionType = fromClause.ItemType;
 
+            var subQuery = fromClause.FromExpression as SubQueryExpression;
+
+            // Some expression trees will wrap earlier clauses into a FROM, and then
+            // tack on stuff after it. We need to unwrap the lower level.
+            bool anySubQueryResultOperators = subQuery?.QueryModel?.ResultOperators.Any() ?? false;
+            if (anySubQueryResultOperators)
+            {
+                this.VisitResultOperators(subQuery.QueryModel.ResultOperators, subQuery.QueryModel);
+            }
+
+            bool anySubQueryBodyClauses = subQuery?.QueryModel?.BodyClauses.Any() ?? false;
+            if (anySubQueryBodyClauses)
+            {
+                this.VisitBodyClauses(subQuery.QueryModel.BodyClauses, subQuery.QueryModel);
+            }
+
             base.VisitMainFromClause(fromClause, queryModel);
         }
 
         public override void VisitResultOperator(ResultOperatorBase resultOperator, QueryModel queryModel, int index)
         {
-            if (!IsSupportedResultOperator(resultOperator))
+            if (!IsSupportedOperator(resultOperator))
                 throw new NotSupportedException("One or more LINQ operators are not supported.");
 
-            bool isScalar =
+            bool shouldReturnOnlyOne =
                 resultOperator is AnyResultOperator ||
                 resultOperator is CountResultOperator ||
-                resultOperator is FirstResultOperator ||
-                resultOperator is SingleResultOperator;
-            if (isScalar)
+                resultOperator is LongCountResultOperator ||
+                resultOperator is FirstResultOperator;
+            if (shouldReturnOnlyOne)
             {
                 this.ParsedModel.Limit = 1;
                 this.ParsedModel.ExecutionPlan.MaxItems = 1;
-                return;
+
+                return; // done
             }
 
             if (this.HandleTakeResultOperator(resultOperator))
@@ -105,14 +126,22 @@ private bool HandleTakeResultOperator(ResultOperatorBase resultOperator)
                 throw new NotSupportedException("Unsupported expression in Take clause.");
 
             var value = (int)expression.Value;
-            if (value < 1)
+            if (value < 0)
                 throw new ArgumentOutOfRangeException("Take must be greater than zero.");
 
-            this.ParsedModel.ExecutionPlan.MaxItems = value;
-            this.ParsedModel.Limit = value;
+            if (value == 0)
+            {
+                this.ParsedModel.ExecutionPlan.MaxItems = null;
+                this.ParsedModel.Limit = null;
+            }
+            else
+            {
+                this.ParsedModel.ExecutionPlan.MaxItems = value;
+                this.ParsedModel.Limit = value;
 
-            if (value > DefaultApiPageLimit)
-                this.ParsedModel.Limit = DefaultApiPageLimit;
+                if (value > DefaultApiPageLimit)
+                    this.ParsedModel.Limit = DefaultApiPageLimit;
+            }
 
             return true;
         }
@@ -128,10 +157,12 @@ private bool HandleSkipResultOperator(ResultOperatorBase resultOperator)
                 throw new NotSupportedException("Unsupported expression in Skip clause.");
 
             var value = (int)expression.Value;
-            if (value < 1)
+            if (value < 0)
                 throw new ArgumentOutOfRangeException("Skip must be greater than zero.");
 
-            this.ParsedModel.Offset = value;
+            this.ParsedModel.Offset = value == 0
+                ? (int?)null
+                : value;
 
             return true;
         }
@@ -177,8 +208,6 @@ public override void VisitWhereClause(WhereClause whereClause, QueryModel queryM
             // Handle simple cases
             if (this.HandleWhereFilterExtensionMethod(whereClause))
                 return; // done
-            if (this.HandleWhereWithinDateExtensionMethod(whereClause))
-                return; // done
 
             this.ParsedModel.AddAttributeTerms(
                 CollectionResourceWhereExpressionVisitor.GenerateModels(whereClause.Predicate));
@@ -192,48 +221,26 @@ private bool HandleWhereFilterExtensionMethod(WhereClause whereClause)
             if (filterClause == null)
                 return false;
 
+            if (!string.IsNullOrEmpty(this.ParsedModel.FilterTerm))
+                throw new NotSupportedException("Multiple Filter terms are not supported");
+
             this.ParsedModel.FilterTerm = filterClause.Term;
             return true;
         }
 
-        private bool HandleWhereWithinDateExtensionMethod(WhereClause whereClause)
+        public override void VisitOrdering(Ordering ordering, QueryModel queryModel, OrderByClause orderByClause, int index)
         {
-            var methodCall = whereClause.Predicate as MethodCallExpression;
-            bool isWithinMethodCall = methodCall?.Method.DeclaringType == typeof(WithinExpressionExtensions);
-            if (!isWithinMethodCall)
-                return false;
+            // If this is idempotent ordering term like .OrderBy(x => x), ignore it
+            bool isInternalOrdering = queryModel.MainFromClause ==
+                (ordering.Expression as QuerySourceReferenceExpression)?.ReferencedQuerySource as MainFromClause;
 
-            var fieldName = string.Empty;
-            var methodCallMember = methodCall.Arguments[0] as MemberExpression;
-            bool validField = methodCallMember != null && DatetimeFieldNameTranslator.TryGetValue(methodCallMember.Member.Name, out fieldName);
-            if (!validField)
-                throw new NotSupportedException("Within must be used on a supported datetime field.");
-
-            var numberOfConstantArgs = methodCall.Arguments.Count - 1;
-            var yearArg = (int)(methodCall.Arguments[1] as ConstantExpression).Value;
-            int? monthArg = null,
-                dayArg = null,
-                hourArg = null,
-                minuteArg = null,
-                secondArg = null;
-
-            if (methodCall.Arguments.Count >= 3)
-                monthArg = (methodCall.Arguments?[2] as ConstantExpression)?.Value as int?;
-            if (methodCall.Arguments.Count >= 4)
-                dayArg = (methodCall.Arguments?[3] as ConstantExpression)?.Value as int?;
-            if (methodCall.Arguments.Count >= 5)
-                hourArg = (methodCall.Arguments?[4] as ConstantExpression)?.Value as int?;
-            if (methodCall.Arguments.Count >= 6)
-                minuteArg = (methodCall.Arguments?[5] as ConstantExpression)?.Value as int?;
-            if (methodCall.Arguments.Count == 7)
-                secondArg = (methodCall.Arguments?[6] as ConstantExpression)?.Value as int?;
-
-            this.ParsedModel.AddAttributeTerm(new DatetimeShorthandAttributeTermModel(fieldName, yearArg, monthArg, dayArg, hourArg, minuteArg, secondArg));
+            if (isInternalOrdering)
+                return;
 
-            return true;
+            this.HandleOrderByClause(ordering);
         }
 
-        public override void VisitOrdering(Ordering ordering, QueryModel queryModel, OrderByClause orderByClause, int index)
+        public void HandleOrderByClause(Ordering ordering)
         {
             var memberAccessor = ordering.Expression as MemberExpression;
             if (memberAccessor == null)
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceRequestModelCompiler.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceRequestModelCompiler.cs
index 44c1d873..c63a035d 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceRequestModelCompiler.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceRequestModelCompiler.cs
@@ -65,6 +65,9 @@ public static List<string> GetArguments(CollectionResourceRequestModel model)
 
                 foreach (var term in aggregatedTerms)
                 {
+                    if (arguments.ContainsKey(term.Field))
+                        throw new NotSupportedException($"Multiple date constraints on field {term.Field} are not supported");
+
                     var datetimeAttribute = new StringBuilder();
 
                     if (!term.Start.HasValue)
@@ -98,6 +101,9 @@ public static List<string> GetArguments(CollectionResourceRequestModel model)
             {
                 foreach (var term in model.DatetimeShorthandAttributeTerms)
                 {
+                    if (arguments.ContainsKey(term.Field))
+                        throw new NotSupportedException($"Multiple date constraints on field {term.Field} are not supported");
+
                     var shorthandAttribute = new StringBuilder();
 
                     shorthandAttribute.Append(term.Year);
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceWhereExpressionVisitor.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceWhereExpressionVisitor.cs
index 70d66a4c..a93ea9d4 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceWhereExpressionVisitor.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/CollectionResourceWhereExpressionVisitor.cs
@@ -46,7 +46,7 @@ public override Expression VisitExpression(Expression expression)
             if (this.inProgress.IsStringTermComplete())
             {
                 this.GeneratedModels.Add(new StringAttributeTermModel(this.inProgress.Field, this.inProgress.StringValue, this.inProgress.StringMatchType.Value));
-                this.inProgress = new WhereAttributeTermInProgressModel();
+                this.inProgress.ResetStringTerm();
             }
 
             if (this.inProgress.IsDateTermComplete())
@@ -68,7 +68,13 @@ public override Expression VisitExpression(Expression expression)
                 }
 
                 this.GeneratedModels.Add(model);
-                this.inProgress = new WhereAttributeTermInProgressModel();
+                this.inProgress.ResetDateTerm();
+            }
+
+            if (this.inProgress.IsShorthandDateTermComplete())
+            {
+                this.GeneratedModels.Add(this.inProgress.ShorthandModel);
+                this.inProgress.ResetShorthandDateTerm();
             }
 
             return visited;
@@ -118,6 +124,10 @@ private bool IsSupportedBinaryComparisonOperator(ExpressionType type)
 
         protected override Expression VisitMethodCallExpression(MethodCallExpression expression)
         {
+            bool isWithinMethodCall = expression.Method.DeclaringType == typeof(WithinExpressionExtensions);
+            if (isWithinMethodCall)
+                return this.HandleWithinDateExtensionMethod(expression);
+
             StringAttributeMatchingType matchingType;
             bool isAChainedHelperMethodCall = StringHelperMethodNameTranslator.TryGetValue(expression.Method.Name, out matchingType);
             if (isAChainedHelperMethodCall)
@@ -193,6 +203,38 @@ protected override Exception CreateUnhandledItemException<T>(T unhandledItem, st
             return new NotSupportedException(message);
         }
 
+        private Expression HandleWithinDateExtensionMethod(MethodCallExpression methodCall)
+        {
+            var fieldName = string.Empty;
+            var methodCallMember = methodCall.Arguments[0] as MemberExpression;
+            bool validField = methodCallMember != null && DatetimeFieldNameTranslator.TryGetValue(methodCallMember.Member.Name, out fieldName);
+            if (!validField)
+                throw new NotSupportedException("Within must be used on a supported datetime field.");
+
+            var numberOfConstantArgs = methodCall.Arguments.Count - 1;
+            var yearArg = (int)(methodCall.Arguments[1] as ConstantExpression).Value;
+            int? monthArg = null,
+                dayArg = null,
+                hourArg = null,
+                minuteArg = null,
+                secondArg = null;
+
+            if (methodCall.Arguments.Count >= 3)
+                monthArg = (methodCall.Arguments?[2] as ConstantExpression)?.Value as int?;
+            if (methodCall.Arguments.Count >= 4)
+                dayArg = (methodCall.Arguments?[3] as ConstantExpression)?.Value as int?;
+            if (methodCall.Arguments.Count >= 5)
+                hourArg = (methodCall.Arguments?[4] as ConstantExpression)?.Value as int?;
+            if (methodCall.Arguments.Count >= 6)
+                minuteArg = (methodCall.Arguments?[5] as ConstantExpression)?.Value as int?;
+            if (methodCall.Arguments.Count == 7)
+                secondArg = (methodCall.Arguments?[6] as ConstantExpression)?.Value as int?;
+
+            this.inProgress.ShorthandModel = new DatetimeShorthandAttributeTermModel(fieldName, yearArg, monthArg, dayArg, hourArg, minuteArg, secondArg);
+
+            return methodCall;
+        }
+
         private static string FormatUnhandledItem<T>(T unhandledItem)
         {
             var itemAsExpression = unhandledItem as Expression;
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/LinqHelper.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/LinqHelper.cs
index fc9518bd..f373ea0c 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/LinqHelper.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/LinqHelper.cs
@@ -23,19 +23,10 @@ namespace Stormpath.SDK.Impl.Linq
 {
     internal static class LinqHelper
     {
-        public static Expression MethodCall(MethodInfo method, params Expression[] expressions)
-        {
-            return Expression.Call(null, method, expressions);
-        }
+        public static Expression MethodCall(MethodInfo method, params Expression[] expressions) => Expression.Call(null, method, expressions);
 
-        public static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> func, T1 ignored)
-        {
-            return func.Method;
-        }
+        public static MethodInfo GetMethodInfo<T1, T2>(Func<T1, T2> func, T1 ignored) => func.Method;
 
-        public static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> func, T1 ignored1, T2 ignored2)
-        {
-            return func.Method;
-        }
+        public static MethodInfo GetMethodInfo<T1, T2, T3>(Func<T1, T2, T3> func, T1 ignored1, T2 ignored2) => func.Method;
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Parsing/FilterExpressionNode.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Parsing/FilterExpressionNode.cs
index 55fe785d..ffdab239 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Parsing/FilterExpressionNode.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Parsing/FilterExpressionNode.cs
@@ -15,7 +15,6 @@
 // limitations under the License.
 // </remarks>
 
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using Remotion.Linq;
@@ -37,9 +36,11 @@ public static MethodInfo[] SupportedMethods
         {
             get
             {
-                return typeof(AsyncQueryableFilterExtensions)
-                    .GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static)
-                    .ToArray();
+                return new MethodInfo[]
+                {
+                    typeof(AsyncQueryableFilterExtensions).GetMethod("Filter"),
+                    typeof(SDK.Sync.FilterExtensions).GetMethod("Filter")
+                };
             }
         }
 
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/RequestModel/WhereAttributeTermInProgressModel.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/RequestModel/WhereAttributeTermInProgressModel.cs
index 63f95657..edc76a20 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/RequestModel/WhereAttributeTermInProgressModel.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/RequestModel/WhereAttributeTermInProgressModel.cs
@@ -37,6 +37,9 @@ internal sealed class WhereAttributeTermInProgressModel
 
         public bool? DateOrEqual { get; set; }
 
+        // Used when parsing a Within extension expression
+        public DatetimeShorthandAttributeTermModel ShorthandModel { get; set; }
+
         public bool IsStringTermComplete()
         {
             return this.TargetType == typeof(StringAttributeTermModel) &&
@@ -44,6 +47,13 @@ public bool IsStringTermComplete()
                 this.StringMatchType.HasValue;
         }
 
+        public void ResetStringTerm()
+        {
+            this.TargetType = null;
+            this.StringValue = null;
+            this.StringMatchType = null;
+        }
+
         public bool IsDateTermComplete()
         {
             return this.TargetType == typeof(DatetimeAttributeTermModel) &&
@@ -51,5 +61,23 @@ public bool IsDateTermComplete()
                 this.DateGreaterThan.HasValue &&
                 this.DateOrEqual.HasValue;
         }
+
+        public void ResetDateTerm()
+        {
+            this.TargetType = null;
+            this.DateValue = null;
+            this.DateGreaterThan = null;
+            this.DateOrEqual = null;
+        }
+
+        public bool IsShorthandDateTermComplete()
+        {
+            return this.ShorthandModel != null;
+        }
+
+        public void ResetShorthandDateTerm()
+        {
+            this.ShorthandModel = null;
+        }
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Sync/SyncCollectionEnumeratorAdapter.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Sync/SyncCollectionEnumeratorAdapter.cs
index 55a6848b..549615f7 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Sync/SyncCollectionEnumeratorAdapter.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Linq/Sync/SyncCollectionEnumeratorAdapter.cs
@@ -38,6 +38,8 @@ public IEnumerator<T> GetEnumerator()
         {
             while (this.collection.MoveNext())
             {
+                this.cancellationToken.ThrowIfCancellationRequested();
+
                 foreach (var item in (this.collection as IAsyncQueryable<T>).CurrentPage)
                 {
                     yield return item;
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Resource/AbstractResource.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/AbstractResource.cs
index 13ce4305..684f044d 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Resource/AbstractResource.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/AbstractResource.cs
@@ -27,7 +27,8 @@ internal abstract class AbstractResource : IResource
     {
         private static readonly string HrefPropertyName = "href";
 
-        private readonly IInternalDataStore dataStore;
+        internal readonly IInternalDataStore InternalDataStore;
+        internal readonly IInternalDataStoreSync InternalDataStoreSync;
         private readonly ConcurrentDictionary<string, object> properties;
         private readonly ConcurrentDictionary<string, object> dirtyProperties;
 
@@ -40,7 +41,8 @@ public AbstractResource(IInternalDataStore dataStore)
 
         public AbstractResource(IInternalDataStore dataStore, IDictionary<string, object> properties)
         {
-            this.dataStore = dataStore;
+            this.InternalDataStore = dataStore;
+            this.InternalDataStoreSync = dataStore as IInternalDataStoreSync;
 
             this.properties = new ConcurrentDictionary<string, object>(properties);
             this.dirtyProperties = new ConcurrentDictionary<string, object>();
@@ -49,7 +51,9 @@ public AbstractResource(IInternalDataStore dataStore, IDictionary<string, object
 
         string IResource.Href => GetProperty<string>(HrefPropertyName);
 
-        protected IInternalDataStore GetInternalDataStore() => this.dataStore;
+        protected IInternalDataStore GetInternalDataStore() => this.InternalDataStore;
+
+        protected IInternalDataStoreSync GetInternalDataStoreSync() => this.InternalDataStoreSync;
 
         internal bool IsDirty => this.isDirty;
 
@@ -68,9 +72,7 @@ public List<string> GetUpdatedPropertyNames()
         }
 
         public LinkProperty GetLinkProperty(string name)
-        {
-            return GetProperty<LinkProperty>(name) ?? new LinkProperty(null);
-        }
+            => GetProperty<LinkProperty>(name) ?? new LinkProperty(null);
 
         public T GetProperty<T>(string name)
         {
@@ -93,9 +95,7 @@ public object GetProperty(string name)
         }
 
         public void SetProperty<T>(string name, T value)
-        {
-            this.SetProperty(name, (object)value);
-        }
+            => this.SetProperty(name, (object)value);
 
         public void SetProperty(string name, object value)
         {
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Resource/CollectionResourceQueryable.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/CollectionResourceQueryable.cs
index 4eaa4e94..dc70d8a9 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Resource/CollectionResourceQueryable.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/CollectionResourceQueryable.cs
@@ -38,6 +38,8 @@ internal sealed class CollectionResourceQueryable<T> : QueryableBase<T>, IOrdere
 
         private readonly IInternalDataStore dataStore;
 
+        private readonly IInternalDataStoreSync dataStoreSync;
+
         private readonly string baseHref;
 
         private CollectionResourceRequestModel compiledModel = null;
@@ -57,6 +59,7 @@ public CollectionResourceQueryable(string collectionHref, IInternalDataStore dat
         {
             this.baseHref = collectionHref;
             this.dataStore = dataStore;
+            this.dataStoreSync = dataStore as IInternalDataStoreSync;
             this.proxy = CreateProxy();
             this.expressionOverride = null;
         }
@@ -83,11 +86,12 @@ public CollectionResourceQueryable(IQueryProvider provider, Expression expressio
             var relinqProvider = provider as DefaultQueryProvider;
             var executor = relinqProvider?.Executor as CollectionResourceQueryExecutor;
             if (relinqProvider == null || executor == null)
-                throw new InvalidOperationException("LINQ queries must start from a supported ICollectionResourceQueryable.");
+                throw new InvalidOperationException("LINQ queries must start from a supported provider.");
 
             this.baseHref = executor.Href;
             this.dataStore = executor.DataStore;
-            this.proxy = CreateProxy();
+            this.dataStoreSync = executor.DataStore as IInternalDataStoreSync;
+            this.proxy = null;
             this.expressionOverride = expression;
         }
 
@@ -191,7 +195,7 @@ internal bool MoveNext()
             this.AdjustPagingOffset();
 
             var url = this.GenerateRequestUrlFromModel();
-            var response = this.dataStore.GetCollection<T>(url);
+            var response = this.dataStoreSync.GetCollection<T>(url);
 
             return this.DidUpdateWithNewResults(response);
         }
diff --git a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Unsupported_filters_tests.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/IDeletableSync.cs
similarity index 55%
rename from Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Unsupported_filters_tests.cs
rename to Stormpath.SDK/Stormpath.SDK/Impl/Resource/IDeletableSync.cs
index 602bfaab..3d6fcb0b 100644
--- a/Stormpath.SDK/Stormpath.SDK.Tests/Impl/Linq/Unsupported_filters_tests.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/IDeletableSync.cs
@@ -1,4 +1,4 @@
-// <copyright file="Unsupported_filters_tests.cs" company="Stormpath, Inc.">
+// <copyright file="IDeletableSync.cs" company="Stormpath, Inc.">
 //      Copyright (c) 2015 Stormpath, Inc.
 // </copyright>
 // <remarks>
@@ -15,10 +15,18 @@
 // limitations under the License.
 // </remarks>
 
-namespace Stormpath.SDK.Tests.Impl.Linq
+namespace Stormpath.SDK.Impl.Resource
 {
-    public class Unsupported_filters_tests : Linq_tests
+    /// <summary>
+    /// Represents resources that can be deleted synchronously.
+    /// </summary>
+    internal interface IDeletableSync
     {
-        // TODO
+        /// <summary>
+        /// Synchronously deletes the resource.
+        /// </summary>
+        /// <returns>Whether the delete operation succeeded.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The delete operation failed.</exception>
+        bool Delete();
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Resource/ISaveableSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/ISaveableSync.cs
new file mode 100644
index 00000000..3e7939f2
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Resource/ISaveableSync.cs
@@ -0,0 +1,36 @@
+// <copyright file="ISaveableSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Resource;
+
+namespace Stormpath.SDK.Impl.Resource
+{
+    /// <summary>
+    /// Represents a resource that can be created or modified synchronously
+    /// </summary>
+    /// <typeparam name="T">The <see cref="IResource"/> type.</typeparam>
+    internal interface ISaveableSync<T>
+        where T : IResource
+    {
+        /// <summary>
+        /// Synchronously creates or updates the resource.
+        /// </summary>
+        /// <returns>The persisted resource data.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The save operation failed.</exception>
+        T Save();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Tenant/DefaultTenant.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Tenant/DefaultTenant.cs
index af5521b6..5ab735fd 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Tenant/DefaultTenant.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Tenant/DefaultTenant.cs
@@ -29,7 +29,7 @@
 
 namespace Stormpath.SDK.Impl.Tenant
 {
-    internal sealed class DefaultTenant : AbstractExtendableInstanceResource, ITenant
+    internal sealed class DefaultTenant : AbstractExtendableInstanceResource, ITenant, ITenantActionsSync
     {
         private static readonly string AccountsPropertyName = "accounts";
         private static readonly string AgentsPropertyName = "agents";
@@ -59,6 +59,8 @@ public DefaultTenant(IInternalDataStore dataStore, IDictionary<string, object> p
 
         private ITenant AsInterface => this;
 
+        private ITenantActionsSync AsTenantActionSyncInterface => this;
+
         internal LinkProperty Accounts => this.GetLinkProperty(AccountsPropertyName);
 
         internal LinkProperty Agents => this.GetLinkProperty(AgentsPropertyName);
@@ -86,15 +88,26 @@ Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication applicatio
             return this.GetInternalDataStore().CreateAsync(this.applicationsResourceBase, application, options, cancellationToken);
         }
 
-        Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication application, IApplicationCreationOptions creationOptions, CancellationToken cancellationToken)
+        IApplication ITenantActionsSync.CreateApplication(IApplication application, Action<ApplicationCreationOptionsBuilder> creationOptionsAction)
         {
-            return this.GetInternalDataStore().CreateAsync(this.applicationsResourceBase, application, creationOptions, cancellationToken);
+            var builder = new ApplicationCreationOptionsBuilder();
+            creationOptionsAction(builder);
+            var options = builder.Build();
+
+            return this.GetInternalDataStoreSync().Create(this.applicationsResourceBase, application, options);
         }
 
+        Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication application, IApplicationCreationOptions creationOptions, CancellationToken cancellationToken)
+            => this.GetInternalDataStore().CreateAsync(this.applicationsResourceBase, application, creationOptions, cancellationToken);
+
+        IApplication ITenantActionsSync.CreateApplication(IApplication application, IApplicationCreationOptions creationOptions)
+            => this.GetInternalDataStoreSync().Create(this.applicationsResourceBase, application, creationOptions);
+
         Task<IApplication> ITenantActions.CreateApplicationAsync(IApplication application, CancellationToken cancellationToken)
-        {
-            return this.GetInternalDataStore().CreateAsync(this.applicationsResourceBase, application, cancellationToken);
-        }
+            => this.GetInternalDataStore().CreateAsync(this.applicationsResourceBase, application, cancellationToken);
+
+        IApplication ITenantActionsSync.CreateApplication(IApplication application)
+            => this.GetInternalDataStoreSync().Create(this.applicationsResourceBase, application);
 
         Task<IApplication> ITenantActions.CreateApplicationAsync(string name, bool createDirectory, CancellationToken cancellationToken)
         {
@@ -109,19 +122,26 @@ Task<IApplication> ITenantActions.CreateApplicationAsync(string name, bool creat
             return this.AsInterface.CreateApplicationAsync(application, options, cancellationToken);
         }
 
-        IAsyncQueryable<IApplication> ITenantActions.GetApplications()
+        IApplication ITenantActionsSync.CreateApplication(string name, bool createDirectory)
         {
-            return new CollectionResourceQueryable<IApplication>(this.Applications.Href, this.GetInternalDataStore());
+            var application = this.GetInternalDataStore().Instantiate<IApplication>();
+            application.SetName(name);
+
+            var options = new ApplicationCreationOptionsBuilder()
+            {
+                CreateDirectory = createDirectory
+            }.Build();
+
+            return this.AsTenantActionSyncInterface.CreateApplication(application, options);
         }
 
+        IAsyncQueryable<IApplication> ITenantActions.GetApplications()
+            => new CollectionResourceQueryable<IApplication>(this.Applications.Href, this.GetInternalDataStore());
+
         IAsyncQueryable<IDirectory> ITenantActions.GetDirectories()
-        {
-            return new CollectionResourceQueryable<IDirectory>(this.Directories.Href, this.GetInternalDataStore());
-        }
+            => new CollectionResourceQueryable<IDirectory>(this.Directories.Href, this.GetInternalDataStore());
 
         IAsyncQueryable<IAccount> ITenantActions.GetAccounts()
-        {
-            return new CollectionResourceQueryable<IAccount>(this.Accounts.Href, this.GetInternalDataStore());
-        }
+            => new CollectionResourceQueryable<IAccount>(this.Accounts.Href, this.GetInternalDataStore());
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Tenant/ITenantActionsSync.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Tenant/ITenantActionsSync.cs
new file mode 100644
index 00000000..e3fb779e
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Tenant/ITenantActionsSync.cs
@@ -0,0 +1,65 @@
+// <copyright file="ITenantActionsSync.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using Stormpath.SDK.Application;
+
+namespace Stormpath.SDK.Impl.Tenant
+{
+    /// <summary>
+    /// Represents common tenant actions that can be executed synchronously on a <see cref="SDK.Tenant.ITenant"/> instance
+    /// <i>or</i> a <see cref="SDK.Client.IClient"/> instance acting on behalf of its current tenant.
+    /// </summary>
+    internal interface ITenantActionsSync
+    {
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant.
+        /// </summary>
+        /// <param name="application">The <see cref="IApplication"/> to create.</param>
+        /// <param name="creationOptionsAction">An inline builder for an instance of <see cref="ApplicationCreationOptionsBuilder"/>,
+        /// which will be used when sending the request.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="SDK.Error.ResourceException">There was a problem creating the application.</exception>
+        IApplication CreateApplication(IApplication application, Action<ApplicationCreationOptionsBuilder> creationOptionsAction);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant.
+        /// </summary>
+        /// <param name="application">The <see cref="IApplication"/> to create.</param>
+        /// <param name="creationOptions">An <see cref="IApplicationCreationOptions"/> instance to use when sending the request.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="SDK.Error.ResourceException">There was a problem creating the application.</exception>
+        IApplication CreateApplication(IApplication application, IApplicationCreationOptions creationOptions);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant, with the default creation options.
+        /// </summary>
+        /// <param name="application">The <see cref="IApplication"/> to create.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="SDK.Error.ResourceException">There was a problem creating the application.</exception>
+        IApplication CreateApplication(IApplication application);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant.
+        /// </summary>
+        /// <param name="name">The name of the application.</param>
+        /// <param name="createDirectory">Whether a default directory should be created automatically.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="SDK.Error.ResourceException">There was a problem creating the application.</exception>
+        IApplication CreateApplication(string name, bool createDirectory);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/ConfigurationManagerWrapper.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/ConfigurationManagerWrapper.cs
index 282fa897..b535c15f 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/ConfigurationManagerWrapper.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/ConfigurationManagerWrapper.cs
@@ -23,12 +23,6 @@ namespace Stormpath.SDK.Impl.Utility
     // A simple wrapper around ConfigurationManager, used for injecting an otherwise sadly static object
     internal sealed class ConfigurationManagerWrapper : IConfigurationManager
     {
-        public NameValueCollection AppSettings
-        {
-            get
-            {
-                return ConfigurationManager.AppSettings;
-            }
-        }
+        public NameValueCollection AppSettings => ConfigurationManager.AppSettings;
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/EnvironmentWrapper.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/EnvironmentWrapper.cs
index 9602d155..d82dbd24 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/EnvironmentWrapper.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/EnvironmentWrapper.cs
@@ -21,14 +21,8 @@ namespace Stormpath.SDK.Impl.Utility
 {
     internal sealed class EnvironmentWrapper : IEnvironment
     {
-        public string ExpandEnvironmentVariables(string name)
-        {
-            return Environment.ExpandEnvironmentVariables(name);
-        }
+        public string ExpandEnvironmentVariables(string name) => Environment.ExpandEnvironmentVariables(name);
 
-        public string GetEnvironmentVariable(string variable)
-        {
-            return Environment.GetEnvironmentVariable(variable);
-        }
+        public string GetEnvironmentVariable(string variable) => Environment.GetEnvironmentVariable(variable);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/FileWrapper.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/FileWrapper.cs
index d1ba1ebe..1b30e504 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/FileWrapper.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/FileWrapper.cs
@@ -19,9 +19,6 @@ namespace Stormpath.SDK.Impl.Utility
 {
     internal sealed class FileWrapper : IFile
     {
-        public string ReadAllText(string path)
-        {
-            return System.IO.File.ReadAllText(path);
-        }
+        public string ReadAllText(string path) => System.IO.File.ReadAllText(path);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/GenericEqualityComparer.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/GenericEqualityComparer.cs
index 6f329899..6da6e456 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/GenericEqualityComparer.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/GenericEqualityComparer.cs
@@ -49,9 +49,6 @@ public bool Equals(T x, T y)
             return result;
         }
 
-        public int GetHashCode(T obj)
-        {
-            return this.hashAction(obj);
-        }
+        public int GetHashCode(T obj) => this.hashAction(obj);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/GenericHasher.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/GenericHasher.cs
deleted file mode 100644
index eb623820..00000000
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/GenericHasher.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// <copyright file="GenericHasher.cs" company="Stormpath, Inc.">
-//      Copyright (c) 2015 Stormpath, Inc.
-// </copyright>
-// <remarks>
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// </remarks>
-
-using System;
-
-namespace Stormpath.SDK.Impl.Utility
-{
-    internal sealed class GenericHasherDeprecated<T>
-    {
-        private readonly Func<T, int> hashAction;
-
-        public GenericHasherDeprecated(Func<T, int> hashAction)
-        {
-            this.hashAction = hashAction;
-        }
-
-        public Func<T, int> HashFunction =>
-            t =>
-            {
-                if (!this.Valid(t))
-                    return 0;
-
-                return this.hashAction(t);
-            };
-
-        public static implicit operator Func<T, int>(GenericHasherDeprecated<T> hasher)
-        {
-            return hasher.HashFunction;
-        }
-
-        public int GetHashCode(T obj)
-        {
-            return this.HashFunction(obj);
-        }
-
-        private bool Valid(T obj)
-        {
-            bool objectIsNull = ReferenceEquals(obj, null);
-            return !objectIsNull;
-        }
-    }
-}
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/HashCode.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/HashCode.cs
index a8a809f8..6441ef29 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/HashCode.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/HashCode.cs
@@ -28,15 +28,9 @@ public HashCode(int hashCode)
             this.hashCode = hashCode;
         }
 
-        public static HashCode Start
-        {
-            get { return new HashCode(17); }
-        }
+        public static HashCode Start => new HashCode(17);
 
-        public static implicit operator int(HashCode hashCode)
-        {
-            return hashCode.GetHashCode();
-        }
+        public static implicit operator int(HashCode hashCode) => hashCode.GetHashCode();
 
         public HashCode Include(int existingHash)
         {
@@ -59,9 +53,6 @@ public HashCode Hash<T>(T obj)
             return new HashCode(h);
         }
 
-        public override int GetHashCode()
-        {
-            return this.hashCode;
-        }
+        public override int GetHashCode() => this.hashCode;
     }
 }
\ No newline at end of file
diff --git a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/Properties.cs b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/Properties.cs
index b17e2c8c..27cb916a 100644
--- a/Stormpath.SDK/Stormpath.SDK/Impl/Utility/Properties.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Impl/Utility/Properties.cs
@@ -53,10 +53,7 @@ public string GetProperty(string key, string defaultValue)
             return defaultValue;
         }
 
-        public int Count()
-        {
-            return this.props.Count;
-        }
+        public int Count() => this.props.Count;
 
         private static IDictionary<string, string> Parse(string input)
         {
diff --git a/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableExtensions.cs
index 94ab73b7..0aaea522 100644
--- a/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableExtensions.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableExtensions.cs
@@ -374,8 +374,8 @@ public static IAsyncQueryable<TSource> Where<TSource>(this IAsyncQueryable<TSour
             {
                 foreach (var item in source.CurrentPage)
                 {
-                    action(item, index++);
                     cancellationToken.ThrowIfCancellationRequested();
+                    action(item, index++);
                 }
             }
         }
diff --git a/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableFilterExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableFilterExtensions.cs
index 6fb28d72..548d67a8 100644
--- a/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableFilterExtensions.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Linq/AsyncQueryableFilterExtensions.cs
@@ -42,15 +42,9 @@ public static IAsyncQueryable<TSource> Filter<TSource>(this IAsyncQueryable<TSou
 
             return source.Provider.CreateQuery(
                 LinqHelper.MethodCall(
-                    LinqHelper.GetMethodInfo(Filter, (IQueryable<TSource>)null, caseInsensitiveMatch),
+                    LinqHelper.GetMethodInfo(Sync.FilterExtensions.Filter, (IQueryable<TSource>)null, caseInsensitiveMatch),
                     source.Expression,
                     Expression.Constant(caseInsensitiveMatch)));
         }
-
-        private static IQueryable<TSource> Filter<TSource>(IQueryable<TSource> source, string caseInsensitiveMatch)
-        {
-            // todo remove
-            throw new NotImplementedException("This method stub is just a proxy that is inserted into the expression tree.");
-        }
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Shared/Enumeration.cs b/Stormpath.SDK/Stormpath.SDK/Shared/Enumeration.cs
index 0fe9d8cf..187a5fb1 100644
--- a/Stormpath.SDK/Stormpath.SDK/Shared/Enumeration.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Shared/Enumeration.cs
@@ -43,15 +43,9 @@ protected Enumeration(int value, string displayName)
             this.displayName = displayName;
         }
 
-        public int Value
-        {
-            get { return this.value; }
-        }
+        public int Value => this.value;
 
-        public string DisplayName
-        {
-            get { return this.displayName; }
-        }
+        public string DisplayName => this.displayName;
 
         public static bool operator ==(Enumeration a, Enumeration b)
         {
@@ -68,15 +62,9 @@ public string DisplayName
             return a.Value == b.Value;
         }
 
-        public static bool operator !=(Enumeration a, Enumeration b)
-        {
-            return !(a == b);
-        }
+        public static bool operator !=(Enumeration a, Enumeration b) => !(a == b);
 
-        public override string ToString()
-        {
-            return this.DisplayName;
-        }
+        public override string ToString() => this.DisplayName;
 
         public static IEnumerable<T> GetAll<T>()
             where T : Enumeration, new()
@@ -111,10 +99,7 @@ public override bool Equals(object obj)
             return typeMatches && valueMatches;
         }
 
-        public override int GetHashCode()
-        {
-            return this.value.GetHashCode();
-        }
+        public override int GetHashCode() => this.value.GetHashCode();
 
         public static int AbsoluteDifference(Enumeration firstValue, Enumeration secondValue)
         {
@@ -150,9 +135,6 @@ private static T Parse<T, K>(K value, string description, Func<T, bool> predicat
             return matchingItem;
         }
 
-        public int CompareTo(object other)
-        {
-            return this.Value.CompareTo(((Enumeration)other).Value);
-        }
+        public int CompareTo(object other) => this.Value.CompareTo(((Enumeration)other).Value);
     }
 }
diff --git a/Stormpath.SDK/Stormpath.SDK/Shared/ImmutableValueObject.cs b/Stormpath.SDK/Stormpath.SDK/Shared/ImmutableValueObject.cs
index 4fff08dc..47df9e3b 100644
--- a/Stormpath.SDK/Stormpath.SDK/Shared/ImmutableValueObject.cs
+++ b/Stormpath.SDK/Stormpath.SDK/Shared/ImmutableValueObject.cs
@@ -75,24 +75,16 @@ public ImmutableValueObject(Func<T, T, bool> equalityFunction)
         }
 
         public static bool operator ==(ImmutableValueObject<T> x, ImmutableValueObject<T> y)
-        {
-            return EqualsImpl(x as T, y as T);
-        }
+            => EqualsImpl(x as T, y as T);
 
         public static bool operator !=(ImmutableValueObject<T> x, ImmutableValueObject<T> y)
-        {
-            return !(x == y);
-        }
+            => !(x == y);
 
         public override bool Equals(object obj)
-        {
-            return EqualsImpl(this as T, obj as T);
-        }
+            => EqualsImpl(this as T, obj as T);
 
         public virtual bool Equals(T other)
-        {
-            return EqualsImpl(this as T, other);
-        }
+            => EqualsImpl(this as T, other);
 
         public override int GetHashCode()
         {
diff --git a/Stormpath.SDK/Stormpath.SDK/Stormpath.SDK.csproj b/Stormpath.SDK/Stormpath.SDK/Stormpath.SDK.csproj
index 803d70df..a4c78d12 100644
--- a/Stormpath.SDK/Stormpath.SDK/Stormpath.SDK.csproj
+++ b/Stormpath.SDK/Stormpath.SDK/Stormpath.SDK.csproj
@@ -57,7 +57,7 @@
     <Compile Include="Account\AccountCreationOptionsBuilder.cs" />
     <Compile Include="Account\AccountStatus.cs" />
     <Compile Include="Account\IAccount.cs" />
-    <Compile Include="Account\IAccountCreation.cs" />
+    <Compile Include="Account\IAccountCreationActions.cs" />
     <Compile Include="Account\IAccountCreationOptions.cs" />
     <Compile Include="Api\ClientApiKeys.cs" />
     <Compile Include="Api\IClientApiKey.cs" />
@@ -88,15 +88,21 @@
     <Compile Include="Http\ISynchronousHttpClient.cs" />
     <Compile Include="Impl\AccountStore\DefaultAccountStore.cs" />
     <Compile Include="Impl\AccountStore\DefaultAccountStoreMapping.cs" />
+    <Compile Include="Impl\AccountStore\IAccountStoreMappingSync.cs" />
     <Compile Include="Impl\Account\DefaultAccountCreationOptions.cs" />
     <Compile Include="Impl\Account\DefaultPasswordResetToken.cs" />
+    <Compile Include="Impl\Account\IAccountCreationActionsSync.cs" />
+    <Compile Include="Impl\Account\IAccountSync.cs" />
+    <Compile Include="Impl\Account\IPasswordResetTokenSync.cs" />
     <Compile Include="Impl\Application\DefaultApplication.cs" />
     <Compile Include="Impl\Application\DefaultApplicationCreationOptions.cs" />
+    <Compile Include="Impl\Application\IApplicationSync.cs" />
     <Compile Include="Impl\Auth\AbstractLoginAttempt.cs" />
     <Compile Include="Impl\Auth\AuthenticationRequestDispatcher.cs" />
     <Compile Include="Impl\Auth\BasicAuthenticator.cs" />
     <Compile Include="Impl\Auth\DefaultAuthenticationResult.cs" />
     <Compile Include="Impl\Auth\DefaultBasicLoginAttempt.cs" />
+    <Compile Include="Impl\Auth\IAuthenticationResultSync.cs" />
     <Compile Include="Impl\Auth\IBasicLoginAttempt.cs" />
     <Compile Include="Impl\Auth\ILoginAttempt.cs" />
     <Compile Include="Impl\Cache\InMemoryCache.cs" />
@@ -112,6 +118,7 @@
     <Compile Include="Impl\Client\DefaultJsonSerializerBuilder.cs" />
     <Compile Include="Impl\Client\DefaultHttpClientBuilder.cs" />
     <Compile Include="Impl\Client\ICacheProviderBuilder.cs" />
+    <Compile Include="Impl\Client\IClientSync.cs" />
     <Compile Include="Impl\Client\IJsonSerializerBuilder.cs" />
     <Compile Include="Impl\Client\IHttpClientBuilder.cs" />
     <Compile Include="Impl\DataStore\DefaultResourceConverter.cs" />
@@ -119,12 +126,16 @@
     <Compile Include="Impl\DataStore\DefaultResourceDataResult.cs" />
     <Compile Include="Impl\DataStore\Filters\ReadCacheFilter.cs" />
     <Compile Include="Impl\DataStore\Filters\WriteCacheFilter.cs" />
+    <Compile Include="Impl\DataStore\IDataStoreSync.cs" />
+    <Compile Include="Impl\DataStore\IInternalDataStoreSync.cs" />
     <Compile Include="Impl\Http\DefaultHttpClientLoader.cs" />
     <Compile Include="Impl\Http\DefaultRequestExecutor.cs" />
     <Compile Include="Impl\Http\Support\DefaultBackoffStrategy.cs" />
     <Compile Include="Impl\Http\Support\IBackoffStrategy.cs" />
     <Compile Include="Impl\Http\Support\ThrottlingBackoffStrategy.cs" />
     <Compile Include="Impl\Linq\LinqHelper.cs" />
+    <Compile Include="Impl\Resource\IDeletableSync.cs" />
+    <Compile Include="Impl\Resource\ISaveableSync.cs" />
     <Compile Include="Impl\Serialization\FieldConverters\FieldConverterResult.cs" />
     <Compile Include="Impl\Serialization\FieldConverters\AbstractFieldConverter.cs" />
     <Compile Include="Impl\Serialization\FieldConverters\FieldConverterList.cs" />
@@ -143,10 +154,21 @@
     <Compile Include="Impl\DataStore\IInternalDataStore.cs" />
     <Compile Include="Impl\Serialization\JsonSerializationProvider.cs" />
     <Compile Include="Impl\Serialization\DefaultJsonSerializerLoader.cs" />
+    <Compile Include="Impl\Tenant\ITenantActionsSync.cs" />
     <Compile Include="Impl\Utility\ITypeLoader.cs" />
     <Compile Include="Impl\Utility\TypeLoader.cs" />
     <Compile Include="Linq\IOrderedAsyncQueryable.cs" />
     <Compile Include="Linq\IAsyncQueryProvider.cs" />
+    <Compile Include="Sync\FilterExtensions.cs" />
+    <Compile Include="Sync\SyncAccountCreationActionsExtensions.cs" />
+    <Compile Include="Sync\SyncAccountExtensions.cs" />
+    <Compile Include="Sync\SyncAccountStoreMappingExtensions.cs" />
+    <Compile Include="Sync\SyncApplicationExtensions.cs" />
+    <Compile Include="Sync\SyncAuthenticationResultExtensions.cs" />
+    <Compile Include="Sync\SyncClientExtensions.cs" />
+    <Compile Include="Sync\SyncDataStoreExtensions.cs" />
+    <Compile Include="Sync\SyncPasswordResetTokenExtensions.cs" />
+    <Compile Include="Sync\SyncQueryableExtensions.cs" />
     <Compile Include="Serialization\IJsonSerializer.cs" />
     <Compile Include="Impl\DataStore\IResourceConverter.cs" />
     <Compile Include="Impl\DataStore\IResourceDataRequest.cs" />
@@ -220,7 +242,6 @@
     <Compile Include="Impl\Resource\LinkProperty.cs" />
     <Compile Include="Impl\Tenant\DefaultTenant.cs" />
     <Compile Include="Impl\Utility\ConfigurationManagerWrapper.cs" />
-    <Compile Include="Impl\Utility\GenericHasher.cs" />
     <Compile Include="Shared\ImmutableValueObject.cs" />
     <Compile Include="Impl\Utility\Iso8601.cs" />
     <Compile Include="Impl\Utility\IMultiValueDictionary.cs" />
@@ -253,6 +274,8 @@
     <Compile Include="Shared\LogEntry.cs" />
     <Compile Include="Shared\LoggerExtensions.cs" />
     <Compile Include="Shared\LogLevel.cs" />
+    <Compile Include="Sync\SyncResourceExtensions.cs" />
+    <Compile Include="Sync\SyncTenantActionsExtensions.cs" />
     <Compile Include="Tenant\ITenant.cs" />
     <Compile Include="Tenant\ITenantActions.cs" />
   </ItemGroup>
@@ -266,7 +289,8 @@
   <ItemGroup />
   <ItemGroup>
     <Analyzer Include="..\packages\AsyncUsageAnalyzers.1.0.0-alpha003\analyzers\dotnet\AsyncUsageAnalyzers.dll" />
-    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta011\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0-beta012\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/FilterExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/FilterExtensions.cs
new file mode 100644
index 00000000..00270f96
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/FilterExtensions.cs
@@ -0,0 +1,35 @@
+// <copyright file="FilterExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System.Linq;
+using System.Linq.Expressions;
+using Stormpath.SDK.Impl.Linq;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class FilterExtensions
+    {
+        public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> source, string caseInsensitiveMatch)
+        {
+            return source.Provider.CreateQuery<TSource>(
+                LinqHelper.MethodCall(
+                    LinqHelper.GetMethodInfo(Filter, source, caseInsensitiveMatch),
+                    source.Expression,
+                    Expression.Constant(caseInsensitiveMatch)));
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountCreationActionsExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountCreationActionsExtensions.cs
new file mode 100644
index 00000000..79b3f5f8
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountCreationActionsExtensions.cs
@@ -0,0 +1,84 @@
+// <copyright file="SyncAccountCreationActionsExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Impl.Account;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncAccountCreationActionsExtensions
+    {
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application.
+        /// </summary>
+        /// <param name="source">The source object.</param>
+        /// <param name="account">The account to create/persist.</param>
+        /// <param name="creationOptionsAction">An inline builder for an instance of <see cref="IAccountCreationOptions"/>,
+        /// which will be used when sending the request.</param>
+        /// <example>
+        /// If you would like to force disabling the backing directory's account registration workflow:
+        /// <code>app.CreateAccount(theAccount, options => options.RegistrationWorkflowEnabled = false);</code>
+        /// </example>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="Error.ResourceException">The <see cref="Application.IApplication"/> does not have a dedicated
+        ///  <see cref="AccountStore.IAccountStore"/> or if the designated <see cref="AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        public static IAccount CreateAccount(this IAccountCreationActions source, IAccount account, Action<AccountCreationOptionsBuilder> creationOptionsAction)
+            => (source as IAccountCreationActionsSync).CreateAccount(account, creationOptionsAction);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application.
+        /// </summary>
+        /// <param name="source">The source object.</param>
+        /// <param name="account">The account to create/persist.</param>
+        /// <param name="creationOptions">An <see cref="IAccountCreationOptions"/> instance to use when sending the request.</param>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="Error.ResourceException">The <see cref="Application.IApplication"/> does not have a dedicated
+        ///  <see cref="AccountStore.IAccountStore"/> or if the designated <see cref="AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        public static IAccount CreateAccount(this IAccountCreationActions source, IAccount account, IAccountCreationOptions creationOptions)
+            => (source as IAccountCreationActionsSync).CreateAccount(account, creationOptions);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application.
+        /// </summary>
+        /// <param name="source">The source object.</param>
+        /// <param name="account">The account to create/persist.</param>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="Error.ResourceException">The <see cref="Application.IApplication"/> does not have a dedicated
+        ///  <see cref="AccountStore.IAccountStore"/> or if the designated <see cref="AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        public static IAccount CreateAccount(this IAccountCreationActions source, IAccount account)
+            => (source as IAccountCreationActionsSync).CreateAccount(account);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IAccount"/> that may login to this application, with the default creation options.
+        /// </summary>
+        /// <param name="source">The source object.</param>
+        /// <param name="givenName">The given name (aka 'first name' in Western cultures).</param>
+        /// <param name="surname">The surname (aka 'last name' in Western cultures).</param>
+        /// <param name="email">The account's email address, which must be unique among all other accounts within a <see cref="IDirectory"/>.</param>
+        /// <param name="password">The account's raw (plaintext) password.</param>
+        /// <returns>The persisted account.</returns>
+        /// <exception cref="Error.ResourceException">The <see cref="Application.IApplication"/> does not have a dedicated
+        ///  <see cref="AccountStore.IAccountStore"/> or if the designated <see cref="AccountStore.IAccountStore"/>
+        ///  does not allow new accounts to be created.</exception>
+        public static IAccount CreateAccount(this IAccountCreationActions source, string givenName, string surname, string email, string password)
+            => (source as IAccountCreationActionsSync).CreateAccount(givenName, surname, email, password);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountExtensions.cs
new file mode 100644
index 00000000..252b6f9a
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountExtensions.cs
@@ -0,0 +1,41 @@
+// <copyright file="SyncAccountExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Directory;
+using Stormpath.SDK.Impl.Account;
+using Stormpath.SDK.Tenant;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncAccountExtensions
+    {
+        /// <summary>
+        /// Synchronously gets the account's parent <see cref="IDirectory"/> (where the account is stored).
+        /// </summary>
+        /// <param name="account">The account</param>
+        /// <returns>This account's directory.</returns>
+        public static IDirectory GetDirectory(this IAccount account) => (account as IAccountSync).GetDirectory();
+
+        /// <summary>
+        /// Synchronously gets the Stormpath <see cref="ITenant"/> that owns this Account resource.
+        /// </summary>
+        /// <param name="account">The account</param>
+        /// <returns>This account's tenant.</returns>
+        public static ITenant GetTenant(this IAccount account) => (account as IAccountSync).GetTenant();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountStoreMappingExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountStoreMappingExtensions.cs
new file mode 100644
index 00000000..93b67dc0
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAccountStoreMappingExtensions.cs
@@ -0,0 +1,42 @@
+// <copyright file="SyncAccountStoreMappingExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.AccountStore;
+using Stormpath.SDK.Application;
+using Stormpath.SDK.Impl.AccountStore;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncAccountStoreMappingExtensions
+    {
+        /// <summary>
+        /// Synchronously gets this mapping's <see cref="IAccountStore"/> (either a Group or <see cref="Directory.IDirectory"/>), to be assigned to the application.
+        /// </summary>
+        /// <param name="accountStoreMapping">The account store mapping.</param>
+        /// <returns>The mapping's <see cref="IAccountStore"/>.</returns>
+        public static IAccountStore GetAccountStore(this IAccountStoreMapping accountStoreMapping)
+            => (accountStoreMapping as IAccountStoreMappingSync).GetAccountStore();
+
+        /// <summary>
+        /// Synchronously gets the <see cref="IApplication"/> represented by this mapping.
+        /// </summary>
+        /// <param name="accountStoreMapping">The account store mapping.</param>
+        /// <returns>The mapping's <see cref="IApplication"/>.</returns>
+        public static IApplication GetApplication(this IAccountStoreMapping accountStoreMapping)
+            => (accountStoreMapping as IAccountStoreMappingSync).GetApplication();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncApplicationExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncApplicationExtensions.cs
new file mode 100644
index 00000000..9c58592c
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncApplicationExtensions.cs
@@ -0,0 +1,130 @@
+// <copyright file="SyncApplicationExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+using Stormpath.SDK.AccountStore;
+using Stormpath.SDK.Application;
+using Stormpath.SDK.Auth;
+using Stormpath.SDK.Impl.Application;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncApplicationExtensions
+    {
+        /// <summary>
+        /// Synchronously authenticates an account's submitted principals and credentials (e.g. username and password).
+        /// The account must be in one of the Application's assigned account stores.
+        /// If not in an assigned account store, the authentication attempt will fail.
+        /// </summary>
+        /// <param name="application">The application.</param>
+        /// <param name="request">Any supported <see cref="IAuthenticationRequest"/> object (e.g. <see cref="UsernamePasswordRequest"/>).</param>
+        /// <returns>
+        /// The result of the authentication.
+        /// The authenticated account can be obtained from <see cref="Sync.SyncAuthenticationResultExtensions.GetAccount()"/>.
+        /// </returns>
+        /// <exception cref="SDK.Error.ResourceException">The authentication attempt failed.</exception>
+        /// <example>
+        ///     var loginRequest = new UsernamePasswordRequest("jsmith", "Password123#");
+        ///     var result = myApp.AuthenticateAccount(loginRequest);
+        /// </example>
+        public static IAuthenticationResult AuthenticateAccount(this IApplication application, IAuthenticationRequest request)
+            => (application as IApplicationSync).AuthenticateAccount(request);
+
+        /// <summary>
+        /// Synchronously authenticates an account's submitted principals and credentials (e.g. username and password).
+        /// The account must be in one of the Application's assigned account stores.
+        /// If not in an assigned account store, the authentication attempt will fail.
+        /// </summary>
+        /// <param name="application">The application.</param>
+        /// <param name="username">The account's username.</param>
+        /// <param name="password">The account's raw (plaintext) password.</param>
+        /// <returns>
+        /// The result of the authentication.
+        /// The authenticated account can be obtained from <see cref="Sync.SyncAuthenticationResultExtensions.GetAccount()"/>.
+        /// </returns>
+        /// <exception cref="Error.ResourceException">The authentication attempt failed.</exception>
+        /// <example>
+        ///     var result = myApp.AuthenticateAccount("jsmith", "Password123#");
+        /// </example>
+        public static IAuthenticationResult AuthenticateAccount(this IApplication application, string username, string password)
+            => (application as IApplicationSync).AuthenticateAccount(username, password);
+
+        /// <summary>
+        /// Attempts to synchronously authenticate an account with the specified username and password.
+        /// <para>If you need to obtain the authenticated account details, use <see cref="AuthenticateAccount(IApplication, string, string)"/> instead.</para>
+        /// </summary>
+        /// <param name="application">The application.</param>
+        /// <param name="username">The account's username.</param>
+        /// <param name="password">The account's raw (plaintext) password</param>
+        /// <returns><c>true</c> if the authentication attempt succeeded; <c>false</c> otherwise.</returns>
+        /// <example>
+        ///     if (myApp.TryAuthenticateAccount("jsmith", "Password123#"))
+        ///     {
+        ///         // Login successful
+        ///     }
+        /// </example>
+        public static bool TryAuthenticateAccount(this IApplication application, string username, string password)
+            => (application as IApplicationSync).TryAuthenticateAccount(username, password);
+
+        /// <summary>
+        /// Synchronously gets the <see cref="IAccountStore"/> (either a Group or <see cref="Directory.IDirectory"/>)
+        /// used to persist new accounts created by the application.
+        /// </summary>
+        /// <param name="application">The application.</param>
+        /// <returns>The default <see cref="IAccountStore"/>,
+        /// or <c>null</c> if no default <see cref="IAccountStore"/> has been designated.</returns>
+        public static IAccountStore GetDefaultAccountStore(this IApplication application)
+            => (application as IApplicationSync).GetDefaultAccountStore();
+
+        /// <summary>
+        /// Synchronously verifies the password reset token (received in the user's email) and immediately
+        /// changes the password in the same request, if the token is valid.
+        /// <para>Once the token has been successfully used, it is immediately invalidated and can't be used again.
+        /// If you need to change the password again, you will previously need to execute
+        /// <see cref="SendPasswordResetEmail(IApplication, string)"/> again in order to obtain a new password reset token.</para>
+        /// </summary>
+        /// <param name="application">The application.</param>
+        /// <param name="token">The verification token, usually obtained as a request parameter by your application.</param>
+        /// <param name="newPassword">The new password that will be set to the <see cref="IAccount"/> if the token is successfully validated.</param>
+        /// <returns>The account matching the specified token.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The token is not valid.</exception>
+        public static IAccount ResetPassword(this IApplication application, string token, string newPassword)
+            => (application as IApplicationSync).ResetPassword(token, newPassword);
+
+        /// <summary>
+        /// Synchronously sends a password reset email for the specified account email address.
+        /// The email will contain a password reset link that the user can click or copy into their browser address bar.
+        /// </summary>
+        /// <param name="application">The application.</param>
+        /// <param name="email">An email address of an <see cref="IAccount"/> that may login to the application.</param>
+        /// <returns>The created <see cref="IPasswordResetToken"/>.
+        /// You can obtain the associated account via <see cref="Sync.SyncPasswordResetTokenExtensions.GetAccount()"/>.</returns>
+        /// <exception cref="SDK.Error.ResourceException">There is no account that matches the specified email address.</exception>
+        public static IPasswordResetToken SendPasswordResetEmail(this IApplication application, string email)
+            => (application as IApplicationSync).SendPasswordResetEmail(email);
+
+        /// <summary>
+        /// Synchronously verifies a password reset token.
+        /// </summary>
+        /// <param name="application">The application.</param>
+        /// <param name="token">The verification token, usually obtained as a request paramter by your application.</param>
+        /// <returns>The <see cref="IAccount"/> matching the specified token.</returns>
+        /// <exception cref="SDK.Error.ResourceException">The token is not valid.</exception>
+        public static IAccount VerifyPasswordResetToken(this IApplication application, string token)
+            => (application as IApplicationSync).VerifyPasswordResetToken(token);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncAuthenticationResultExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAuthenticationResultExtensions.cs
new file mode 100644
index 00000000..59089be0
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncAuthenticationResultExtensions.cs
@@ -0,0 +1,34 @@
+// <copyright file="SyncAuthenticationResultExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Auth;
+using Stormpath.SDK.Impl.Auth;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncAuthenticationResultExtensions
+    {
+        /// <summary>
+        /// Synchronously gets the successfully authenticated <see cref="IAccount"/>.
+        /// </summary>
+        /// <param name="authResult">The authentication result.</param>
+        /// <returns>The <see cref="IAccount"/> that was successfully authenticated.</returns>
+        public static IAccount GetAccount(this IAuthenticationResult authResult)
+            => (authResult as IAuthenticationResultSync).GetAccount();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncClientExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncClientExtensions.cs
new file mode 100644
index 00000000..01156ff2
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncClientExtensions.cs
@@ -0,0 +1,34 @@
+// <copyright file="SyncClientExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Client;
+using Stormpath.SDK.Impl.Client;
+using Stormpath.SDK.Tenant;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncClientExtensions
+    {
+        /// <summary>
+        /// Synchronously gets the sole <see cref="ITenant"/> associated to this <see cref="IClient"/>.
+        /// </summary>
+        /// <param name="client">The client.</param>
+        /// <returns>The <see cref="ITenant"/> associated to this client.</returns>
+        public static ITenant GetCurrentTenant(this IClient client)
+            => (client as IClientSync).GetCurrentTenant();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncDataStoreExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncDataStoreExtensions.cs
new file mode 100644
index 00000000..cbf5f4b0
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncDataStoreExtensions.cs
@@ -0,0 +1,36 @@
+// <copyright file="SyncDataStoreExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.DataStore;
+using Stormpath.SDK.Impl.DataStore;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncDataStoreExtensions
+    {
+        /// <summary>
+        /// Synchronously retrieves the resource at the specified <paramref name="href"/> URL synchronously and returns the resource
+        /// as an instance of the specified class <typeparamref name="T"/>.
+        /// </summary>
+        /// <param name="dataStore">The object implementing the <see cref="IDataStore"/> interface.</param>
+        /// <typeparam name="T">The type of the returned <see cref="Resource.IResource"/> value.</typeparam>
+        /// <param name="href">The resource URL of the resource to retrieve.</param>
+        /// <returns>An instance of the specified class based on data returned from the specified <paramref name="href"/> URL.</returns>
+        public static T GetResource<T>(this IDataStore dataStore, string href)
+            => (dataStore as IDataStoreSync).GetResource<T>(href);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncPasswordResetTokenExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncPasswordResetTokenExtensions.cs
new file mode 100644
index 00000000..2dca6d48
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncPasswordResetTokenExtensions.cs
@@ -0,0 +1,33 @@
+// <copyright file="SyncPasswordResetTokenExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Account;
+using Stormpath.SDK.Impl.Account;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncPasswordResetTokenExtensions
+    {
+        /// <summary>
+        /// Synchronously gets the <see cref="IAccount"/> associated with this password reset token.
+        /// </summary>
+        /// <param name="token">The token.</param>
+        /// <returns>The <see cref="IAccount"/> in the reset password workflow.</returns>
+        public static IAccount GetAccount(this IPasswordResetToken token)
+            => (token as IPasswordResetTokenSync).GetAccount();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncQueryableExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncQueryableExtensions.cs
new file mode 100644
index 00000000..84abd6ce
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncQueryableExtensions.cs
@@ -0,0 +1,49 @@
+// <copyright file="SyncQueryableExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Stormpath.SDK.Impl.Resource;
+using Stormpath.SDK.Linq;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncQueryableExtensions
+    {
+        /// <summary>
+        /// Provides synchronous access to a collection resource.
+        /// </summary>
+        /// <typeparam name="TSource">The type of the elements of <paramref name="source"/>.</typeparam>
+        /// <param name="source">A sequence of values to order.</param>
+        /// <returns>A <see cref="IQueryable{T}"/> that will execute all requests synchronously.</returns>
+        public static IQueryable<TSource> Synchronously<TSource>(this IAsyncQueryable<TSource> source)
+        {
+            var collection = source as CollectionResourceQueryable<TSource>;
+            if (collection == null)
+                throw new InvalidOperationException("This queryable is not a supported collection resource.");
+
+            bool isEmptyExpressionTree =
+                source.Expression.NodeType == ExpressionType.Constant &&
+                source.Expression.Type == typeof(EnumerableQuery<TSource>);
+            if (!isEmptyExpressionTree)
+                throw new NotSupportedException("Synchronously must be called first.");
+
+            return new CollectionResourceQueryable<TSource>(collection, proxy: null);
+        }
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncResourceExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncResourceExtensions.cs
new file mode 100644
index 00000000..6a331d73
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncResourceExtensions.cs
@@ -0,0 +1,43 @@
+// <copyright file="SyncResourceExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using Stormpath.SDK.Impl.Resource;
+using Stormpath.SDK.Resource;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncResourceExtensions
+    {
+        /// <summary>
+        /// Synchronously creates or updates the resource.
+        /// </summary>
+        /// <param name="resource">The resource.</param>
+        /// <typeparam name="T">The <see cref="IResource"/> type.</typeparam>
+        /// <returns>The persisted resource data.</returns>
+        /// <exception cref="Error.ResourceException">The save operation failed.</exception>
+        public static T Save<T>(this ISaveable<T> resource)
+            where T : IResource => (resource as ISaveableSync<T>).Save();
+
+        /// <summary>
+        /// Synchronously deletes the resource.
+        /// </summary>
+        /// <param name="resource">The resource.</param>
+        /// <returns>Whether the delete operation succeeded.</returns>
+        /// <exception cref="Error.ResourceException">The delete operation failed.</exception>
+        public static bool Delete(this IDeletable resource) => (resource as IDeletableSync).Delete();
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/Sync/SyncTenantActionsExtensions.cs b/Stormpath.SDK/Stormpath.SDK/Sync/SyncTenantActionsExtensions.cs
new file mode 100644
index 00000000..8aeb0d09
--- /dev/null
+++ b/Stormpath.SDK/Stormpath.SDK/Sync/SyncTenantActionsExtensions.cs
@@ -0,0 +1,71 @@
+// <copyright file="SyncTenantActionsExtensions.cs" company="Stormpath, Inc.">
+//      Copyright (c) 2015 Stormpath, Inc.
+// </copyright>
+// <remarks>
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// </remarks>
+
+using System;
+using Stormpath.SDK.Application;
+using Stormpath.SDK.Impl.Tenant;
+using Stormpath.SDK.Tenant;
+
+namespace Stormpath.SDK.Sync
+{
+    public static class SyncTenantActionsExtensions
+    {
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant.
+        /// </summary>
+        /// <param name="tenantActions">The object supporting the <see cref="ITenantActions"/> interface.</param>
+        /// <param name="application">The <see cref="IApplication"/> to create.</param>
+        /// <param name="creationOptionsAction">An inline builder for an instance of <see cref="ApplicationCreationOptionsBuilder"/>,
+        /// which will be used when sending the request.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="Error.ResourceException">There was a problem creating the application.</exception>
+        public static IApplication CreateApplication(this ITenantActions tenantActions, IApplication application, Action<ApplicationCreationOptionsBuilder> creationOptionsAction)
+            => (tenantActions as ITenantActionsSync).CreateApplication(application, creationOptionsAction);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant.
+        /// </summary>
+        /// <param name="tenantActions">The object supporting the <see cref="ITenantActions"/> interface.</param>
+        /// <param name="application">The <see cref="IApplication"/> to create.</param>
+        /// <param name="creationOptions">An <see cref="IApplicationCreationOptions"/> instance to use when sending the request.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="Error.ResourceException">There was a problem creating the application.</exception>
+        public static IApplication CreateApplication(this ITenantActions tenantActions, IApplication application, IApplicationCreationOptions creationOptions)
+            => (tenantActions as ITenantActionsSync).CreateApplication(application, creationOptions);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant, with the default creation options.
+        /// </summary>
+        /// <param name="tenantActions">The object supporting the <see cref="ITenantActions"/> interface.</param>
+        /// <param name="application">The <see cref="IApplication"/> to create.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="Error.ResourceException">There was a problem creating the application.</exception>
+        public static IApplication CreateApplication(this ITenantActions tenantActions, IApplication application)
+            => (tenantActions as ITenantActionsSync).CreateApplication(application);
+
+        /// <summary>
+        /// Synchronously creates a new <see cref="IApplication"/> resource in the current tenant.
+        /// </summary>
+        /// <param name="tenantActions">The object supporting the <see cref="ITenantActions"/> interface.</param>
+        /// <param name="name">The name of the application.</param>
+        /// <param name="createDirectory">Whether a default directory should be created automatically.</param>
+        /// <returns>The created <see cref="IApplication"/>.</returns>
+        /// <exception cref="Error.ResourceException">There was a problem creating the application.</exception>
+        public static IApplication CreateApplication(this ITenantActions tenantActions, string name, bool createDirectory)
+            => (tenantActions as ITenantActionsSync).CreateApplication(name, createDirectory);
+    }
+}
diff --git a/Stormpath.SDK/Stormpath.SDK/packages.config b/Stormpath.SDK/Stormpath.SDK/packages.config
index 20515964..934b2030 100644
--- a/Stormpath.SDK/Stormpath.SDK/packages.config
+++ b/Stormpath.SDK/Stormpath.SDK/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="AsyncUsageAnalyzers" version="1.0.0-alpha003" targetFramework="net45" developmentDependency="true" />
   <package id="Remotion.Linq" version="1.15.15.0" targetFramework="net45" />
-  <package id="StyleCop.Analyzers" version="1.0.0-beta011" targetFramework="net45" developmentDependency="true" />
+  <package id="StyleCop.Analyzers" version="1.0.0-beta012" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file