update changelog

Fix StackOverflow bug in PocketItem equality overload

.editorconfig

@@ -1,21 +1,15 @@
 ; This file is for unifying the coding style for different editors and IDEs
 ; editorconfig.org
 
-; defaults by Tobias Klika
-; 2013
-
 root = true
 
-
-; default settings for all files
 [*]
-end_of_line = crlf ; this is git standard, so it won't convert it anymore
+end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

.gitignore

@@ -1,9 +1,3 @@
-# =========================
-# Project
-# =========================
-
-PocketSharp.Console/
-
 ## Ignore Visual Studio temporary files, build results, and files generated by popular Visual Studio add-ons.
 
 # User-specific files
@@ -105,6 +99,7 @@ publish/
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 packages/
+*.nupkg
 
 # Windows Azure Build Output
 csx
@@ -130,6 +125,8 @@ node_modules
 tmp
 _old
 _tmp
+Gemfile.lock
+WebWorkbench.mswwsettings
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -162,3 +159,10 @@ $RECYCLE.BIN/
 # Mac crap
 .DS_Store
 
+
+# =========================
+# Project
+# =========================
+
+PocketSharp.Console/
+!PocketSharp.Website/Release/

.nuget/NuGet.targets

@@ -18,9 +18,9 @@
     
     <ItemGroup Condition=" '$(PackageSources)' == '' ">
         <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
         <!--
-            <PackageSource Include="https://nuget.org/api/v2/" />
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
             <PackageSource Include="https://my-nuget-source/nuget/" />
         -->
     </ItemGroup>
@@ -50,9 +50,12 @@
         <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
         <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
         
+        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
         <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir) " </RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
 
         <!-- We need to ensure packages are restored prior to assembly resolve -->
         <BuildDependsOn Condition="$(RestorePackages) == 'true'">
@@ -118,7 +121,7 @@
 
                     Log.LogMessage("Downloading latest version of NuGet.exe...");
                     WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
 
                     return true;
                 }

CHANGELOG.md

@@ -0,0 +1,159 @@
+### 4.1.6 (2014-08-28)
+
+- Fix DateTime conversion issue (from local to UTC)
+
+### 4.1.5 (2014-07-27)
+
+- Fix StackOverflow bug in PocketItem equality overload (fixes #28)
+
+### 4.1.4 (2014-07-18)
+
+- Implement WebAuthenticationBroker-view toggle
+
+### 4.1.3 (2014-06-25)
+
+- Only dispose response if available
+
+### 4.1.2 (2014-06-18)
+
+- Add force param to login+registration
+
+### 4.1.1 (2014-06-17)
+
+- Fix batch adding bug
+
+
+### 4.1.0 (2014-06-16)
+
+- Include access to the Article View API
+
+### 4.0.0 (2014-04-03)
+
+- Support for Universal apps (dropped SL and WP7 support)
+
+### 3.2.0 (2014-03-13)
+
+- add raw JSON to each PocketItem (PR #22)
+
+### 3.1.1 (2014-02-23)
+
+- fix SendActions when sending _add_ requests (fixes #20)
+- try to normalize URIs retrieved in video array
+
+### 3.1.0 (2014-02-07)
+
+- Use FullTitle if no other title props are available
+- Default mobile authentication screen with toggle for desktop (fixes #17)
+- Use new registration endpoint
+
+### 3.0.2 (2013-12-27)
+
+- assign given_url to `Uri` when item couldn't be resolved by Pocket
+
+### 3.0.1 (2013-12-15)
+
+- added `PreRequest` to interface
+
+### 3.0.0 (2013-12-15)
+
+- `cancellationToken` support for all methods
+- Toggle inclusion of title in PocketArticle.Content
+- Make setters for inline objects in PocketItem (images, videos, ...)
+- IPocketClient interface
+- PreRequest callback allows injection of `Action<string>` before every request
+- `lastHeaders` and `lastRequestData` in PocketClient for better debugging
+- Submit multiple actions in one request with `SendActions`
+- New `IsVideo`, `IsImage` and `ResolvedId` as new properties in PocketItem
+- Split PocketReader into own NuGet package
+- A lot of bugfixes
+
+### 2.2.2 (2013-11-01)
+
+- Password validation in RegisterAccount
+
+### 2.2.1 (2013-10-27)
+
+- Fix NReadability parsing issue
+
+### 2.2.0 (2013-10-26)
+
+- Made `GetAccessCode` obsolete
+- Return username after authentication with `GetUser`
+
+### 2.1.0 (2013-10-25)
+
+- Rename `Statistics()` to `GetUserStatistics()`
+- Made `CallbackUri` public
+- Added Fody/PropertyChanged
+- Method `GetUsageLimits()` to retrieve API usage limits
+- Add PORTABLE constant to SgmlReader 
+
+### 2.0.1 (2013-10-19)
+
+- Catch HttpRequestExceptions and provide as InnerException for PocketException
+- Read Article from URI (method overload)
+
+### 2.0.0 (2013-10-17)
+
+- Add Reader API _(does not use the official Article View API, which is private. The PocketReader is based on a custom PCL port of NReadability and SgmlReader)_
+
+### 1.5.1 (2013-09-30) 
+
+- `RetrieveFilter.All` didn't work
+- improve search speed
+
+### 1.5.0 (2013-09-28) 
+
+- add statistics API
+- add registration API
+
+### 1.4.0 (2013-09-21) 
+
+- rename `Retrieve` to `Get`
+- update IntelliSense documentation
+- add `GetTags` method
+
+### 1.3.0 (2013-09-19) 
+
+- get Item by ID 
+- tag modification bugfixes
+
+### 1.2.1 (2013-09-18) 
+
+- correct parameter conversion for DateTime and Boolean
+
+### 1.2.0 (2013-09-17) 
+
+- simplified retrieve methods
+
+### 1.1.0 (2013-09-17) 
+
+- fix modification requests
+
+### 1.0.0 (2013-09-15) 
+
+- convert to PCL 
+- implement async
+
+### 0.3.2 (2013-08-16) 
+
+- tag modification fixed
+- full retrieval of items for Retrieve method
+
+### 0.3.1 (2013-07-07) 
+
+- authentication fixes
+
+### 0.3.0 (2013-07-02) 
+
+- update authentication process 
+
+### 0.2.0 (2013-06-27) 
+
+- add, modify item
+- modify tags
+
+### 0.1.0 (2013-06-26) 
+
+- authentication 
+- retrieve functionality

LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2013 cee, Tobias Klika
+Copyright (c) 2014 cee, Tobias Klika
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

PocketSharp.Examples/PocketSharp.WP8/App.xaml

@@ -0,0 +1,10 @@
+<Application x:Class="PocketSharp.WP8.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone" xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
+  <!--Application Resources-->
+  <Application.Resources>
+    <local:LocalizedStrings xmlns:local="clr-namespace:PocketSharp.WP8" x:Key="LocalizedStrings" />
+  </Application.Resources>
+  <Application.ApplicationLifetimeObjects>
+    <!--Required object that handles lifetime events for the application-->
+    <shell:PhoneApplicationService Launching="Application_Launching" Closing="Application_Closing" Activated="Application_Activated" Deactivated="Application_Deactivated" />
+  </Application.ApplicationLifetimeObjects>
+</Application>

PocketSharp.Examples/PocketSharp.WP8/App.xaml.cs

@@ -0,0 +1,246 @@
+using Microsoft.Phone.Controls;
+using Microsoft.Phone.Shell;
+using PocketSharp.WP8.Resources;
+using PocketSharp.WP8.ViewModels;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Markup;
+using System.Windows.Navigation;
+
+namespace PocketSharp.WP8
+{
+  public partial class App : Application
+  {
+    private static MainViewModel viewModel = null;
+
+    /// <summary>
+    /// A static ViewModel used by the views to bind against.
+    /// </summary>
+    /// <returns>The MainViewModel object.</returns>
+    public static MainViewModel ViewModel
+    {
+      get
+      {
+        // Delay creation of the view model until necessary
+        if (viewModel == null)
+          viewModel = new MainViewModel();
+
+        return viewModel;
+      }
+    }
+
+    /// <summary>
+    /// Provides easy access to the root frame of the Phone Application.
+    /// </summary>
+    /// <returns>The root frame of the Phone Application.</returns>
+    public static PhoneApplicationFrame RootFrame { get; private set; }
+
+    /// <summary>
+    /// Constructor for the Application object.
+    /// </summary>
+    public App()
+    {
+      // Global handler for uncaught exceptions.
+      UnhandledException += Application_UnhandledException;
+
+      // Standard XAML initialization
+      InitializeComponent();
+
+      // Phone-specific initialization
+      InitializePhoneApplication();
+
+      // Language display initialization
+      InitializeLanguage();
+
+      // Show graphics profiling information while debugging.
+      if (Debugger.IsAttached)
+      {
+        // Display the current frame rate counters.
+        Application.Current.Host.Settings.EnableFrameRateCounter = true;
+
+        // Show the areas of the app that are being redrawn in each frame.
+        //Application.Current.Host.Settings.EnableRedrawRegions = true;
+
+        // Enable non-production analysis visualization mode,
+        // which shows areas of a page that are handed off GPU with a colored overlay.
+        //Application.Current.Host.Settings.EnableCacheVisualization = true;
+
+        // Prevent the screen from turning off while under the debugger by disabling
+        // the application's idle detection.
+        // Caution:- Use this under debug mode only. Application that disables user idle detection will continue to run
+        // and consume battery power when the user is not using the phone.
+        PhoneApplicationService.Current.UserIdleDetectionMode = IdleDetectionMode.Disabled;
+      }
+    }
+
+    // Code to execute when the application is launching (eg, from Start)
+    // This code will not execute when the application is reactivated
+    private void Application_Launching(object sender, LaunchingEventArgs e)
+    {
+    }
+
+    // Code to execute when the application is activated (brought to foreground)
+    // This code will not execute when the application is first launched
+    private void Application_Activated(object sender, ActivatedEventArgs e)
+    {
+      // Ensure that application state is restored appropriately
+      if (!App.ViewModel.IsDataLoaded)
+      {
+        App.ViewModel.LoadData();
+      }
+    }
+
+    // Code to execute when the application is deactivated (sent to background)
+    // This code will not execute when the application is closing
+    private void Application_Deactivated(object sender, DeactivatedEventArgs e)
+    {
+      // Ensure that required application state is persisted here.
+    }
+
+    // Code to execute when the application is closing (eg, user hit Back)
+    // This code will not execute when the application is deactivated
+    private void Application_Closing(object sender, ClosingEventArgs e)
+    {
+    }
+
+    // Code to execute if a navigation fails
+    private void RootFrame_NavigationFailed(object sender, NavigationFailedEventArgs e)
+    {
+      if (Debugger.IsAttached)
+      {
+        // A navigation has failed; break into the debugger
+        Debugger.Break();
+      }
+    }
+
+    // Code to execute on Unhandled Exceptions
+    private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
+    {
+      if (Debugger.IsAttached)
+      {
+        // An unhandled exception has occurred; break into the debugger
+        Debugger.Break();
+      }
+    }
+
+    #region Phone application initialization
+
+    // Avoid double-initialization
+    private bool phoneApplicationInitialized = false;
+
+    // Do not add any additional code to this method
+    private void InitializePhoneApplication()
+    {
+      if (phoneApplicationInitialized)
+        return;
+
+      // Create the frame but don't set it as RootVisual yet; this allows the splash
+      // screen to remain active until the application is ready to render.
+      RootFrame = new PhoneApplicationFrame();
+      RootFrame.Navigated += CompleteInitializePhoneApplication;
+
+      // Handle navigation failures
+      RootFrame.NavigationFailed += RootFrame_NavigationFailed;
+
+      // Handle reset requests for clearing the backstack
+      RootFrame.Navigated += CheckForResetNavigation;
+
+      // Ensure we don't initialize again
+      phoneApplicationInitialized = true;
+    }
+
+    // Do not add any additional code to this method
+    private void CompleteInitializePhoneApplication(object sender, NavigationEventArgs e)
+    {
+      // Set the root visual to allow the application to render
+      if (RootVisual != RootFrame)
+        RootVisual = RootFrame;
+
+      // Remove this handler since it is no longer needed
+      RootFrame.Navigated -= CompleteInitializePhoneApplication;
+    }
+
+    private void CheckForResetNavigation(object sender, NavigationEventArgs e)
+    {
+      // If the app has received a 'reset' navigation, then we need to check
+      // on the next navigation to see if the page stack should be reset
+      if (e.NavigationMode == NavigationMode.Reset)
+        RootFrame.Navigated += ClearBackStackAfterReset;
+    }
+
+    private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)
+    {
+      // Unregister the event so it doesn't get called again
+      RootFrame.Navigated -= ClearBackStackAfterReset;
+
+      // Only clear the stack for 'new' (forward) and 'refresh' navigations
+      if (e.NavigationMode != NavigationMode.New && e.NavigationMode != NavigationMode.Refresh)
+        return;
+
+      // For UI consistency, clear the entire page stack
+      while (RootFrame.RemoveBackEntry() != null)
+      {
+        ; // do nothing
+      }
+    }
+
+    #endregion
+
+    // Initialize the app's font and flow direction as defined in its localized resource strings.
+    //
+    // To ensure that the font of your application is aligned with its supported languages and that the
+    // FlowDirection for each of those languages follows its traditional direction, ResourceLanguage
+    // and ResourceFlowDirection should be initialized in each resx file to match these values with that
+    // file's culture. For example:
+    //
+    // AppResources.es-ES.resx
+    //    ResourceLanguage's value should be "es-ES"
+    //    ResourceFlowDirection's value should be "LeftToRight"
+    //
+    // AppResources.ar-SA.resx
+    //     ResourceLanguage's value should be "ar-SA"
+    //     ResourceFlowDirection's value should be "RightToLeft"
+    //
+    // For more info on localizing Windows Phone apps see http://go.microsoft.com/fwlink/?LinkId=262072.
+    //
+    private void InitializeLanguage()
+    {
+      try
+      {
+        // Set the font to match the display language defined by the
+        // ResourceLanguage resource string for each supported language.
+        //
+        // Fall back to the font of the neutral language if the Display
+        // language of the phone is not supported.
+        //
+        // If a compiler error is hit then ResourceLanguage is missing from
+        // the resource file.
+        RootFrame.Language = XmlLanguage.GetLanguage(AppResources.ResourceLanguage);
+
+        // Set the FlowDirection of all elements under the root frame based
+        // on the ResourceFlowDirection resource string for each
+        // supported language.
+        //
+        // If a compiler error is hit then ResourceFlowDirection is missing from
+        // the resource file.
+        FlowDirection flow = (FlowDirection)Enum.Parse(typeof(FlowDirection), AppResources.ResourceFlowDirection);
+        RootFrame.FlowDirection = flow;
+      }
+      catch
+      {
+        // If an exception is caught here it is most likely due to either
+        // ResourceLangauge not being correctly set to a supported language
+        // code or ResourceFlowDirection is set to a value other than LeftToRight
+        // or RightToLeft.
+
+        if (Debugger.IsAttached)
+        {
+          Debugger.Break();
+        }
+
+        throw;
+      }
+    }
+  }
+}

PocketSharp.Examples/PocketSharp.WP8/DetailsPage.xaml

@@ -0,0 +1,44 @@
+<phone:PhoneApplicationPage
+    x:Class="PocketSharp.WP8.DetailsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DataContext="{d:DesignData SampleData/MainViewModelSampleData.xaml}"
+    mc:Ignorable="d"
+    FontFamily="{StaticResource PhoneFontFamilyNormal}"
+    FontSize="{StaticResource PhoneFontSizeNormal}"
+    Foreground="{StaticResource PhoneForegroundBrush}"
+    SupportedOrientations="Portrait"  Orientation="Portrait"
+    shell:SystemTray.IsVisible="True">
+
+    <!--Data context is set to sample data above and first item in sample data collection below and LayoutRoot contains the root grid where all other page content is placed-->
+    <Grid x:Name="LayoutRoot" Background="Transparent" d:DataContext="{Binding Items[0]}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!--TitlePanel contains the name of the application and page title-->
+        <StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,17,0,28">
+            <TextBlock Text="MY APPLICATION" Style="{StaticResource PhoneTextNormalStyle}"/>
+            <TextBlock Text="{Binding LineOne}" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
+        </StackPanel>
+
+        <!--ContentPanel contains details text. Place additional content here-->
+        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
+            <TextBlock Text="{Binding LineThree}" TextWrapping="Wrap" Style="{StaticResource PhoneTextNormalStyle}"/>
+        </Grid>
+
+        <!--Uncomment to see an alignment grid to help ensure your controls are
+            aligned on common boundaries.  The image has a top margin of -32px to
+            account for the System Tray. Set this to 0 (or remove the margin altogether)
+            if the System Tray is hidden.
+
+            Before shipping remove this XAML and the image itself.-->
+        <!--<Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" />-->
+    </Grid>
+
+</phone:PhoneApplicationPage>

PocketSharp.Examples/PocketSharp.WP8/DetailsPage.xaml.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+using Microsoft.Phone.Controls;
+using Microsoft.Phone.Shell;
+using PocketSharp.WP8.Resources;
+
+namespace PocketSharp.WP8
+{
+  public partial class DetailsPage : PhoneApplicationPage
+  {
+    // Constructor
+    public DetailsPage()
+    {
+      InitializeComponent();
+
+      // Sample code to localize the ApplicationBar
+      //BuildLocalizedApplicationBar();
+    }
+
+    // When page is navigated to set data context to selected item in list
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+      if (DataContext == null)
+      {
+        string selectedIndex = "";
+        if (NavigationContext.QueryString.TryGetValue("selectedItem", out selectedIndex))
+        {
+          int index = int.Parse(selectedIndex);
+          DataContext = App.ViewModel.Items[index];
+        }
+      }
+    }
+
+    // Sample code for building a localized ApplicationBar
+    //private void BuildLocalizedApplicationBar()
+    //{
+    //    // Set the page's ApplicationBar to a new instance of ApplicationBar.
+    //    ApplicationBar = new ApplicationBar();
+
+    //    // Create a new button and set the text value to the localized string from AppResources.
+    //    ApplicationBarIconButton appBarButton = new ApplicationBarIconButton(new Uri("/Assets/AppBar/appbar.add.rest.png", UriKind.Relative));
+    //    appBarButton.Text = AppResources.AppBarButtonText;
+    //    ApplicationBar.Buttons.Add(appBarButton);
+
+    //    // Create a new menu item with the localized string from AppResources.
+    //    ApplicationBarMenuItem appBarMenuItem = new ApplicationBarMenuItem(AppResources.AppBarMenuItemText);
+    //    ApplicationBar.MenuItems.Add(appBarMenuItem);
+    //}
+  }
+}

PocketSharp.Examples/PocketSharp.WP8/LocalizedStrings.cs

@@ -0,0 +1,14 @@
+using PocketSharp.WP8.Resources;
+
+namespace PocketSharp.WP8
+{
+  /// <summary>
+  /// Provides access to string resources.
+  /// </summary>
+  public class LocalizedStrings
+  {
+    private static AppResources _localizedResources = new AppResources();
+
+    public AppResources LocalizedResources { get { return _localizedResources; } }
+  }
+}

PocketSharp.Examples/PocketSharp.WP8/MainPage.xaml

@@ -0,0 +1,46 @@
+<phone:PhoneApplicationPage
+    x:Class="PocketSharp.WP8.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    d:DataContext="{d:DesignData SampleData/MainViewModelSampleData.xaml}"
+    FontFamily="{StaticResource PhoneFontFamilyNormal}"
+    FontSize="{StaticResource PhoneFontSizeNormal}"
+    Foreground="{StaticResource PhoneForegroundBrush}"
+    SupportedOrientations="Portrait"  Orientation="Portrait"
+    shell:SystemTray.IsVisible="True">
+
+  <!--Data context is set to sample data above and LayoutRoot contains the root grid where all other page content is placed-->
+  <Grid x:Name="LayoutRoot" Background="Transparent">
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="*"/>
+    </Grid.RowDefinitions>
+
+    <!--TitlePanel contains the name of the application and page title-->
+    <StackPanel Grid.Row="0" Margin="12,17,0,28">
+      <TextBlock Text="MY APPLICATION" Style="{StaticResource PhoneTextNormalStyle}"/>
+      <TextBlock Text="page name" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
+      <Button Click="Button_Click">Load Data</Button>
+    </StackPanel>
+
+    <!--ContentPanel contains LongListSelector and LongListSelector ItemTemplate. Place additional content here-->
+    <Grid x:Name="ContentPanel" Grid.Row="1" Margin="12,0,12,0">
+      <phone:LongListSelector x:Name="MainLongListSelector" Margin="0,0,-12,0" ItemsSource="{Binding Items}" SelectionChanged="MainLongListSelector_SelectionChanged">
+        <phone:LongListSelector.ItemTemplate>
+          <DataTemplate>
+            <StackPanel Margin="0,0,0,17">
+              <TextBlock Text="{Binding LineOne}" TextWrapping="Wrap" Style="{StaticResource PhoneTextExtraLargeStyle}"/>
+              <TextBlock Text="{Binding LineTwo}" TextWrapping="Wrap" Margin="12,-6,12,0" Style="{StaticResource PhoneTextSubtleStyle}"/>
+            </StackPanel>
+          </DataTemplate>
+        </phone:LongListSelector.ItemTemplate>
+      </phone:LongListSelector>
+    </Grid>
+  </Grid>
+
+</phone:PhoneApplicationPage>

PocketSharp.Examples/PocketSharp.WP8/MainPage.xaml.cs

@@ -0,0 +1,46 @@
+using Microsoft.Phone.Controls;
+using PocketSharp.WP8.ViewModels;
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+
+namespace PocketSharp.WP8
+{
+  public partial class MainPage : PhoneApplicationPage
+  {
+    // Constructor
+    public MainPage()
+    {
+      InitializeComponent();
+
+      // Set the data context of the LongListSelector control to the sample data
+      DataContext = App.ViewModel;
+    }
+
+    // Load data for the ViewModel Items
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+
+    }
+
+    // Handle selection changed on LongListSelector
+    private void MainLongListSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+      // If selected item is null (no selection) do nothing
+      if (MainLongListSelector.SelectedItem == null)
+        return;
+
+      // Navigate to the new page
+      NavigationService.Navigate(new Uri("/DetailsPage.xaml?selectedItem=" + (MainLongListSelector.SelectedItem as ItemViewModel).ID, UriKind.Relative));
+
+      // Reset selected item to null (no selection)
+      MainLongListSelector.SelectedItem = null;
+    }
+
+    private async void Button_Click(object sender, RoutedEventArgs e)
+    {
+      await App.ViewModel.LoadData();
+    }
+  }
+}

PocketSharp.Examples/PocketSharp.WP8/PocketSharp.WP8.csproj

@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{47721A56-2128-4C5A-8B92-995FFC353304}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PocketSharp.WP8</RootNamespace>
+    <AssemblyName>PocketSharp.WP8</AssemblyName>
+    <TargetFrameworkIdentifier>WindowsPhone</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>PocketSharp.WP8_$(Configuration)_$(Platform).xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>PocketSharp.WP8.App</SilverlightAppEntry>
+    <ValidateXaml>true</ValidateXaml>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\x86\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\x86\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\ARM\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\ARM\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="LocalizedStrings.cs" />
+    <Compile Include="DetailsPage.xaml.cs">
+      <DependentUpon>DetailsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resources\AppResources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>AppResources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="ViewModels\ItemViewModel.cs" />
+    <Compile Include="ViewModels\MainViewModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+    <Page Include="DetailsPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <DesignData Include="SampleData\MainViewModelSampleData.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </DesignData>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+    <None Include="Properties\AppManifest.xml" />
+    <None Include="Properties\WMAppManifest.xml">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\AlignmentGrid.png" />
+    <Content Include="Assets\ApplicationIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\FlipCycleTileLarge.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\FlipCycleTileMedium.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\FlipCycleTileSmall.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\IconicTileMediumLarge.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\IconicTileSmall.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\AppResources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\PocketSharp\PocketSharp.csproj">
+      <Project>{817200C3-A327-4E35-9B5F-63A51C088577}</Project>
+      <Name>PocketSharp</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Threading.Tasks">
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.16\lib\wp8\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.16\lib\wp8\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Phone">
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.16\lib\wp8\Microsoft.Threading.Tasks.Extensions.Phone.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.18\lib\sl4-windowsphone71\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.18\lib\sl4-windowsphone71\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives, Version=1.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.18\lib\sl4-windowsphone71\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
+</Project>

PocketSharp.Examples/PocketSharp.WP8/Properties/AppManifest.xml

@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>

PocketSharp.Examples/PocketSharp.WP8/Properties/AssemblyInfo.cs

@@ -0,0 +1,37 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Resources;
+
+// 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("PocketSharp.WP8")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PocketSharp.WP8")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d4c30306-fbff-4433-8299-ecb70af9cfb6")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguageAttribute("en-US")]

PocketSharp.Examples/PocketSharp.WP8/Properties/WMAppManifest.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
+  <DefaultLanguage xmlns="" code="en-US"/>
+  <App xmlns="" ProductID="{47721a56-2128-4c5a-8b92-995ffc353304}" Title="PocketSharp.WP8" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal"  Author="PocketSharp.WP8 author" Description="Sample description" Publisher="PocketSharp.WP8" PublisherID="{d8449fc0-02fe-4be1-b0a5-3fd20d58264c}">
+    <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
+    <Capabilities>
+      <Capability Name="ID_CAP_NETWORKING"/>
+      <Capability Name="ID_CAP_MEDIALIB_AUDIO"/>
+      <Capability Name="ID_CAP_MEDIALIB_PLAYBACK"/>
+      <Capability Name="ID_CAP_SENSORS"/>
+      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT"/>
+    </Capabilities>
+    <Tasks>
+      <DefaultTask  Name ="_default" NavigationPage="MainPage.xaml"/>
+    </Tasks>
+    <Tokens>
+      <PrimaryToken TokenID="PocketSharp.WP8Token" TaskName="_default">
+        <TemplateFlip>
+          <SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileSmall.png</SmallImageURI>
+          <Count>0</Count>
+          <BackgroundImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileMedium.png</BackgroundImageURI>
+          <Title>PocketSharp.WP8</Title>
+          <BackContent></BackContent>
+          <BackBackgroundImageURI></BackBackgroundImageURI>
+          <BackTitle></BackTitle>
+          <DeviceLockImageURI></DeviceLockImageURI>
+          <HasLarge></HasLarge>
+        </TemplateFlip>
+      </PrimaryToken>
+    </Tokens>
+    <ScreenResolutions>
+      <ScreenResolution Name="ID_RESOLUTION_WVGA"/>
+      <ScreenResolution Name="ID_RESOLUTION_WXGA"/>
+      <ScreenResolution Name="ID_RESOLUTION_HD720P"/>
+    </ScreenResolutions>
+  </App>
+</Deployment>

PocketSharp.Examples/PocketSharp.WP8/Resources/AppResources.Designer.cs

@@ -0,0 +1,138 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.17626
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PocketSharp.WP8.Resources
+{
+  using System;
+
+
+  /// <summary>
+  ///   A strongly-typed resource class, for looking up localized strings, etc.
+  /// </summary>
+  // This class was auto-generated by the StronglyTypedResourceBuilder
+  // class via a tool like ResGen or Visual Studio.
+  // To add or remove a member, edit your .ResX file then rerun ResGen
+  // with the /str option, or rebuild your VS project.
+  [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+  [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+  [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+  public class AppResources
+  {
+
+    private static global::System.Resources.ResourceManager resourceMan;
+
+    private static global::System.Globalization.CultureInfo resourceCulture;
+
+    [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    internal AppResources()
+    {
+    }
+
+    /// <summary>
+    ///   Returns the cached ResourceManager instance used by this class.
+    /// </summary>
+    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+    public static global::System.Resources.ResourceManager ResourceManager
+    {
+      get
+      {
+        if (object.ReferenceEquals(resourceMan, null))
+        {
+          global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PocketSharp.WP8.Resources.AppResources", typeof(AppResources).Assembly);
+          resourceMan = temp;
+        }
+        return resourceMan;
+      }
+    }
+
+    /// <summary>
+    ///   Overrides the current thread's CurrentUICulture property for all
+    ///   resource lookups using this strongly typed resource class.
+    /// </summary>
+    [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+    public static global::System.Globalization.CultureInfo Culture
+    {
+      get
+      {
+        return resourceCulture;
+      }
+      set
+      {
+        resourceCulture = value;
+      }
+    }
+
+    /// <summary>
+    ///   Looks up a localized string similar to LeftToRight.
+    /// </summary>
+    public static string ResourceFlowDirection
+    {
+      get
+      {
+        return ResourceManager.GetString("ResourceFlowDirection", resourceCulture);
+      }
+    }
+
+    /// <summary>
+    ///   Looks up a localized string similar to us-EN.
+    /// </summary>
+    public static string ResourceLanguage
+    {
+      get
+      {
+        return ResourceManager.GetString("ResourceLanguage", resourceCulture);
+      }
+    }
+
+    /// <summary>
+    ///   Looks up a localized string similar to MY APPLICATION.
+    /// </summary>
+    public static string ApplicationTitle
+    {
+      get
+      {
+        return ResourceManager.GetString("ApplicationTitle", resourceCulture);
+      }
+    }
+
+    /// <summary>
+    ///   Looks up a localized string similar to Sample Runtime Property Value.
+    /// </summary>
+    public static string SampleProperty
+    {
+      get
+      {
+        return ResourceManager.GetString("SampleProperty", resourceCulture);
+      }
+    }
+
+    /// <summary>
+    ///   Looks up a localized string similar to button text.
+    /// </summary>
+    public static string AppBarButtonText
+    {
+      get
+      {
+        return ResourceManager.GetString("AppBarButtonText", resourceCulture);
+      }
+    }
+
+    /// <summary>
+    ///   Looks up a localized string similar to menu item.
+    /// </summary>
+    public static string AppBarMenuItemText
+    {
+      get
+      {
+        return ResourceManager.GetString("AppBarMenuItemText", resourceCulture);
+      }
+    }
+  }
+}

PocketSharp.Examples/PocketSharp.WP8/Resources/AppResources.resx

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ResourceFlowDirection" xml:space="preserve">
+    <value>LeftToRight</value>
+    <comment>Controls the FlowDirection for all elements in the RootFrame. Set to the traditional direction of this resource file's language</comment>
+  </data>
+  <data name="ResourceLanguage" xml:space="preserve">
+    <value>en-US</value>
+    <comment>Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language.</comment>
+  </data>
+  <data name="ApplicationTitle" xml:space="preserve">
+    <value>MY APPLICATION</value>
+  </data>
+  <data name="SampleProperty" xml:space="preserve">
+    <value>Sample Runtime Property Value</value>
+  </data>
+  <data name="AppBarButtonText" xml:space="preserve">
+    <value>add</value>
+  </data>
+  <data name="AppBarMenuItemText" xml:space="preserve">
+    <value>Menu Item</value>
+  </data>
+</root>

PocketSharp.Examples/PocketSharp.WP8/SampleData/MainViewModelSampleData.xaml

@@ -0,0 +1,16 @@
+<vm:MainViewModel
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="clr-namespace:PocketSharp.WP8.ViewModels"
+    SampleProperty="Sample Text Property Value">
+
+    <vm:MainViewModel.Items>
+        <vm:ItemViewModel ID="0" LineOne="design one" LineTwo="Maecenas praesent accumsan bibendum" LineThree="Maecenas praesent accumsan bibendum dictumst eleifend facilisi faucibus habitant inceptos interdum lobortis nascetur"/>
+        <vm:ItemViewModel ID="1" LineOne="design two" LineTwo="Dictumst eleifend facilisi faucibus" LineThree="Pharetra placerat pulvinar sagittis senectus sociosqu suscipit torquent ultrices vehicula volutpat maecenas praesent"/>
+        <vm:ItemViewModel ID="2" LineOne="design three" LineTwo="Habitant inceptos interdum lobortis" LineThree="Accumsan bibendum dictumst eleifend facilisi faucibus habitant inceptos interdum lobortis nascetur pharetra placerat"/>
+        <vm:ItemViewModel ID="3" LineOne="design four" LineTwo="Nascetur pharetra placerat pulvinar" LineThree="Pulvinar sagittis senectus sociosqu suscipit torquent ultrices vehicula volutpat maecenas praesent accumsan bibendum"/>
+        <vm:ItemViewModel ID="4" LineOne="design five" LineTwo="Sagittis senectus sociosqu suscipit" LineThree="Dictumst eleifend facilisi faucibus habitant inceptos interdum lobortis nascetur pharetra placerat pulvinar sagittis"/>
+        <vm:ItemViewModel ID="5" LineOne="design six" LineTwo="Torquent ultrices vehicula volutpat" LineThree="Senectus sociosqu suscipit torquent ultrices vehicula volutpat maecenas praesent accumsan bibendum dictumst eleifend"/>
+    </vm:MainViewModel.Items>
+
+</vm:MainViewModel>

PocketSharp.Examples/PocketSharp.WP8/ViewModels/ItemViewModel.cs

@@ -0,0 +1,109 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+
+namespace PocketSharp.WP8.ViewModels
+{
+  public class ItemViewModel : INotifyPropertyChanged
+  {
+    private string _id;
+    /// <summary>
+    /// Sample ViewModel property; this property is used to identify the object.
+    /// </summary>
+    /// <returns></returns>
+    public string ID
+    {
+      get
+      {
+        return _id;
+      }
+      set
+      {
+        if (value != _id)
+        {
+          _id = value;
+          NotifyPropertyChanged("ID");
+        }
+      }
+    }
+
+    private string _lineOne;
+    /// <summary>
+    /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+    /// </summary>
+    /// <returns></returns>
+    public string LineOne
+    {
+      get
+      {
+        return _lineOne;
+      }
+      set
+      {
+        if (value != _lineOne)
+        {
+          _lineOne = value;
+          NotifyPropertyChanged("LineOne");
+        }
+      }
+    }
+
+    private string _lineTwo;
+    /// <summary>
+    /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+    /// </summary>
+    /// <returns></returns>
+    public string LineTwo
+    {
+      get
+      {
+        return _lineTwo;
+      }
+      set
+      {
+        if (value != _lineTwo)
+        {
+          _lineTwo = value;
+          NotifyPropertyChanged("LineTwo");
+        }
+      }
+    }
+
+    private string _lineThree;
+    /// <summary>
+    /// Sample ViewModel property; this property is used in the view to display its value using a Binding.
+    /// </summary>
+    /// <returns></returns>
+    public string LineThree
+    {
+      get
+      {
+        return _lineThree;
+      }
+      set
+      {
+        if (value != _lineThree)
+        {
+          _lineThree = value;
+          NotifyPropertyChanged("LineThree");
+        }
+      }
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+    private void NotifyPropertyChanged(String propertyName)
+    {
+      PropertyChangedEventHandler handler = PropertyChanged;
+      if (null != handler)
+      {
+        handler(this, new PropertyChangedEventArgs(propertyName));
+      }
+    }
+  }
+}

PocketSharp.Examples/PocketSharp.WP8/ViewModels/MainViewModel.cs

@@ -0,0 +1,108 @@
+using PocketSharp.WP8.Resources;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Linq;
+
+namespace PocketSharp.WP8.ViewModels
+{
+  public class MainViewModel : INotifyPropertyChanged
+  {
+    public MainViewModel()
+    {
+      this.Items = new ObservableCollection<ItemViewModel>();
+    }
+
+    /// <summary>
+    /// A collection for ItemViewModel objects.
+    /// </summary>
+    public ObservableCollection<ItemViewModel> Items { get; private set; }
+
+    private string _sampleProperty = "Sample Runtime Property Value";
+    /// <summary>
+    /// Sample ViewModel property; this property is used in the view to display its value using a Binding
+    /// </summary>
+    /// <returns></returns>
+    public string SampleProperty
+    {
+      get
+      {
+        return _sampleProperty;
+      }
+      set
+      {
+        if (value != _sampleProperty)
+        {
+          _sampleProperty = value;
+          NotifyPropertyChanged("SampleProperty");
+        }
+      }
+    }
+
+    /// <summary>
+    /// Sample property that returns a localized string
+    /// </summary>
+    public string LocalizedSampleProperty
+    {
+      get
+      {
+        return AppResources.SampleProperty;
+      }
+    }
+
+    public bool IsDataLoaded
+    {
+      get;
+      private set;
+    }
+
+    /// <summary>
+    /// Creates and adds a few ItemViewModel objects into the Items collection.
+    /// </summary>
+    public async Task LoadData()
+    {
+      // !! please don't misuse this account !!
+      PocketClient client = new PocketClient(
+        consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
+        callbackUri: "http://frontendplay.com",
+        accessCode: "80acf6c5-c198-03c0-b94c-e74402"
+      );
+
+      List<PocketSharp.Models.PocketItem> items = null;
+
+      try
+      {
+        items = (await client.Get()).ToList();
+
+        items.ForEach(item =>
+        {
+          this.Items.Add(new ItemViewModel()
+          {
+            ID = item.ID.ToString(),
+            LineOne = item.Title,
+            LineTwo = item.Uri.ToString()
+          });
+        });
+      }
+      catch (PocketException ex)
+      {
+        Debug.WriteLine(ex.Message);
+      }
+
+      this.IsDataLoaded = true;
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+    private void NotifyPropertyChanged(String propertyName)
+    {
+      PropertyChangedEventHandler handler = PropertyChanged;
+      if (null != handler)
+      {
+        handler(this, new PropertyChangedEventArgs(propertyName));
+      }
+    }
+  }
+}

PocketSharp.Examples/PocketSharp.WP8/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.7.0" newVersion="2.6.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.7.0" newVersion="2.6.7.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

PocketSharp.Examples/PocketSharp.WP8/packages.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.1.6" targetFramework="wp80" />
+  <package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="wp80" />
+  <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="wp80" />
+</packages>

PocketSharp.Examples/PocketSharp.Wpf/App.xaml

@@ -0,0 +1,8 @@
+<Application x:Class="PocketSharp.Wpf.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+
+    </Application.Resources>
+</Application>

PocketSharp.Examples/PocketSharp.Wpf/App.xaml.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace PocketSharp.Wpf
+{
+  /// <summary>
+  /// Interaction logic for App.xaml
+  /// </summary>
+  public partial class App : Application
+  {
+  }
+}

PocketSharp.Examples/PocketSharp.Wpf/MainWindow.xaml

@@ -0,0 +1,18 @@
+<Window x:Class="PocketSharp.Wpf.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="MainWindow" Height="443" Width="591">
+    <Grid>
+    	<Button Content="Button" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="75" Click="Button_Click" RenderTransformOrigin="0.547,0.566"/>
+     <ListView ItemsSource="{Binding Sites}" HorizontalAlignment="Left" Height="349" Margin="10,51,0,0" VerticalAlignment="Top" Width="561">
+    		<ListView.View>
+    			<GridView>
+          <GridViewColumn Width="160" Header="URL" DisplayMemberBinding="{Binding Url}" />
+          <GridViewColumn Width="401" Header="Content" DisplayMemberBinding="{Binding Content}" />
+    			</GridView>
+    		</ListView.View>
+    	</ListView>
+
+    </Grid>
+</Window>

PocketSharp.Examples/PocketSharp.Wpf/MainWindow.xaml.cs

@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Windows;
+using System.Linq;
+
+namespace PocketSharp.Wpf
+{
+  /// <summary>
+  /// Interaction logic for MainWindow.xaml
+  /// </summary>
+  public partial class MainWindow : Window
+  {
+    ObservableCollection<Site> _Sites = new ObservableCollection<Site>();
+
+    public ObservableCollection<Site> Sites { get { return _Sites; } }
+
+    public class Site
+    {
+      public string Url { get; set; }
+      public string Content { get; set; }
+    }
+
+
+    public MainWindow()
+    {
+      InitializeComponent();
+    }
+
+
+    private async void Button_Click(object sender, RoutedEventArgs e)
+    {
+      // !! please don't misuse this account !!
+      PocketClient client = new PocketClient(
+        consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
+        callbackUri: "http://frontendplay.com",
+        accessCode: "80acf6c5-c198-03c0-b94c-e74402"
+      );
+
+      List<PocketSharp.Models.PocketItem> items = null;
+
+      try
+      {
+        items = (await client.Get()).ToList();
+
+        items.ForEach(item =>
+        {
+          Sites.Add(new Site()
+          {
+            Content = item.Title,
+            Url = item.Uri.ToString()
+          });
+        });
+      }
+      catch (PocketException ex)
+      {
+        Debug.Write(ex.Message);
+      }
+    }
+  }
+}

PocketSharp.Examples/PocketSharp.Wpf/PocketSharp.Wpf.csproj

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{775569C2-987F-4AC4-8BA5-A315A21ED1B7}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PocketSharp.Wpf</RootNamespace>
+    <AssemblyName>PocketSharp.Wpf</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net45\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.165\lib\net45\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions, Version=2.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.18\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives, Version=4.2.18.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Net.Http.2.2.18\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="Site.cs" />
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\PocketSharp\PocketSharp.csproj">
+      <Project>{817200c3-a327-4e35-9b5f-63a51c088577}</Project>
+      <Name>PocketSharp</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.13\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

PocketSharp.Examples/PocketSharp.Wpf/Properties/AssemblyInfo.cs

@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 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("PocketSharp.Wpf")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PocketSharp.Wpf")]
+[assembly: AssemblyCopyright("Copyright ©  2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+  //(used if a resource is not found in the page,
+  // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+  //(used if a resource is not found in the page,
+  // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

PocketSharp.Examples/PocketSharp.Wpf/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18213
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PocketSharp.Wpf.Properties {
+    using System;
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PocketSharp.Wpf.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

PocketSharp.Examples/PocketSharp.Wpf/Properties/Resources.resx

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

PocketSharp.Examples/PocketSharp.Wpf/Properties/Settings.Designer.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.18213
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PocketSharp.Wpf.Properties {
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}

PocketSharp.Examples/PocketSharp.Wpf/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

PocketSharp.Examples/PocketSharp.Wpf/Site.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PocketSharp.Wpf
+{
+  public class Site
+  {
+    public string Url { get; set; }
+    public string Content { get; set; }
+  }
+}

PocketSharp.Examples/PocketSharp.Wpf/app.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.18.0" newVersion="4.2.18.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

PocketSharp.Examples/PocketSharp.Wpf/packages.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.1.6" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Async" version="1.0.165" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.13" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.18" targetFramework="net45" />
+</packages>

PocketSharp.Tests/AccountTests.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace PocketSharp.Tests
+{
+  public class AccountTests : TestsBase
+  {
+    public AccountTests() : base() { }
+
+
+    [Fact]
+    public async Task IsRegistrationURLSuccessfullyCreated()
+    {
+      string requestCode = await client.GetRequestCode();
+
+      Uri uri = client.GenerateRegistrationUri(requestCode);
+
+      Assert.True(uri.OriginalString.Contains(requestCode));
+      Assert.True(uri.OriginalString.Contains("force=signup"));
+    }
+  }
+}

PocketSharp.Tests/AddTests.cs

@@ -0,0 +1,125 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+using System.Linq;
+
+namespace PocketSharp.Tests
+{
+  public class AddTests : TestsBase
+  {
+    public AddTests() : base() { }
+
+
+    [Fact]
+    public async Task AddSimpleItemWithUriOnly()
+    {
+      var uri = new Uri("http://frontendplay.com");
+
+      PocketItem item = await client.Add(uri);
+
+      Assert.Equal<Uri>(uri, item.Uri);
+
+      itemsToDelete.Add(item.ID);
+    }
+
+
+    [Fact]
+    public async Task ItemWithInstableImagesIsAdded()
+    {
+      var uri = new Uri("http://www.valoronline.com.br");
+
+      PocketItem item = await client.Add(uri);
+
+      Assert.NotNull(item);
+
+      itemsToDelete.Add(item.ID);
+    }
+
+
+    [Fact]
+    public async Task AddComplexItem()
+    {
+      PocketItem item = await client.Add(
+        uri: new Uri("http://frontendplay.com"),
+        tags: new string[] { "blog", "frontend", "cee" },
+        title: "ignored title",
+        tweetID: "380051788172632065"
+      );
+
+      List<PocketItem> items = (await client.Get()).ToList();
+      PocketItem itemDesired = null;
+
+      items.ForEach(itm =>
+      {
+        if (itm.ID == item.ID)
+        {
+          itemDesired = itm;
+        }
+      });
+
+      Assert.NotNull(itemDesired);
+      Assert.Equal(itemDesired.ID, item.ID);
+      Assert.Equal(itemDesired.Tags.Count(), 3);
+
+      itemsToDelete.Add(item.ID);
+    }
+
+
+    [Fact]
+    public async Task ItemViaActionsIsAdded()
+    {
+      List<PocketAction> actions = new List<PocketAction>();
+
+      actions.Add(new PocketAction()
+      {
+        Uri = new Uri("http://frontendplay.com/story/4015/string-indexer-for-text-resources-in-nancy"),
+        Action = "add",
+        Time = DateTime.Now
+      });
+
+      bool success = await client.SendActions(actions);
+
+      Assert.True(success);
+
+      IEnumerable<PocketItem> items = await client.Search("in nancy");
+
+      Assert.NotNull(items);
+      Assert.True(items.Count() > 0);
+
+      itemsToDelete.Add(items.First().ID);
+    }
+
+
+    [Fact]
+    public async Task ItemsViaActionsIsAdded()
+    {
+      List<PocketAction> actions = new List<PocketAction>();
+
+      actions.Add(new PocketAction()
+      {
+        Uri = new Uri("http://frontendplay.com/story/4015/string-indexer-for-text-resources-in-nancy"),
+        Action = "add",
+        Time = DateTime.Now
+      });
+      actions.Add(new PocketAction()
+      {
+        Uri = new Uri("http://frontendplay.com/story/4013/build-a-custom-razor-viewbase-in-nancy"),
+        Action = "add",
+        Time = DateTime.Now
+      });
+
+      bool success = await client.SendActions(actions);
+
+      Assert.True(success);
+
+      IEnumerable<PocketItem> items = await client.Search("in nancy");
+
+      Assert.NotNull(items);
+      Assert.True(items.Count() == 2);
+
+      itemsToDelete.AddRange(items.Select(item => item.ID));
+    }
+  }
+}

PocketSharp.Tests/GetTests.cs

@@ -0,0 +1,306 @@
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Schema;
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+using System.Linq;
+
+namespace PocketSharp.Tests
+{
+  public class GetTests : TestsBase
+  {
+    public GetTests() : base() { }
+
+
+    [Fact]
+    public async Task AreItemsRetrieved()
+    {
+      List<PocketItem> items = (await client.Get()).ToList();
+      Assert.True(items.Count > 0);
+    }
+
+
+    [Fact]
+    public async Task IsItemRetrievedById()
+    {
+      List<PocketItem> items = (await client.Get()).ToList();
+      PocketItem item = items[0];
+      PocketItem itemDuplicate = await client.Get(item.ID);
+
+      Assert.True(item.ID == itemDuplicate.ID);
+      Assert.True(item.Uri == itemDuplicate.Uri);
+    }
+
+//    [Fact]
+//    public async Task IsItemJsonPopulated()
+//    {
+//      List<PocketItem> items = (await client.Get()).ToList();
+//      string schemaJson = @"{
+//                'description': 'PocketItem',
+//                'type': 'object'
+//                }";
+
+//      JsonSchema schema = JsonSchema.Parse(schemaJson);
+//      foreach (var pocketItem in items)
+//      {
+//        Assert.True(!string.IsNullOrWhiteSpace(pocketItem.Json));
+//        var jObject = JObject.Parse(pocketItem.Json);
+//        Assert.True(jObject.IsValid(schema));
+//      }
+//    }
+
+    [Fact]
+    public async Task AreFilteredItemsRetrieved()
+    {
+      IEnumerable<PocketItem> items = await client.Get(RetrieveFilter.Favorite);
+
+      Assert.True(items.Count() > 0);
+    }
+
+
+    [Fact]
+    public async Task RetrieveWithMultipleFilters()
+    {
+      IEnumerable<PocketItem> items = await client.Get(
+        state: State.unread,
+        tag: "pocket",
+        sort: Sort.title,
+        since: new DateTime(2010, 12, 10),
+        count: 2
+      );
+
+      Assert.InRange<int>(items.Count(), 0, 2);
+    }
+
+
+    [Fact]
+    public async Task ItemContainsUri()
+    {
+      IEnumerable<PocketItem> items = await client.Get(count: 1);
+
+      Assert.True(items.Count() == 1);
+      Assert.True(items.First().Uri.ToString().StartsWith("http"));
+    }
+
+
+    [Fact]
+    public async Task InvalidRetrievalReturnsNoResults()
+    {
+      IEnumerable<PocketItem> items = await client.Get(
+        favorite: true,
+        search: "xoiu987a#;"
+      );
+
+      Assert.False(items.Count() > 0);
+
+      PocketItem item = await client.Get("99999999");
+
+      Assert.Null(item);
+
+      items = await client.Get(RetrieveFilter.Video);
+
+      Assert.False(items.Count() > 0);
+    }
+
+
+    [Fact]
+    public async Task SearchReturnsResult()
+    {
+      IEnumerable<PocketItem> items = await client.Search("pocket");
+
+      Assert.True(items.Count() > 0);
+      Assert.True(items.First().FullTitle.ToLower().Contains("pocket"));
+    }
+
+
+    [Fact]
+    public async Task InvalidSearchReturnsNoResult()
+    {
+      IEnumerable<PocketItem> items = await client.Search("adsüasd-opiu2;.398dfyx");
+
+      Assert.False(items.Count() > 0);
+    }
+
+
+    [Fact]
+    public async Task RetrieveTagsReturnsResult()
+    {
+      IEnumerable<PocketTag> items = await client.GetTags();
+
+      Assert.True(items.Count() > 0);
+    }
+
+
+    [Fact]
+    public async Task SearchByTagsReturnsResult()
+    {
+      IEnumerable<PocketItem> items = await client.SearchByTag("pocket");
+
+      Assert.True(items.Count() == 1);
+
+      bool found = false;
+
+      items.First().Tags.ToList().ForEach(tag =>
+      {
+        if (tag.Name.Contains("pocket"))
+        {
+          found = true;
+        }
+      });
+
+      Assert.True(found);
+    }
+
+
+    [Fact]
+    public async Task InvalidSearchByTagsReturnsNoResult()
+    {
+      IEnumerable<PocketItem> items = await client.SearchByTag("adsüasd-opiu2;.398dfyx");
+
+      Assert.False(items.Count() > 0);
+    }
+
+
+    [Fact]
+    public async Task AreStatisticsRetrieved()
+    {
+      PocketStatistics statistics = await client.GetUserStatistics();
+
+      Assert.True(statistics.CountAll > 0);
+    }
+
+
+    [Fact]
+    public async Task AreLimitsRetrieved()
+    {
+      PocketLimits limits = await client.GetUsageLimits();
+
+      Assert.True(limits.RateLimitForConsumerKey > 9999);
+    }
+
+
+    [Fact]
+    public async Task IsNewPocketItemListGeneratorWorking()
+    {
+      IEnumerable<PocketItem> items = await client.Get(count: 1, tag: "pocket");
+      PocketItem item = items.First();
+
+      Assert.True(item.Tags.ToList().Find(i => i.Name == "pocket") != null);
+    }
+
+
+    [Fact]
+    public async Task IsSinceParameterWorkingOnAddTags()
+    {
+      DateTime since = DateTime.Now;
+
+      IEnumerable<PocketItem> items = await client.Get(state: State.all);
+      PocketItem itemToModify = items.First();
+
+      Assert.True(items.Count() >= 3);
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items == null || items.Count() == 0);
+
+      await client.AddTags(itemToModify, new string[] { "pocketsharp" });
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items.Count() > 0);
+
+      await client.RemoveTags(itemToModify, new string[] { "pocketsharp" });
+    }
+
+
+    [Fact]
+    public async Task IsSinceParameterWorkingOnFavoriteAndArchiveModification()
+    {
+      DateTime since = DateTime.Now;//1409221736
+
+      IEnumerable<PocketItem> items = await client.Get(state: State.all);
+      PocketItem itemToModify = items.First();
+
+      Assert.True(items.Count() >= 3);
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items == null || items.Count() == 0);
+
+      await client.Favorite(itemToModify);
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items.Count() > 0);
+
+      await client.Unfavorite(itemToModify);
+
+      since = DateTime.Now;
+
+      await client.Archive(itemToModify);
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items.Count() > 0);
+
+      await client.Unarchive(itemToModify);
+    }
+
+
+    [Fact]
+    public async Task IsUTCSinceParameterWorking()
+    {
+      DateTime since = DateTime.UtcNow;
+
+      IEnumerable<PocketItem> items = await client.Get(state: State.all);
+      PocketItem itemToModify = items.First();
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items == null || items.Count() == 0);
+
+      await client.Favorite(itemToModify);
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items.Count() > 0);
+
+      await client.Unfavorite(itemToModify);
+    }
+
+
+    [Fact]
+    public async Task IsSinceParameterWorkingOnAddAndDelete()
+    {
+      DateTime since = DateTime.UtcNow;
+
+      PocketItem item = await client.Add(new Uri("http://frontendplay.com"));
+
+      IEnumerable<PocketItem> items = await client.Get(state: State.all, since: since);
+
+      since = DateTime.UtcNow;
+
+      await client.Delete(item);
+
+      items = await client.Get(state: State.all, since: since);
+
+      Assert.True(items.Count() == 1 && items.First().IsDeleted);
+    }
+
+    [Fact]
+    public async Task AreUncachedItemsProperlyResolved()
+    {
+      PocketItem item = await client.Add(new Uri("http://de.ign.com/m/feature/21608/die-20-besten-kurzfilme-des-jahres-2013?bust=1"));
+
+      IEnumerable<PocketItem> items = await client.Get(state: State.all);
+
+      Assert.NotNull(item.Uri);
+      Assert.NotNull(items.First().Uri);
+      Assert.Equal(item.Uri, items.First().Uri);
+
+      itemsToDelete.Add(item.ID);
+    }
+  }
+}

PocketSharp.Tests/MiscTests.cs

@@ -0,0 +1,32 @@
+using PocketSharp.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+using System.Linq;
+
+namespace PocketSharp.Tests
+{
+  public class MiscTests : TestsBase
+  {
+    private int Incrementor = 0;
+
+    public MiscTests()
+      : base()
+    {
+      client.PreRequest = method => Incrementor++;
+    }
+
+
+    [Fact]
+    public async Task CheckPreRequestAction()
+    {
+      IEnumerable<PocketItem> items = await client.Get(count: 1);
+      PocketItem item = items.First();
+
+      await client.Favorite(item);
+      await client.Unfavorite(item);
+
+      Assert.True(Incrementor >= 3);
+    }
+  }
+}

PocketSharp.Tests/ModifyTagsTests.cs

@@ -0,0 +1,102 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace PocketSharp.Tests
+{
+  public class ModifyTagsTests : TestsBase
+  {
+    public ModifyTagsTests() : base() { }
+
+
+    [Fact]
+    public async Task AreTagsAddedAndDeletedToAnItem()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.AddTags(item, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.True(item.Tags.Count() >= 2);
+
+      Assert.NotNull(item.Tags.Single<PocketTag>(tag => tag.Name == "test_tag"));
+      Assert.NotNull(item.Tags.Single<PocketTag>(tag => tag.Name == "test_tag2"));
+
+      Assert.True(await client.RemoveTags(item, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Null(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag"));
+      Assert.Null(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag2"));
+    }
+
+
+    [Fact]
+    public async Task AreAllTagsRemovedFromItem()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.AddTags(item, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.True(item.Tags.Count() >= 2);
+
+      Assert.True(await client.RemoveTags(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Null(item.Tags);
+    }
+
+
+    [Fact]
+    public async Task AreTagsReplaced()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.ReplaceTags(item.ID, new string[] { "test_tag", "test_tag2" }));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Equal(item.Tags.Count(), 2);
+
+      Assert.NotNull(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag"));
+      Assert.NotNull(item.Tags.SingleOrDefault<PocketTag>(tag => tag.Name == "test_tag2"));
+    }
+
+
+    private async Task<PocketItem> Setup()
+    {
+      PocketItem item = await client.Add(
+        uri: new Uri("https://github.com"),
+        tags: new string[] { "github", "code", "social" }
+      );
+
+      itemsToDelete.Add(item.ID);
+
+      return await GetItemById(item.ID);
+    }
+
+
+    private async Task<PocketItem> GetItemById(string id, bool archive = false)
+    {
+      List<PocketItem> items = (await client.Get(state: archive ? State.archive : State.unread)).ToList();
+      PocketItem itemDesired = null;
+
+      items.ForEach(itm =>
+      {
+        if (itm.ID == id)
+        {
+          itemDesired = itm;
+        }
+      });
+
+      return itemDesired;
+    }
+  }
+}

PocketSharp.Tests/ModifyTests.cs

@@ -0,0 +1,154 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace PocketSharp.Tests
+{
+  public class ModifyTests : TestsBase
+  {
+    public ModifyTests() : base() { }
+
+
+    [Fact]
+    public async Task IsAnItemArchivedAndUnarchived()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.Archive(item));
+
+      item = await GetItemById(item.ID, true);
+
+      Assert.True(item.IsArchive);
+
+      Assert.True(await client.Unarchive(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.False(item.IsArchive);
+    }
+
+
+    [Fact]
+    public async Task IsAnItemFavoritedAndUnfavorited()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.Favorite(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.True(item.IsFavorite);
+
+      Assert.True(await client.Unfavorite(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.False(item.IsFavorite);
+    }
+
+
+    [Fact]
+    public async Task IsAnItemDeleted()
+    {
+      PocketItem item = await Setup();
+
+      Assert.True(await client.Delete(item));
+
+      item = await GetItemById(item.ID);
+
+      Assert.Null(item);
+    }
+
+
+    [Fact]
+    public async Task AreMultipleActionsSent()
+    {
+      PocketItem item = await Setup();
+
+      bool success = await client.SendActions(new List<PocketAction>()
+      {
+        new PocketAction() { Action = "favorite", ID = item.ID },
+        new PocketAction() { Action = "tags_add", ID = item.ID, Tags = new string[] { "new_tag", "another_tag" } },
+        new PocketAction() { Action = "archive", ID = item.ID }
+      });
+
+      Assert.True(success);
+
+      item = await client.Get(item.ID);
+
+      Assert.True(item.IsFavorite);
+      Assert.True(item.IsArchive);
+      Assert.NotNull(item.Tags.Single<PocketTag>(tag => tag.Name == "new_tag"));
+      Assert.NotNull(item.Tags.Single<PocketTag>(tag => tag.Name == "another_tag"));
+    }
+
+
+    [Fact]
+    public async Task AreMultipleAddActionsSent()
+    {
+      PocketItem item = await Setup();
+
+      bool success = await client.SendActions(new List<PocketAction>()
+      {
+        new PocketAction() { Action = "add", Uri = new Uri("http://msdn.microsoft.com/en-us/library/windows/apps/jj841126.aspx") },
+        new PocketAction() { Action = "add", Uri = new Uri("http://pokiapp.com/changelog") }
+      });
+
+      Assert.True(success);
+    }
+
+
+    [Fact]
+    public async Task AreMultipleActionsOnOneItemPerformed()
+    {
+      PocketItem item = await Setup();
+
+      bool success = await client.SendActions(new List<PocketAction>()
+      {
+        new PocketAction() { Action = "unarchive", ID = item.ID },
+        new PocketAction() { Action = "archive", ID = item.ID },
+        new PocketAction() { Action = "unfavorite", ID = item.ID }
+      });
+
+      Assert.True(success);
+
+      item = await client.Get(item.ID);
+
+      Assert.False(item.IsFavorite);
+      Assert.True(item.IsArchive);
+    }
+
+
+    private async Task<PocketItem> Setup()
+    {
+      PocketItem item = await client.Add(
+        uri: new Uri("https://github.com"),
+        tags: new string[] { "github", "code", "social" }
+      );
+
+      itemsToDelete.Add(item.ID);
+
+      return await GetItemById(item.ID);
+    }
+
+
+    private async Task<PocketItem> GetItemById(string id, bool archive = false)
+    {
+      List<PocketItem> items = (await client.Get(state: archive ? State.archive : State.unread)).ToList();
+      PocketItem itemDesired = null;
+
+      items.ForEach(itm =>
+      {
+        if (itm.ID == id)
+        {
+          itemDesired = itm;
+        }
+      });
+
+      return itemDesired;
+    }
+  }
+}

PocketSharp.Tests/PocketSharp.Tests.csproj

@@ -3,12 +3,12 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F1CEA363-7039-40BA-9744-0071F46BB90C}</ProjectGuid>
+    <ProjectGuid>{CA3C491B-A8CA-426C-A0BB-E91636767467}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PocketSharp.Tests</RootNamespace>
     <AssemblyName>PocketSharp.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -16,6 +16,8 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,9 +37,35 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.166\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.166\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.166\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions, Version=2.2.19.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.19\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives, Version=4.2.19.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.19\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="xunit">
+      <HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Choose>
@@ -46,15 +74,30 @@
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
       </ItemGroup>
     </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-      </ItemGroup>
-    </Otherwise>
+    <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="UnitTest1.cs" />
+    <Compile Include="MiscTests.cs" />
+    <Compile Include="AddTests.cs" />
+    <Compile Include="AccountTests.cs" />
+    <Compile Include="ModifyTagsTests.cs" />
+    <Compile Include="ModifyTests.cs" />
+    <Compile Include="GetTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StressTests.cs" />
+    <Compile Include="TestsBase.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PocketSharp\PocketSharp.csproj">
+      <Project>{817200c3-a327-4e35-9b5f-63a51c088577}</Project>
+      <Name>PocketSharp</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+    <None Include="url-10000.csv" />
+    <None Include="url-100000.csv" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
@@ -76,6 +119,18 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </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.
   <Target Name="BeforeBuild">

PocketSharp.Tests/Properties/AssemblyInfo.cs

@@ -20,7 +20,7 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fbe5a0d2-d0de-44b1-8b8a-cf8cd3ac2230")]
+[assembly: Guid("87fcf138-5e6e-4584-ac3b-58c8ee6fccaa")]
 
 // Version information for an assembly consists of the following four values:
 //

PocketSharp.Tests/StressAccount.playlist

@@ -0,0 +1 @@
+<Playlist Version="1.0"><Add Test="PocketSharp.Tests.StressTests.Are0ItemsRetrievedProperly" /><Add Test="PocketSharp.Tests.StressTests.Are100ItemsRetrievedProperly" /><Add Test="PocketSharp.Tests.StressTests.Are10000ItemsRetrievedProperly" /><Add Test="PocketSharp.Tests.StressTests.IsSearchedSuccessfullyOn10000Items" /><Add Test="PocketSharp.Tests.StressTests.Are1000ItemsRetrievedProperly" /><Add Test="PocketSharp.Tests.StressTests.IsSearchedSuccessfullyOn10000Items (PocketSharp.Tests.StressTests.IsSearchedSuccessfullyOn10000Items (F:\Playground\CSharp\PocketSharp\PocketSharp.Tests\bin\Release\PocketSharp.Tests.dll))" /><Add Test="PocketSharp.Tests.StressTests.Are1000ItemsRetrievedProperly (PocketSharp.Tests.StressTests.Are1000ItemsRetrievedProperly (F:\Playground\CSharp\PocketSharp\PocketSharp.Tests\bin\Release\PocketSharp.Tests.dll))" /><Add Test="PocketSharp.Tests.StressTests.Are0ItemsRetrievedProperly (PocketSharp.Tests.StressTests.Are0ItemsRetrievedProperly (F:\Playground\CSharp\PocketSharp\PocketSharp.Tests\bin\Release\PocketSharp.Tests.dll))" /><Add Test="PocketSharp.Tests.StressTests.Are100ItemsRetrievedProperly (PocketSharp.Tests.StressTests.Are100ItemsRetrievedProperly (F:\Playground\CSharp\PocketSharp\PocketSharp.Tests\bin\Release\PocketSharp.Tests.dll))" /><Add Test="PocketSharp.Tests.StressTests.Are10000ItemsRetrievedProperly (PocketSharp.Tests.StressTests.Are10000ItemsRetrievedProperly (F:\Playground\CSharp\PocketSharp\PocketSharp.Tests\bin\Release\PocketSharp.Tests.dll))" /></Playlist>

PocketSharp.Tests/StressTests.cs

@@ -0,0 +1,131 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace PocketSharp.Tests
+{
+  public class StressTests : TestsBase
+  {
+    private static IEnumerable<string> urls;
+    private static string[] tags = new string[] { "css", "js", "csharp", "windows", "microsoft" };
+
+
+    public StressTests()
+      : base()
+    {
+      // !! please don't misuse this account !!
+      client = new PocketClient(
+        consumerKey: "20000-786d0bc8c39294e9829111d6",
+        callbackUri: "http://frontendplay.com",
+        accessCode: "9b8ecb6b-7801-1a5c-7b39-2ba05b"
+      );
+
+      urls = File.ReadAllLines("../../url-100000.csv").Select(item => item.Split(',')[1]);
+    }
+
+    [Fact]
+    public async Task Are100ItemsRetrievedProperly()
+    {
+      IEnumerable<PocketItem> items = await client.Get(count: 100, state: State.all);
+      Assert.True(items.Count() == 100);
+    }
+
+    [Fact]
+    public async Task Are1000ItemsRetrievedProperly()
+    {
+      IEnumerable<PocketItem> items = await client.Get(count: 1000, state: State.all);
+      Assert.True(items.Count() == 1000);
+    }
+
+    [Fact]
+    public async Task Are2500ItemsRetrievedProperly()
+    {
+      IEnumerable<PocketItem> items = await client.Get(count: 2500, state: State.all);
+      Assert.True(items.Count() == 2500);
+    }
+
+    [Fact]
+    public async Task Are5000ItemsRetrievedProperly()
+    {
+      IEnumerable<PocketItem> items = await client.Get(count: 5000, state: State.all);
+      Assert.True(items.Count() == 5000);
+    }
+
+    [Fact]
+    public async Task IsSearchSuccessfullyOnBigList()
+    {
+      IEnumerable<PocketItem> items = await client.Get(search: "google");
+
+      Assert.True(items.Count() > 0);
+      Assert.True(items.First().Title.ToLower().Contains("google") || items.First().Uri.ToString().ToLower().Contains("google"));
+    }
+
+    [Fact]
+    public async Task IsTagSearchSuccessfullyOnBigList()
+    {
+      IEnumerable<PocketItem> items = await client.SearchByTag(tags[0]);
+
+      Assert.True(items.Count() > 1);
+
+      bool found = false;
+
+      items.First().Tags.ToList().ForEach(tag =>
+      {
+        if (tag.Name.Contains(tags[0]))
+        {
+          found = true;
+        }
+      });
+
+      Assert.True(found);
+    }
+
+    [Fact]
+    public async Task RetrieveTagsReturnsResultOnBigList()
+    {
+      List<PocketTag> items = (await client.GetTags()).ToList();
+
+      items.ForEach(tag =>
+      {
+        Assert.True(tags.Contains(tag.Name));
+      });
+
+      Assert.Equal(items.Count, tags.Length);
+    }
+
+
+    private async Task FillAccount(int offset, int count)
+    {
+      int r;
+      int r2;
+      string[] tag;
+      Random rnd = new Random();
+
+      var items = urls.Skip(offset).Take(count)
+          .Select((value, idx) => new { Value = value, Index = idx })
+          .GroupBy(item => item.Index / 100, item => item.Value)
+          .Cast<IEnumerable<string>>();
+
+      foreach (IEnumerable<string> urlGroup in items)
+      {
+        await Task.WhenAll(urlGroup.Select(url =>
+        {
+          r = rnd.Next(tags.Length);
+          r2 = rnd.Next(tags.Length);
+          tag = new string[] { tags[r], tags[r2] };
+          return client.Add(new Uri("http://" + url), tag);
+        }));
+      }
+    }
+
+    //[Fact]
+    //public async Task Fillll()
+    //{
+    //  await FillAccount(11000, 89999);
+    //}
+  }
+}

PocketSharp.Tests/TestsBase.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace PocketSharp.Tests
+{
+  public class TestsBase : IDisposable
+  {
+    protected PocketClient client;
+
+    protected List<string> itemsToDelete = new List<string>();
+
+
+    // setup
+    public TestsBase()
+    {
+      // !! please don't misuse this account !!
+      client = new PocketClient(
+        consumerKey: "15396-f6f92101d72c8e270a6c9bb3",
+        callbackUri: "http://frontendplay.com",
+        accessCode: "80acf6c5-c198-03c0-b94c-e74402"
+      );
+    }
+
+
+    // teardown
+    public void Dispose()
+    {
+      itemsToDelete.ForEach(async id =>
+      {
+        await client.Delete(id);
+      });
+    }
+
+
+    // async throws
+    public static async Task ThrowsAsync<TException>(Func<Task> func)
+    {
+      var expected = typeof(TException);
+      Type actual = null;
+      try
+      {
+        await func();
+      }
+      catch (Exception e)
+      {
+        actual = e.GetType();
+      }
+      Assert.Equal(expected, actual);
+    }
+  }
+}

PocketSharp.Tests/UnitTest1.cs

@@ -1,14 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace PocketSharp.Tests
-{
-  [TestClass]
-  public class UnitTest1
-  {
-    [TestMethod]
-    public void TestMethod1()
-    {
-    }
-  }
-}

PocketSharp.Tests/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.19.0" newVersion="4.2.19.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

PocketSharp.Tests/packages.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.1.7" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Async" version="1.0.166" targetFramework="net45" />
+  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.19" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="xunit" version="1.9.2" targetFramework="net45" />
+</packages>

PocketSharp.sln

@@ -1,32 +1,86 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp", "PocketSharp\PocketSharp.csproj", "{1A291041-ADD8-467C-A6E4-0ACA26328CDF}"
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30324.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PocketSharp.Examples", "PocketSharp.Examples", "{AFD4E3F1-B23C-4924-BA5B-D917FBADB8FA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Console", "PocketSharp.Console\PocketSharp.Console.csproj", "{81B7D587-A189-4785-BDFE-CA8A9ABA0760}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19DD45B5-B849-49E7-89D6-16C89B9B96C7}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.exe = .nuget\NuGet.exe
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{F1CEA363-7039-40BA-9744-0071F46BB90C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp", "PocketSharp\PocketSharp.csproj", "{817200C3-A327-4E35-9B5F-63A51C088577}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Wpf", "PocketSharp.Examples\PocketSharp.Wpf\PocketSharp.Wpf.csproj", "{775569C2-987F-4AC4-8BA5-A315A21ED1B7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{817200C3-A327-4E35-9B5F-63A51C088577} = {817200C3-A327-4E35-9B5F-63A51C088577}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.WP8", "PocketSharp.Examples\PocketSharp.WP8\PocketSharp.WP8.csproj", "{47721A56-2128-4C5A-8B92-995FFC353304}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PocketSharp.Tests", "PocketSharp.Tests\PocketSharp.Tests.csproj", "{CA3C491B-A8CA-426C-A0BB-E91636767467}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1A291041-ADD8-467C-A6E4-0ACA26328CDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A291041-ADD8-467C-A6E4-0ACA26328CDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A291041-ADD8-467C-A6E4-0ACA26328CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A291041-ADD8-467C-A6E4-0ACA26328CDF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81B7D587-A189-4785-BDFE-CA8A9ABA0760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81B7D587-A189-4785-BDFE-CA8A9ABA0760}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81B7D587-A189-4785-BDFE-CA8A9ABA0760}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81B7D587-A189-4785-BDFE-CA8A9ABA0760}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1CEA363-7039-40BA-9744-0071F46BB90C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Release|Any CPU.Build.0 = Release|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Release|ARM.ActiveCfg = Release|Any CPU
+		{817200C3-A327-4E35-9B5F-63A51C088577}.Release|x86.ActiveCfg = Release|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|ARM.ActiveCfg = Debug|ARM
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|ARM.Build.0 = Debug|ARM
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|ARM.Deploy.0 = Debug|ARM
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|x86.ActiveCfg = Debug|x86
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|x86.Build.0 = Debug|x86
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Debug|x86.Deploy.0 = Debug|x86
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|ARM.ActiveCfg = Release|ARM
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|ARM.Build.0 = Release|ARM
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|ARM.Deploy.0 = Release|ARM
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.ActiveCfg = Release|x86
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.Build.0 = Release|x86
+		{47721A56-2128-4C5A-8B92-995FFC353304}.Release|x86.Deploy.0 = Release|x86
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|ARM.ActiveCfg = Release|Any CPU
+		{CA3C491B-A8CA-426C-A0BB-E91636767467}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{775569C2-987F-4AC4-8BA5-A315A21ED1B7} = {AFD4E3F1-B23C-4924-BA5B-D917FBADB8FA}
+		{47721A56-2128-4C5A-8B92-995FFC353304} = {AFD4E3F1-B23C-4924-BA5B-D917FBADB8FA}
+	EndGlobalSection
 EndGlobal

PocketSharp/Components/Account.cs

@@ -0,0 +1,128 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PocketSharp
+{
+  /// <summary>
+  /// PocketClient
+  /// </summary>
+  public partial class PocketClient
+  {
+    /// <summary>
+    /// Retrieves the requestCode from Pocket, which is used to generate the Authentication URI to authenticate the user
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="System.NullReferenceException">Authentication methods need a callbackUri on initialization of the PocketClient class</exception>
+    /// <exception cref="PocketException"></exception>
+    public async Task<string> GetRequestCode(CancellationToken cancellationToken = default(CancellationToken))
+    {
+      // check if request code is available
+      if (CallbackUri == null)
+      {
+        throw new NullReferenceException("Authentication methods need a callbackUri on initialization of the PocketClient class");
+      }
+
+      // do request
+      RequestCode response = await Request<RequestCode>("oauth/request", cancellationToken, new Dictionary<string, string>()
+      { 
+        { "redirect_uri", CallbackUri } 
+      }, false);
+
+      // save code to client
+      RequestCode = response.Code;
+
+      // generate redirection URI and return
+      return RequestCode;
+    }
+
+
+    /// <summary>
+    /// Generate Authentication URI from requestCode
+    /// </summary>
+    /// <param name="requestCode">The requestCode. If no requestCode is supplied, the property from the PocketClient intialization is used.</param>
+    /// <returns>A valid URI to redirect the user to.</returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    public Uri GenerateAuthenticationUri(string requestCode = null)
+    {
+      // check if request code is available
+      if (RequestCode == null && requestCode == null)
+      {
+        throw new NullReferenceException("Call GetRequestCode() first to receive a request_code");
+      }
+
+      // override property with given param if available
+      if (requestCode != null)
+      {
+        RequestCode = requestCode;
+      }
+
+      return new Uri(String.Format(authentificationUri, RequestCode, CallbackUri, isMobileClient ? "1" : "0", "login", useInsideWebAuthenticationBroker ? "1" : "0"));
+    }
+
+
+    /// <summary>
+    /// Generate registration URI from requestCode
+    /// Follow the steps as with GenerateAuthenticationUri, but for unregistered users
+    /// </summary>
+    /// <param name="requestCode">The requestCode. If no requestCode is supplied, the property from the PocketClient intialization is used.</param>
+    /// <returns>A valid URI to redirect the user to.</returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    public Uri GenerateRegistrationUri(string requestCode = null)
+    {
+      // check if request code is available
+      if (RequestCode == null && requestCode == null)
+      {
+        throw new NullReferenceException("Call GetRequestCode() first to receive a request_code");
+      }
+
+      // override property with given param if available
+      if (requestCode != null)
+      {
+        RequestCode = requestCode;
+      }
+
+      return new Uri(String.Format(authentificationUri, RequestCode, CallbackUri, isMobileClient ? "1" : "0", "signup", useInsideWebAuthenticationBroker ? "1" : "0"));
+    }
+
+
+    /// <summary>
+    /// Requests the access code and username after authentication
+    /// The access code has to permanently be stored within the users session, and should be passed in the constructor for all future PocketClient initializations.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <param name="requestCode">The request code.</param>
+    /// <returns>
+    /// The authenticated user
+    /// </returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    public async Task<PocketUser> GetUser(string requestCode = null, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      // check if request code is available
+      if (RequestCode == null && requestCode == null)
+      {
+        throw new NullReferenceException("Call GetRequestCode() first to receive a request_code");
+      }
+
+      // override property with given param if available
+      if (requestCode != null)
+      {
+        RequestCode = requestCode;
+      }
+
+      // do request
+      PocketUser response = await Request<PocketUser>("oauth/authorize", cancellationToken, new Dictionary<string, string>()
+      {
+        {"code", RequestCode}
+      }, false);
+
+      // save code to client
+      AccessCode = response.Code;
+
+      return response;
+    }
+  }
+}

PocketSharp/Components/Add.cs

@@ -1,5 +1,7 @@
 using PocketSharp.Models;
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace PocketSharp
 {
@@ -15,9 +17,25 @@ namespace PocketSharp
     /// <param name="tags">A comma-separated list of tags to apply to the item</param>
     /// <param name="title">This can be included for cases where an item does not have a title, which is typical for image or PDF URLs. If Pocket detects a title from the content of the page, this parameter will be ignored.</param>
     /// <param name="tweetID">If you are adding Pocket support to a Twitter client, please send along a reference to the tweet status id. This allows Pocket to show the original tweet alongside the article.</param>
-    /// <returns></returns>
-    public PocketItem Add(Uri uri, string[] tags = null, string title = null, string tweetID = null)
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>
+    /// A simple representation of the saved item which doesn't contain all data (is only returned by calling the Retrieve method)
+    /// </returns>
+    /// <exception cref="System.FormatException">(1) Uri should be absolute.</exception>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketItem> Add(
+      Uri uri, 
+      string[] tags = null, 
+      string title = null, 
+      string tweetID = null, 
+      CancellationToken cancellationToken = default(CancellationToken)
+    )
     {
+      if (!uri.IsAbsoluteUri)
+      {
+        throw new FormatException("(1) Uri should be absolute.");
+      }
+
       AddParameters parameters = new AddParameters()
       {
         Uri = uri,
@@ -25,18 +43,10 @@ namespace PocketSharp
         Title = title,
         TweetID = tweetID
       };
-      return Get<Add>("add", parameters.Convert(), true).Item;
-    }
 
+      Add response = await Request<Add>("add", cancellationToken, parameters.Convert());
 
-    /// <summary>
-    /// Adds a new item to pocket
-    /// </summary>
-    /// <param name="uri">The URL of the item you want to save</param>
-    /// <returns></returns>
-    public PocketItem Add(Uri uri)
-    {
-      return Add(uri, null, null, null);
+      return response.Item;
     }
   }
 }

PocketSharp/Components/Authentification.cs

@@ -1,84 +0,0 @@
-using PocketSharp.Models;
-using System;
-
-namespace PocketSharp
-{
-  /// <summary>
-  /// PocketClient
-  /// </summary>
-  public partial class PocketClient
-  {
-    /// <summary>
-    /// Retrieves the requestCode from Pocket.
-    /// </summary>
-    /// <returns></returns>
-    public string GetRequestCode()
-    {
-      // check if request code is available
-      if (CallbackUri == null)
-      {
-        throw new APIException("Authentication methods need a callbackUri on initialization of the PocketClient class");
-      }
-
-      // do request
-      RequestCode response = Get<RequestCode>("oauth/request", Utilities.CreateParamInList("redirect_uri", CallbackUri));
-
-      // save code to client
-      RequestCode = response.Code;
-
-      // generate redirection URI and return
-      return RequestCode;
-    }
-
-
-    /// <summary>
-    /// Generate Authentication URI from requestCode
-    /// </summary>
-    /// <param name="requestCode">The requestCode.</param>
-    /// <returns></returns>
-    public Uri GenerateAuthenticationUri(string requestCode = null)
-    {
-      // check if request code is available
-      if(RequestCode == null && requestCode == null)
-      {
-        throw new APIException("Call GetRequestCode() first to receive a request_code");
-      }
-
-      // override property with given param if available
-      if(requestCode != null)
-      {
-        RequestCode = requestCode;
-      }
-
-      return new Uri(string.Format(authentificationUri, RequestCode, CallbackUri));
-    }
-
-
-    /// <summary>
-    /// Requests the access code after authentification
-    /// </summary>
-    /// <returns></returns>
-    public string GetAccessCode(string requestCode = null)
-    {
-      // check if request code is available
-      if(RequestCode == null && requestCode == null)
-      {
-        throw new APIException("Call GetRequestCode() first to receive a request_code");
-      }
-
-      // override property with given param if available
-      if(requestCode != null)
-      {
-        RequestCode = requestCode;
-      }
-
-      // do request
-      AccessCode response = Get<AccessCode>("oauth/authorize", Utilities.CreateParamInList("code", RequestCode));
-
-      // save code to client
-      AccessCode = response.Code;
-
-      return AccessCode;
-    }
-  }
-}

PocketSharp/Components/Get.cs

@@ -0,0 +1,264 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PocketSharp
+{
+  /// <summary>
+  /// PocketClient
+  /// </summary>
+  public partial class PocketClient
+  {
+    /// <summary>
+    /// Retrieves items from pocket
+    /// with the given filters
+    /// </summary>
+    /// <param name="state">The state.</param>
+    /// <param name="favorite">The favorite.</param>
+    /// <param name="tag">The tag.</param>
+    /// <param name="contentType">Type of the content.</param>
+    /// <param name="sort">The sort.</param>
+    /// <param name="search">The search.</param>
+    /// <param name="domain">The domain.</param>
+    /// <param name="since">The since.</param>
+    /// <param name="count">The count.</param>
+    /// <param name="offset">The offset.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<IEnumerable<PocketItem>> Get(
+      State? state = null,
+      bool? favorite = null,
+      string tag = null,
+      ContentType? contentType = null,
+      Sort? sort = null,
+      string search = null,
+      string domain = null,
+      DateTime? since = null,
+      int? count = null,
+      int? offset = null,
+      CancellationToken cancellationToken = default(CancellationToken)
+    )
+    {
+      RetrieveParameters parameters = new RetrieveParameters()
+      {
+        State = state,
+        Favorite = favorite,
+        Tag = tag,
+        ContentType = contentType,
+        Sort = sort,
+        DetailType = DetailType.complete,
+        Search = search,
+        Domain = domain,
+        Since = since.HasValue ? ((DateTime)since).ToUniversalTime() : since,
+        Count = count,
+        Offset = offset
+      };
+
+      return (await Request<Retrieve>("get", cancellationToken, parameters.Convert())).Items ?? new List<PocketItem>();
+    }
+
+
+    /// <summary>
+    /// Retrieves an item by a given ID
+    /// Note: The Pocket API contains no method, which allows to retrieve a single item, so all items are retrieved and filtered locally by the ID.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketItem> Get(string itemID, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      return (await Get(
+        cancellationToken: cancellationToken,
+        state: State.all
+      )).SingleOrDefault<PocketItem>(item => item.ID == itemID);
+    }
+
+
+    /// <summary>
+    /// Retrieves all items by a given filter
+    /// </summary>
+    /// <param name="filter">The filter.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<IEnumerable<PocketItem>> Get(RetrieveFilter filter, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      RetrieveParameters parameters = new RetrieveParameters();
+
+      switch (filter)
+      {
+        case RetrieveFilter.Article:
+          parameters.ContentType = ContentType.article;
+          break;
+        case RetrieveFilter.Image:
+          parameters.ContentType = ContentType.image;
+          break;
+        case RetrieveFilter.Video:
+          parameters.ContentType = ContentType.video;
+          break;
+        case RetrieveFilter.Favorite:
+          parameters.Favorite = true;
+          break;
+        case RetrieveFilter.Unread:
+          parameters.State = State.unread;
+          break;
+        case RetrieveFilter.Archive:
+          parameters.State = State.archive;
+          break;
+        case RetrieveFilter.All:
+          parameters.State = State.all;
+          break;
+      }
+
+      parameters.DetailType = DetailType.complete;
+
+      return (await Request<Retrieve>("get", cancellationToken, parameters.Convert())).Items;
+    }
+
+
+    /// <summary>
+    /// Converts a raw JSON response to a PocketItem list
+    /// </summary>
+    /// <param name="itemsJSON">The raw JSON response.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public IEnumerable<PocketItem> ConvertJsonToList(string itemsJSON)
+    {
+      return DeserializeJson<Retrieve>(itemsJSON).Items;
+    }
+
+
+    /// <summary>
+    /// Retrieves all available tags.
+    /// Note: The Pocket API contains no method, which allows to retrieve all tags, so all items are retrieved and the associated tags extracted.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<IEnumerable<PocketTag>> GetTags(CancellationToken cancellationToken = default(CancellationToken))
+    {
+      IEnumerable<PocketItem> items = await Get(
+        cancellationToken: cancellationToken,
+        state: State.all
+      );
+
+      return items
+        .Where(item => item.Tags != null)
+        .SelectMany(item => item.Tags)
+        .GroupBy(item => item.Name)
+        .Select(item => item.First())
+        .ToList<PocketTag>();
+    }
+
+
+    /// <summary>
+    /// Retrieves items by tag
+    /// </summary>
+    /// <param name="tag">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<IEnumerable<PocketItem>> SearchByTag(string tag, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      return await Get(
+        state: State.all,
+        cancellationToken: cancellationToken,
+        tag: tag
+      );
+    }
+
+
+    /// <summary>
+    /// Retrieves items which match the specified search string in title and URI
+    /// </summary>
+    /// <param name="searchString">The search string.</param>
+    /// <param name="tag">Filter by tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="System.ArgumentOutOfRangeException">Search string length has to be a minimum of 2 chars</exception>
+    /// <exception cref="PocketException"></exception>
+    public async Task<IEnumerable<PocketItem>> Search(string searchString, string tag = null, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      if (String.IsNullOrEmpty(searchString) || searchString.Length < 2)
+      {
+        throw new ArgumentOutOfRangeException("Search string length has to be a minimum of 2 chars");
+      }
+
+      return await Get(
+        state: State.all, 
+        search: searchString, 
+        tag: tag, 
+        cancellationToken: cancellationToken
+      );
+    }
+
+
+    /// <summary>
+    /// Retrieves the article content from an URI
+    /// WARNING: 
+    /// You have to pass the parseUri in the PocketClient ctor for this method to work.
+    /// This is a private API and can only be used by authenticated users.
+    /// </summary>
+    /// <param name="uri">The article URI.</param>
+    /// <param name="includeImages">Include images into content or use placeholder.</param>
+    /// <param name="includeVideos">Include videos into content or use placeholder.</param>
+    /// <param name="forceRefresh">Force refresh of the content (don't use cache).</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketArticle> GetArticle(Uri uri, bool includeImages = true, bool includeVideos = true, bool forceRefresh = false, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      Dictionary<string, string> parameters = new Dictionary<string, string>()
+      {
+        { "url", uri.OriginalString },
+        { "images", includeImages ? "1" : "0" },
+        { "videos", includeVideos ? "1" : "0" },
+        { "refresh", forceRefresh ? "1" : "0" },
+        { "output", "json" }
+      };
+
+      return await Request<PocketArticle>("", cancellationToken, parameters, false, true);
+    }
+  }
+
+
+  /// <summary>
+  /// Filter for simple retrieve requests
+  /// </summary>
+  public enum RetrieveFilter
+  {
+    /// <summary>
+    /// All types
+    /// </summary>
+    All,
+    /// <summary>
+    /// Only unread items
+    /// </summary>
+    Unread,
+    /// <summary>
+    /// Archived items
+    /// </summary>
+    Archive,
+    /// <summary>
+    /// Favorited items
+    /// </summary>
+    Favorite,
+    /// <summary>
+    /// Only articles
+    /// </summary>
+    Article,
+    /// <summary>
+    /// Only videos
+    /// </summary>
+    Video,
+    /// <summary>
+    /// Only images
+    /// </summary>
+    Image
+  }
+}

PocketSharp/Components/Modify.cs

@@ -1,4 +1,8 @@
 using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace PocketSharp
 {
@@ -7,14 +11,44 @@ namespace PocketSharp
   /// </summary>
   public partial class PocketClient
   {
+    /// <summary>
+    /// Sends multiple actions in one request.
+    /// See: http://getpocket.com/developer/docs/v3/modify
+    /// </summary>
+    /// <param name="actions">The actions.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> SendActions(IEnumerable<PocketAction> actions, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      return await Send(actions, cancellationToken);
+    }
+
+
+    /// <summary>
+    /// Sends an action.
+    /// See: http://getpocket.com/developer/docs/v3/modify
+    /// </summary>
+    /// <param name="action">The action.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> SendAction(PocketAction action, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      return await Send(new List<PocketAction>() { action }, cancellationToken);
+    }
+
+
     /// <summary>
     /// Archives the specified item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Archive(int itemID)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Archive(string itemID, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionDefault(itemID, "archive");
+      return await SendDefault(cancellationToken, itemID, "archive");
     }
 
 
@@ -22,10 +56,12 @@ namespace PocketSharp
     /// Archives the specified item.
     /// </summary>
     /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Archive(PocketItem item)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Archive(PocketItem item, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return Archive(item.ID);
+      return await Archive(item.ID, cancellationToken);
     }
 
 
@@ -33,10 +69,12 @@ namespace PocketSharp
     /// Un-archives the specified item (alias for Readd).
     /// </summary>
     /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Unarchive(int itemID)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Unarchive(string itemID, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionDefault(itemID, "readd");
+      return await SendDefault(cancellationToken, itemID, "readd");
     }
 
 
@@ -44,10 +82,12 @@ namespace PocketSharp
     /// Unarchives the specified item.
     /// </summary>
     /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Unarchive(PocketItem item)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Unarchive(PocketItem item, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return Unarchive(item.ID);
+      return await Unarchive(item.ID, cancellationToken);
     }
 
 
@@ -55,10 +95,12 @@ namespace PocketSharp
     /// Favorites the specified item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Favorite(int itemID)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Favorite(string itemID, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionDefault(itemID, "favorite");
+      return await SendDefault(cancellationToken, itemID, "favorite");
     }
 
 
@@ -66,10 +108,12 @@ namespace PocketSharp
     /// Favorites the specified item.
     /// </summary>
     /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Favorite(PocketItem item)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Favorite(PocketItem item, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return Favorite(item.ID);
+      return await Favorite(item.ID, cancellationToken);
     }
 
 
@@ -77,10 +121,12 @@ namespace PocketSharp
     /// Un-favorites the specified item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Unfavorite(int itemID)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Unfavorite(string itemID, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionDefault(itemID, "unfavorite");
+      return await SendDefault(cancellationToken, itemID, "unfavorite");
     }
 
 
@@ -88,48 +134,54 @@ namespace PocketSharp
     /// Un-favorites the specified item.
     /// </summary>
     /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool Unfavorite(PocketItem item)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Unfavorite(PocketItem item, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return Unfavorite(item.ID);
+      return await Unfavorite(item.ID, cancellationToken);
     }
 
 
     /// <summary>
     /// Deletes the specified item.
     /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <param name="itemID">The item ID.</param>
     /// <returns></returns>
-    public bool Delete(int itemID)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> Delete(string itemID, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionDefault(itemID, "delete");
+      return await SendDefault(cancellationToken, itemID, "delete");
     }
 
 
     /// <summary>
     /// Deletes the specified item.
     /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <param name="item">The item.</param>
     /// <returns></returns>
-    public bool Delete(PocketItem item)
+    public async Task<bool> Delete(PocketItem item, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return Delete(item.ID);
+      return await Delete(item.ID, cancellationToken);
     }
 
 
     /// <summary>
     /// Puts an action
     /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <param name="itemID">The item ID.</param>
     /// <param name="action">The action.</param>
     /// <returns></returns>
-    protected bool PutSendActionDefault(int itemID, string action)
+    protected async Task<bool> SendDefault(CancellationToken cancellationToken, string itemID, string action)
     {
-      return PutSendAction(new ActionParameter()
+      return await Send(new PocketAction()
       {
         Action = action,
         ID = itemID
-      });
+      }, cancellationToken);
     }
   }
 }

PocketSharp/Components/ModifyTags.cs

@@ -1,4 +1,6 @@
 using PocketSharp.Models;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace PocketSharp
 {
@@ -8,146 +10,195 @@ namespace PocketSharp
   public partial class PocketClient
   {
     /// <summary>
-    /// Adds the specified tags.
+    /// Adds the specified tags to an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool AddTags(int itemID, string[] tags)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> AddTags(string itemID, string[] tags, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionForTags(itemID, "tags_add", tags);
+      return await SendTags(cancellationToken, itemID, "tags_add", tags);
     }
 
 
     /// <summary>
-    /// Adds the specified tags.
+    /// Adds the specified tags to an item.
     /// </summary>
     /// <param name="item">The item.</param>
     /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool AddTags(PocketItem item, string[] tags)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> AddTags(PocketItem item, string[] tags, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return AddTags(item.ID, tags);
+      return await AddTags(item.ID, tags, cancellationToken);
     }
 
 
     /// <summary>
-    /// Removes the specified tags.
+    /// Removes the specified tags from an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool RemoveTags(int itemID, string[] tags)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTags(string itemID, string[] tags, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionForTags(itemID, "tags_remove", tags);
+      return await SendTags(cancellationToken, itemID, "tags_remove", tags);
     }
 
 
     /// <summary>
-    /// Removes the specified tags.
+    /// Removes the specified tags from an item.
     /// </summary>
     /// <param name="item">The item.</param>
-    /// <param name="tags">The tags.</param>
+    /// <param name="tags">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool RemoveTags(PocketItem item, string[] tags)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTags(PocketItem item, string[] tags, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return RemoveTags(item.ID, tags);
+      return await RemoveTags(item.ID, tags, cancellationToken);
     }
 
 
     /// <summary>
-    /// Clears all tags.
+    /// Removes a tag from an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
+    /// <param name="tag">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool RemoveTags(int itemID)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTag(string itemID, string tag, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionDefault(itemID, "tags_clear");
+      return await SendTags(cancellationToken, itemID, "tags_remove", new string[] { tag });
     }
 
 
     /// <summary>
-    /// Clears all tags.
+    /// Removes a tag from an item.
     /// </summary>
     /// <param name="item">The item.</param>
+    /// <param name="tag">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool RemoveTags(PocketItem item)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTag(PocketItem item, string tag, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return RemoveTags(item.ID);
+      return await RemoveTag(item.ID, tag, cancellationToken);
     }
 
 
     /// <summary>
-    /// Replaces all existing tags with new ones.
+    /// Clears all tags from an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTags(string itemID, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      return await SendDefault(cancellationToken, itemID, "tags_clear");
+    }
+
+
+    /// <summary>
+    /// Clears all tags from an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RemoveTags(PocketItem item, CancellationToken cancellationToken = default(CancellationToken))
+    {
+      return await RemoveTags(item.ID, cancellationToken);
+    }
+
+
+    /// <summary>
+    /// Replaces all existing tags with the given tags in an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool ReplaceTags(int itemID, string[] tags)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> ReplaceTags(string itemID, string[] tags, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendActionForTags(itemID, "tags_replace", tags);
+      return await SendTags(cancellationToken, itemID, "tags_replace", tags);
     }
 
 
     /// <summary>
-    /// Replaces all existing tags with new ones.
+    /// Replaces all existing tags with the given new ones in an item.
     /// </summary>
     /// <param name="item">The item.</param>
     /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool ReplaceTags(PocketItem item, string[] tags)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> ReplaceTags(PocketItem item, string[] tags, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return ReplaceTags(item.ID, tags);
+      return await ReplaceTags(item.ID, tags, cancellationToken);
     }
 
 
     /// <summary>
-    /// Renames a tag.
+    /// Renames a tag in an item.
     /// </summary>
     /// <param name="itemID">The item ID.</param>
     /// <param name="oldTag">The old tag.</param>
     /// <param name="newTag">The new tag name.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool RenameTag(int itemID, string oldTag, string newTag)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RenameTag(string itemID, string oldTag, string newTag, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return PutSendAction(new ActionParameter()
+      return await Send(new PocketAction()
       {
         Action = "tag_rename",
         ID = itemID,
         OldTag = oldTag,
         NewTag = newTag
-      });
+      }, cancellationToken);
     }
 
 
     /// <summary>
-    /// Renames a tag.
+    /// Renames a tag in an item.
     /// </summary>
     /// <param name="item">The item.</param>
     /// <param name="oldTag">The old tag.</param>
     /// <param name="newTag">The new tag name.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns></returns>
-    public bool RenameTag(PocketItem item, string oldTag, string newTag)
+    /// <exception cref="PocketException"></exception>
+    public async Task<bool> RenameTag(PocketItem item, string oldTag, string newTag, CancellationToken cancellationToken = default(CancellationToken))
     {
-      return RenameTag(item.ID, oldTag, newTag);
+      return await RenameTag(item.ID, oldTag, newTag, cancellationToken);
     }
 
 
     /// <summary>
     /// Puts the send action for tags.
     /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <param name="itemID">The item ID.</param>
     /// <param name="action">The action.</param>
     /// <param name="tags">The tags.</param>
     /// <returns></returns>
-    protected bool PutSendActionForTags(int itemID, string action, string[] tags)
+    protected async Task<bool> SendTags(CancellationToken cancellationToken, string itemID, string action, string[] tags)
     {
-      return PutSendAction(new ActionParameter()
+      return await Send(new PocketAction()
       {
         Action = action,
         ID = itemID,
         Tags = tags
-      });
+      }, cancellationToken);
     }
   }
 }

PocketSharp/Components/Retrieve.cs

@@ -1,126 +0,0 @@
-using PocketSharp.Models;
-using System.Collections.Generic;
-
-namespace PocketSharp
-{
-  /// <summary>
-  /// PocketClient
-  /// </summary>
-  public partial class PocketClient
-  {
-    /// <summary>
-    /// Retrieves all items from pocket
-    /// </summary>
-    /// <param name="parameters">parameters, which are mapped to the officials from http://getpocket.com/developer/docs/v3/retrieve </param>
-    /// <returns></returns>
-    public List<PocketItem> Retrieve(RetrieveParameters parameters)
-    {
-      return Get<Retrieve>("get", parameters.Convert(), true).Items;
-    }
-
-
-    /// <summary>
-    /// Retrieves all items with a filter from pocket
-    /// </summary>
-    /// <param name="filter">The filter.</param>
-    /// <returns></returns>
-    public List<PocketItem> Retrieve(RetrieveFilter filter = RetrieveFilter.All)
-    {
-      RetrieveParameters parameters = new RetrieveParameters();
-
-      switch(filter)
-      {
-        case RetrieveFilter.Article:
-          parameters.ContentType = ContentTypeEnum.article;
-          break;
-        case RetrieveFilter.Image:
-          parameters.ContentType = ContentTypeEnum.image;
-          break;
-        case RetrieveFilter.Video:
-          parameters.ContentType = ContentTypeEnum.video;
-          break;
-        case RetrieveFilter.Favorite:
-          parameters.Favorite = true;
-          break;
-        case RetrieveFilter.Unread:
-          parameters.State = StateEnum.unread;
-          break;
-        case RetrieveFilter.Archive:
-          parameters.State = StateEnum.archive;
-          break;
-      }
-
-      //parameters.DetailType = DetailTypeEnum.complete;
-
-      return Get<Retrieve>("get",  parameters.Convert(), true).Items;
-    }
-
-
-    /// <summary>
-    /// Retrieves items by tag from pocket
-    /// </summary>
-    /// <param name="tag">The tag.</param>
-    /// <returns></returns>
-    public List<PocketItem> SearchByTag(string tag)
-    {
-      RetrieveParameters parameters = new RetrieveParameters()
-      {
-        Tag = tag,
-        DetailType = DetailTypeEnum.complete
-      };
-      return Get<Retrieve>("get", parameters.Convert(), true).Items;
-    }
-
-
-    /// <summary>
-    /// Retrieves items from pocket which match the specified search string in title or content
-    /// </summary>
-    /// <param name="searchString">The search string.</param>
-    /// <returns></returns>
-    public List<PocketItem> Search(string searchString)
-    {
-      RetrieveParameters parameters = new RetrieveParameters()
-      {
-        Search = searchString,
-        DetailType = DetailTypeEnum.complete
-      };
-      return Get<Retrieve>("get", parameters.Convert(), true).Items;
-    }
-  }
-
-
-  /// <summary>
-  /// Filter for simple retrieve requests
-  /// </summary>
-  public enum RetrieveFilter
-  {
-    /// <summary>
-    /// All types
-    /// </summary>
-    All,
-    /// <summary>
-    /// Only unread items
-    /// </summary>
-    Unread,
-    /// <summary>
-    /// Archived items
-    /// </summary>
-    Archive,
-    /// <summary>
-    /// Favorited items
-    /// </summary>
-    Favorite,
-    /// <summary>
-    /// Only articles
-    /// </summary>
-    Article,
-    /// <summary>
-    /// Only videos
-    /// </summary>
-    Video,
-    /// <summary>
-    /// Only images
-    /// </summary>
-    Image
-  }
-}

PocketSharp/Components/Statistics.cs

@@ -0,0 +1,57 @@
+using PocketSharp.Models;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PocketSharp
+{
+  /// <summary>
+  /// PocketClient
+  /// </summary>
+  public partial class PocketClient
+  {
+    /// <summary>
+    /// Statistics from the user account.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketStatistics> GetUserStatistics(CancellationToken cancellationToken = default(CancellationToken))
+    {
+      return await Request<PocketStatistics>("stats", cancellationToken);
+    }
+
+
+    /// <summary>
+    /// Returns API usage statistics.
+    /// If a request was made before, the data is returned synchronously from the cache.
+    /// Note: This method only works for authenticated users with a given AccessCode.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    public async Task<PocketLimits> GetUsageLimits(CancellationToken cancellationToken = default(CancellationToken))
+    {
+      string rateLimitForConsumerKey = TryGetHeaderValue(lastHeaders, "X-Limit-Key-Limit");
+
+      if (rateLimitForConsumerKey == null)
+      {
+        // this is the fastest way to do a non-failing request to receive the correct headers
+        await Get(
+          cancellationToken: cancellationToken,
+          count: 1
+        );
+      }
+
+      return new PocketLimits()
+      {
+        RateLimitForConsumerKey = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-Key-Limit")),
+        RemainingCallsForConsumerKey = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-Key-Remaining")),
+        SecondsUntilLimitResetsForConsumerKey = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-Key-Reset")),
+        RateLimitForUser = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-User-Limit")),
+        RemainingCallsForUser = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-User-Remaining")),
+        SecondsUntilLimitResetsForUser = Convert.ToInt32(TryGetHeaderValue(lastHeaders, "X-Limit-User-Reset"))
+      };
+    }
+  }
+}

PocketSharp/FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Weavers>
+  <PropertyChanged />
+</Weavers>

PocketSharp/IPocketClient.cs

@@ -0,0 +1,464 @@
+using PocketSharp.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PocketSharp
+{
+  public interface IPocketClient
+  {
+    #region properties
+    /// <summary>
+    /// callback URLi for API calls
+    /// </summary>
+    /// <value>
+    /// The callback URI.
+    /// </value>
+    string CallbackUri { get; set; }
+
+    /// <summary>
+    /// Accessor for the Pocket API key
+    /// see: http://getpocket.com/developer
+    /// </summary>
+    /// <value>
+    /// The consumer key.
+    /// </value>
+    string ConsumerKey { get; set; }
+
+    /// <summary>
+    /// Code retrieved on authentification
+    /// </summary>
+    /// <value>
+    /// The request code.
+    /// </value>
+    string RequestCode { get; set; }
+
+    /// <summary>
+    /// Code retrieved on authentification-success
+    /// </summary>
+    /// <value>
+    /// The access code.
+    /// </value>
+    string AccessCode { get; set; }
+
+    /// <summary>
+    /// Action which is executed before every request
+    /// </summary>
+    /// <value>
+    /// The pre request callback.
+    /// </value>
+    Action<string> PreRequest { get; set; }
+    #endregion
+
+    #region account methods
+    /// <summary>
+    /// Retrieves the requestCode from Pocket, which is used to generate the Authentication URI to authenticate the user
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="System.NullReferenceException">Authentication methods need a callbackUri on initialization of the PocketClient class</exception>
+    /// <exception cref="PocketException"></exception>
+    Task<string> GetRequestCode(CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Generate Authentication URI from requestCode
+    /// </summary>
+    /// <param name="requestCode">The requestCode. If no requestCode is supplied, the property from the PocketClient intialization is used.</param>
+    /// <returns>
+    /// A valid URI to redirect the user to.
+    /// </returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    Uri GenerateAuthenticationUri(string requestCode = null);
+
+    /// <summary>
+    /// Requests the access code and username after authentication
+    /// The access code has to permanently be stored within the users session, and should be passed in the constructor for all future PocketClient initializations.
+    /// </summary>
+    /// <param name="requestCode">The request code.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>
+    /// The authenticated user
+    /// </returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    Task<PocketUser> GetUser(string requestCode = null, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Generate registration URI from requestCode
+    /// </summary>
+    /// <param name="requestCode">The requestCode. If no requestCode is supplied, the property from the PocketClient intialization is used.</param>
+    /// <returns>A valid URI to redirect the user to.</returns>
+    /// <exception cref="System.NullReferenceException">Call GetRequestCode() first to receive a request_code</exception>
+    Uri GenerateRegistrationUri(string requestCode = null);
+    #endregion
+
+    #region add methods
+    /// <summary>
+    /// Adds a new item to pocket
+    /// </summary>
+    /// <param name="uri">The URL of the item you want to save</param>
+    /// <param name="tags">A comma-separated list of tags to apply to the item</param>
+    /// <param name="title">This can be included for cases where an item does not have a title, which is typical for image or PDF URLs. If Pocket detects a title from the content of the page, this parameter will be ignored.</param>
+    /// <param name="tweetID">If you are adding Pocket support to a Twitter client, please send along a reference to the tweet status id. This allows Pocket to show the original tweet alongside the article.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>
+    /// A simple representation of the saved item which doesn't contain all data (is only returned by calling the Retrieve method)
+    /// </returns>
+    /// <exception cref="System.FormatException">(1) Uri should be absolute.</exception>
+    /// <exception cref="PocketException"></exception>
+    Task<PocketItem> Add(Uri uri, string[] tags = null, string title = null, string tweetID = null, CancellationToken cancellationToken = default(CancellationToken));
+    #endregion
+
+    #region get methods
+    /// <summary>
+    /// Retrieves items from pocket
+    /// with the given filters
+    /// </summary>
+    /// <param name="state">The state.</param>
+    /// <param name="favorite">The favorite.</param>
+    /// <param name="tag">The tag.</param>
+    /// <param name="contentType">Type of the content.</param>
+    /// <param name="sort">The sort.</param>
+    /// <param name="search">The search.</param>
+    /// <param name="domain">The domain.</param>
+    /// <param name="since">The since.</param>
+    /// <param name="count">The count.</param>
+    /// <param name="offset">The offset.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<IEnumerable<PocketItem>> Get(
+      State? state = null,
+      bool? favorite = null,
+      string tag = null,
+      ContentType? contentType = null,
+      Sort? sort = null,
+      string search = null,
+      string domain = null,
+      DateTime? since = null,
+      int? count = null,
+      int? offset = null,
+      CancellationToken cancellationToken = default(CancellationToken)
+    );
+
+    /// <summary>
+    /// Retrieves an item by a given ID
+    /// Note: The Pocket API contains no method, which allows to retrieve a single item, so all items are retrieved and filtered locally by the ID.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<PocketItem> Get(string itemID, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Retrieves all items by a given filter
+    /// </summary>
+    /// <param name="filter">The filter.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<IEnumerable<PocketItem>> Get(RetrieveFilter filter, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Converts a raw JSON response to a PocketItem list
+    /// </summary>
+    /// <param name="itemsJSON">The raw JSON response.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    IEnumerable<PocketItem> ConvertJsonToList(string itemsJSON);
+
+    /// <summary>
+    /// Retrieves all available tags.
+    /// Note: The Pocket API contains no method, which allows to retrieve all tags, so all items are retrieved and the associated tags extracted.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<IEnumerable<PocketTag>> GetTags(CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Retrieves items by tag
+    /// </summary>
+    /// <param name="tag">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<IEnumerable<PocketItem>> SearchByTag(string tag, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Retrieves items which match the specified search string in title and URI
+    /// </summary>
+    /// <param name="searchString">The search string.</param>
+    /// <param name="tag">Filter by tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="System.ArgumentOutOfRangeException">Search string length has to be a minimum of 2 chars</exception>
+    /// <exception cref="PocketException"></exception>
+    Task<IEnumerable<PocketItem>> Search(string searchString, string tag = null, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Retrieves the article content from an URI
+    /// WARNING: 
+    /// You have to pass the parseUri in the PocketClient ctor for this method to work.
+    /// This is a private API and can only be used by authenticated users.
+    /// </summary>
+    /// <param name="tag">The article URI.</param>
+    /// <param name="includeImages">Include images into content or use placeholder.</param>
+    /// <param name="includeVideos">Include videos into content or use placeholder.</param>
+    /// <param name="forceRefresh">Force refresh of the content (don't use cache).</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<PocketArticle> GetArticle(Uri uri, bool includeImages = true, bool includeVideos = true, bool forceRefresh = false, CancellationToken cancellationToken = default(CancellationToken));
+    #endregion
+
+    #region modify methods
+    /// <summary>
+    /// Sends multiple actions in one request.
+    /// See: http://getpocket.com/developer/docs/v3/modify
+    /// </summary>
+    /// <param name="actions">The actions.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> SendActions(IEnumerable<PocketAction> actions, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Archives the specified item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Archive(string itemID, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Archives the specified item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Archive(PocketItem item, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Un-archives the specified item (alias for Readd).
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Unarchive(string itemID, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Unarchives the specified item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Unarchive(PocketItem item, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Favorites the specified item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Favorite(string itemID, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Favorites the specified item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Favorite(PocketItem item, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Un-favorites the specified item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Unfavorite(string itemID, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Un-favorites the specified item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Unfavorite(PocketItem item, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Deletes the specified item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> Delete(string itemID, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Deletes the specified item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    Task<bool> Delete(PocketItem item, CancellationToken cancellationToken = default(CancellationToken));
+    #endregion
+
+    #region modify tags methods
+    /// <summary>
+    /// Adds the specified tags to an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> AddTags(string itemID, string[] tags, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Adds the specified tags to an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> AddTags(PocketItem item, string[] tags, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Removes the specified tags from an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RemoveTags(string itemID, string[] tags, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Removes the specified tags from an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="tags">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RemoveTags(PocketItem item, string[] tags, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Removes a tag from an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="tag">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RemoveTag(string itemID, string tag, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Removes a tag from an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="tag">The tag.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RemoveTag(PocketItem item, string tag, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Clears all tags from an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RemoveTags(string itemID, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Clears all tags from an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RemoveTags(PocketItem item, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Replaces all existing tags with the given tags in an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> ReplaceTags(string itemID, string[] tags, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Replaces all existing tags with the given new ones in an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="tags">The tags.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> ReplaceTags(PocketItem item, string[] tags, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Renames a tag in an item.
+    /// </summary>
+    /// <param name="itemID">The item ID.</param>
+    /// <param name="oldTag">The old tag.</param>
+    /// <param name="newTag">The new tag name.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RenameTag(string itemID, string oldTag, string newTag, CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Renames a tag in an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="oldTag">The old tag.</param>
+    /// <param name="newTag">The new tag name.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<bool> RenameTag(PocketItem item, string oldTag, string newTag, CancellationToken cancellationToken = default(CancellationToken));
+    #endregion
+     
+    #region statistics methods
+    /// <summary>
+    /// Statistics from the user account.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<PocketStatistics> GetUserStatistics(CancellationToken cancellationToken = default(CancellationToken));
+
+    /// <summary>
+    /// Returns API usage statistics.
+    /// If a request was made before, the data is returned synchronously from the cache.
+    /// Note: This method only works for authenticated users with a given AccessCode.
+    /// </summary>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException"></exception>
+    Task<PocketLimits> GetUsageLimits(CancellationToken cancellationToken = default(CancellationToken));
+    #endregion
+
+    /// <summary>
+    /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+    /// </summary>
+    void Dispose();
+  }
+}

PocketSharp/JsonDeserializer.cs

@@ -1,79 +0,0 @@
-using RestSharp;
-using RestSharp.Deserializers;
-using ServiceStack.Text;
-using System;
-
-namespace PocketSharp
-{
-  /// <summary>
-  /// Custom JSON Deserializer which implements ServiceStack.Text
-  /// </summary>
-  internal class JsonDeserializer : IDeserializer
-  {
-    public const string JsonContentType = "application/json";
-
-    /// <summary>
-    /// Deserializes the specified response.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="response">The response.</param>
-    /// <returns></returns>
-    public T Deserialize<T>(IRestResponse response)
-    {
-      return JsonSerializer.DeserializeFromString<T>(response.Content);
-    }
-
-
-    /// <summary>
-    /// Adds custom deserialization for specific types.
-    /// </summary>
-    public static void AddCustomDeserialization()
-    {
-      // generate correct Uri format
-      JsConfig<Uri>.DeSerializeFn = value => new Uri(value);
-
-      // create DateTime from UNIX timestamp input
-      JsConfig<DateTime?>.DeSerializeFn = value =>
-      {
-        if (value == "0") return null;
-        return new DateTime(1970, 1, 1, 0, 0, 0, 0).AddSeconds(Convert.ToDouble(value)).ToLocalTime();
-      };
-    }
-
-
-    /// <summary>
-    /// Gets or sets the date format.
-    /// </summary>
-    /// <value>
-    /// The date format.
-    /// </value>
-    public string DateFormat { get; set; }
-
-    /// <summary>
-    /// Gets or sets the namespace.
-    /// </summary>
-    /// <value>
-    /// The namespace.
-    /// </value>
-    public string Namespace { get; set; }
-
-    /// <summary>
-    /// Gets or sets the root element.
-    /// </summary>
-    /// <value>
-    /// The root element.
-    /// </value>
-    public string RootElement { get; set; }
-
-    /// <summary>
-    /// Gets the type of the content.
-    /// </summary>
-    /// <value>
-    /// The type of the content.
-    /// </value>
-    public string ContentType
-    {
-      get { return JsonContentType; }
-    }
-  }
-}

PocketSharp/Models/Parameters/ActionParameter.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace PocketSharp.Models
-{
-  /// <summary>
-  /// All parameters which can be passed for a modify action
-  /// </summary>
-  public class ActionParameter
-  {
-    /// <summary>
-    /// Gets or sets the action.
-    /// </summary>
-    /// <value>
-    /// The action.
-    /// </value>
-    public string Action { get; set; }
-
-    /// <summary>
-    /// Gets or sets the ID.
-    /// </summary>
-    /// <value>
-    /// The ID.
-    /// </value>
-    public int ID { get; set; }
-
-    /// <summary>
-    /// Gets or sets the time.
-    /// </summary>
-    /// <value>
-    /// The time.
-    /// </value>
-    public DateTime? Time { get; set; }
-
-    // specific params
-
-    /// <summary>
-    /// Gets or sets the tags.
-    /// </summary>
-    /// <value>
-    /// The tags.
-    /// </value>
-    public string[] Tags { get; set; }
-
-    /// <summary>
-    /// Gets or sets the old tag.
-    /// </summary>
-    /// <value>
-    /// The old tag.
-    /// </value>
-    public string OldTag { get; set; }
-
-    /// <summary>
-    /// Gets or sets the new tag.
-    /// </summary>
-    /// <value>
-    /// The new tag.
-    /// </value>
-    public string NewTag { get; set; }
-
-
-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public object Convert()
-    {
-      Dictionary<string, object> parameters = new Dictionary<string, object>
-      {
-        { "item_id", ID },
-        { "action", Action }
-      };
-
-      if (Time != null)
-        parameters.Add("time", Utilities.GetUnixTimestamp(Time));
-      if (Tags != null)
-        parameters.Add("tags", String.Join(",", Tags));
-      if (OldTag != null)
-        parameters.Add("old_tag", OldTag);
-      if (NewTag != null)
-        parameters.Add("new_tag", NewTag);
-
-      return parameters;
-    }
-  }
-}

PocketSharp/Models/Parameters/AddParameters.cs

@@ -1,13 +1,13 @@
-using RestSharp;
-using System;
-using System.Collections.Generic;
+using System;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// All parameters which can be passed to add a new item
   /// </summary>
-  public class AddParameters
+  [DataContract]
+  internal class AddParameters : Parameters
   {
     /// <summary>
     /// Gets or sets the URI.
@@ -15,6 +15,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The URI.
     /// </value>
+    [DataMember(Name="url")]
     public Uri Uri { get; set; }
 
     /// <summary>
@@ -23,6 +24,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The title.
     /// </value>
+    [DataMember(Name="title")]
     public string Title { get; set; }
 
     /// <summary>
@@ -31,6 +33,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The tags.
     /// </value>
+    [DataMember(Name="tags")]
     public string[] Tags { get; set; }
 
     /// <summary>
@@ -39,21 +42,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The tweet ID.
     /// </value>
+    [DataMember(Name="tweet_id")]
     public string TweetID { get; set; }
-
-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public List<Parameter> Convert()
-    {
-      return new List<Parameter>()
-      {
-        Utilities.CreateParam("url", Uri.ToString() ),
-        Utilities.CreateParam("title", Title),
-        Utilities.CreateParam("tags", String.Join(",", Tags)),
-        Utilities.CreateParam("tweet_id", TweetID)
-      };
-    }
   }
 }

PocketSharp/Models/Parameters/ModifyParameters.cs

@@ -1,13 +1,13 @@
-using RestSharp;
-using ServiceStack.Text;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// All parameters which can be passed to modify an item
   /// </summary>
-  public class ModifyParameters
+  [DataContract]
+  internal class ModifyParameters : Parameters
   {
     /// <summary>
     /// Gets or sets the actions.
@@ -15,23 +15,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The actions.
     /// </value>
-    public List<ActionParameter> Actions { get; set; }
-
-
-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public List<Parameter> Convert()
-    {
-      List<object> actions = new List<object>();
-
-      Actions.ForEach(action => actions.Add(action.Convert()));
-
-      return new List<Parameter>()
-      {
-        Utilities.CreateParam("actions", JsonSerializer.SerializeToString(actions))
-      };
-    }
+    [DataMember(Name = "actions")]
+    public IEnumerable<Dictionary<string, string>> Actions { get; set; }
   }
 }

PocketSharp/Models/Parameters/Parameters.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Linq;
+using System.Collections;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// Parameter
+  /// </summary>
+  internal class Parameters
+  {
+
+    /// <summary>
+    /// Converts an object to a list of HTTP Post parameters.
+    /// </summary>
+    /// <returns></returns>
+    public Dictionary<string, string> Convert()
+    {
+      // store HTTP parameters here
+      Dictionary<string, string> parameterDict = new Dictionary<string, string>();
+
+      // get object properties
+      IEnumerable<MemberInfo> properties = this.GetType()
+        .GetTypeInfo()
+        .DeclaredMembers
+        .Where(p => p.CustomAttributes.FirstOrDefault(a => a.AttributeType == typeof(DataMemberAttribute)) != null);
+
+      // gather attributes of object
+      foreach (MemberInfo memberInfo in properties)
+      {
+        DataMemberAttribute attribute = (DataMemberAttribute)memberInfo.GetCustomAttributes(typeof(DataMemberAttribute‌), false).FirstOrDefault();
+        string name = attribute.Name ?? memberInfo.Name.ToLower();
+        object value = null;
+
+        if (memberInfo is FieldInfo)
+        {
+          value = ((FieldInfo)memberInfo).GetValue(this);
+        }
+        else
+        {
+          value = ((PropertyInfo)memberInfo).GetValue(this, null);
+        }
+
+        // invalid parameter
+        if (value == null)
+        {
+          continue;
+        }
+
+        // convert array to comma-seperated list
+        if (value is IEnumerable && value.GetType().GetElementType() == typeof(string))
+        {
+          value = string.Join(",", ((IEnumerable)value).Cast<object>().Select(x => x.ToString()).ToArray());
+        }
+
+        // convert booleans
+        if (value is bool)
+        {
+          value = System.Convert.ToBoolean(value) ? "1" : "0";
+        }
+
+        // convert DateTime to UNIX timestamp
+        if (value is DateTime)
+        {
+          value = (int)((DateTime)value - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds;
+        }
+
+        parameterDict.Add(name, value.ToString());
+      }
+
+      return parameterDict;
+    }
+  }
+}

PocketSharp/Models/Parameters/RetrieveParameters.cs

@@ -1,13 +1,13 @@
-using RestSharp;
-using System;
-using System.Collections.Generic;
+using System;
+using System.Runtime.Serialization;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// All parameters which can be passed for item retrieval
   /// </summary>
-  public class RetrieveParameters
+  [DataContract]
+  internal class RetrieveParameters : Parameters
   {
     /// <summary>
     /// Gets or sets the state.
@@ -15,7 +15,8 @@ namespace PocketSharp.Models
     /// <value>
     /// The state.
     /// </value>
-    public StateEnum? State { get; set; }
+    [DataMember(Name = "state")]
+    public State? State { get; set; }
 
     /// <summary>
     /// Gets or sets the favorite.
@@ -23,6 +24,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The favorite.
     /// </value>
+    [DataMember(Name = "favorite")]
     public bool? Favorite { get; set; }
 
     /// <summary>
@@ -31,6 +33,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The tag.
     /// </value>
+    [DataMember(Name = "tag")]
     public string Tag { get; set; }
 
     /// <summary>
@@ -39,7 +42,8 @@ namespace PocketSharp.Models
     /// <value>
     /// The type of the content.
     /// </value>
-    public ContentTypeEnum? ContentType { get; set; }
+    [DataMember(Name = "contentType")]
+    public ContentType? ContentType { get; set; }
 
     /// <summary>
     /// Gets or sets the sort.
@@ -47,7 +51,8 @@ namespace PocketSharp.Models
     /// <value>
     /// The sort.
     /// </value>
-    public SortEnum? Sort { get; set; }
+    [DataMember(Name = "sort")]
+    public Sort? Sort { get; set; }
 
     /// <summary>
     /// Gets or sets the type of the detail.
@@ -55,7 +60,8 @@ namespace PocketSharp.Models
     /// <value>
     /// The type of the detail.
     /// </value>
-    public DetailTypeEnum? DetailType { get; set; }
+    [DataMember(Name="detailType")]
+    public DetailType? DetailType { get; set; }
 
     /// <summary>
     /// Gets or sets the search.
@@ -63,6 +69,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The search.
     /// </value>
+    [DataMember(Name = "search")]
     public string Search { get; set; }
 
     /// <summary>
@@ -71,6 +78,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The domain.
     /// </value>
+    [DataMember(Name = "domain")]
     public string Domain { get; set; }
 
     /// <summary>
@@ -79,6 +87,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The since.
     /// </value>
+    [DataMember(Name = "since")]
     public DateTime? Since { get; set; }
 
     /// <summary>
@@ -87,6 +96,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The count.
     /// </value>
+    [DataMember(Name = "count")]
     public int? Count { get; set; }
 
     /// <summary>
@@ -95,37 +105,15 @@ namespace PocketSharp.Models
     /// <value>
     /// The offset.
     /// </value>
+    [DataMember(Name = "offset")]
     public int? Offset { get; set; }
-
-
-    /// <summary>
-    /// Converts this instance to a parameter list.
-    /// </summary>
-    /// <returns></returns>
-    public List<Parameter> Convert()
-    {
-      return new List<Parameter>()
-      {
-        Utilities.CreateParam("state", State != null ? State.ToString() : null ),
-        Utilities.CreateParam("favorite", Favorite != null ? (bool)Favorite ? "1" : "0" : null),
-        Utilities.CreateParam("tag", Tag),
-        Utilities.CreateParam("contentType", ContentType != null ? ContentType.ToString() : null),
-        Utilities.CreateParam("sort", Sort != null ? Sort.ToString() : null),
-        Utilities.CreateParam("detailType", DetailType != null ? DetailType.ToString() : null),
-        Utilities.CreateParam("search", Search),
-        Utilities.CreateParam("domain", Domain),
-        Utilities.CreateParam("since", Utilities.GetUnixTimestamp(Since)),
-        Utilities.CreateParam("count", Count),
-        Utilities.CreateParam("offset", Offset)
-      };
-    }
   }
 
 
   /// <summary>
   /// Item states
   /// </summary>
-  public enum StateEnum
+  public enum State
   {
     /// <summary>
     /// Only unread items
@@ -144,7 +132,7 @@ namespace PocketSharp.Models
   /// <summary>
   /// Sorting
   /// </summary>
-  public enum SortEnum
+  public enum Sort
   {
     /// <summary>
     /// Newest first
@@ -167,7 +155,7 @@ namespace PocketSharp.Models
   /// <summary>
   /// Item types
   /// </summary>
-  public enum ContentTypeEnum
+  public enum ContentType
   {
     /// <summary>
     /// Articles
@@ -186,7 +174,7 @@ namespace PocketSharp.Models
   /// <summary>
   /// Item data
   /// </summary>
-  public enum DetailTypeEnum
+  public enum DetailType
   {
     /// <summary>
     /// Necessary data

PocketSharp/Models/PocketAction.cs

@@ -0,0 +1,129 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// All parameters which can be passed for a send action
+  /// </summary>
+  [DataContract]
+  public class PocketAction
+  {
+    /// <summary>
+    /// Gets or sets the action.
+    /// </summary>
+    /// <value>
+    /// The action.
+    /// </value>
+    [DataMember(Name = "action")]
+    public string Action { get; set; }
+
+    /// <summary>
+    /// Gets or sets the PocketItem ID.
+    /// </summary>
+    /// <value>
+    /// The ID.
+    /// </value>
+    [DataMember(Name = "item_id")]
+    public string ID { get; set; }
+
+    /// <summary>
+    /// Gets or sets the URI (for adding a new item).
+    /// </summary>
+    /// <value>
+    /// The URI.
+    /// </value>
+    [DataMember(Name = "url")]
+    public Uri Uri { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Title (for adding a new item).
+    /// </summary>
+    /// <value>
+    /// The Title.
+    /// </value>
+    [DataMember(Name = "title")]
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the associated Tweet ID.
+    /// </summary>
+    /// <value>
+    /// The Tweet ID.
+    /// </value>
+    [DataMember(Name = "ref_id")]
+    public string TweetID { get; set; }
+
+    /// <summary>
+    /// Gets or sets the time.
+    /// </summary>
+    /// <value>
+    /// The time.
+    /// </value>
+    [DataMember(Name = "time")]
+    public DateTime? Time { get; set; }
+
+    // specific params
+
+    /// <summary>
+    /// Gets or sets the tags.
+    /// </summary>
+    /// <value>
+    /// The tags.
+    /// </value>
+    [DataMember(Name = "tags")]
+    public string[] Tags { get; set; }
+
+    /// <summary>
+    /// Gets or sets the old tag.
+    /// </summary>
+    /// <value>
+    /// The old tag.
+    /// </value>
+    [DataMember(Name = "old_tag")]
+    public string OldTag { get; set; }
+
+    /// <summary>
+    /// Gets or sets the new tag.
+    /// </summary>
+    /// <value>
+    /// The new tag.
+    /// </value>
+    [DataMember(Name = "new_tag")]
+    public string NewTag { get; set; }
+
+
+    /// <summary>
+    /// Converts this instance to a parameter list.
+    /// </summary>
+    /// <returns></returns>
+    internal Dictionary<string, object> Convert()
+    {
+      Dictionary<string, object> parameters = new Dictionary<string, object>
+      {
+        { "action", Action }
+      };
+
+      if (!String.IsNullOrEmpty(ID) && ID != "0")
+        parameters.Add("item_id", ID.ToString());
+      if (Time != null)
+        parameters.Add("time", Time != null ? Utilities.GetUnixTimestamp(Time).ToString() : null);
+      if (Tags != null)
+        parameters.Add("tags", Tags);
+      if (OldTag != null)
+        parameters.Add("old_tag", OldTag);
+      if (NewTag != null)
+        parameters.Add("new_tag", NewTag);
+      if (!String.IsNullOrEmpty(Title))
+        parameters.Add("title", Title);
+      if (!String.IsNullOrEmpty(TweetID))
+        parameters.Add("ref_id", TweetID);
+      if (Uri != null)
+        parameters.Add("url", Uri.OriginalString);
+
+      return parameters;
+    }
+  }
+}

PocketSharp/Models/PocketArticle.cs

@@ -0,0 +1,165 @@
+using Newtonsoft.Json;
+using PropertyChanged;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// Article
+  /// </summary>
+  [JsonObject]
+  [ImplementPropertyChanged]
+  public class PocketArticle
+  {
+    /// <summary>
+    /// Gets or sets the response Code (200 = OK).
+    /// </summary>
+    /// <value>
+    /// The response Code.
+    /// </value>
+    [JsonProperty("responseCode")]
+    public string ResponseCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the ID.
+    /// </summary>
+    /// <value>
+    /// The ID.
+    /// </value>
+    [JsonProperty("resolved_id")]
+    public string ID { get; set; }
+
+    /// <summary>
+    /// Gets or sets the URI.
+    /// </summary>
+    /// <value>
+    /// The URI.
+    /// </value>
+    [JsonProperty("resolvedUrl")]
+    public Uri Uri { get; set; }
+
+    /// <summary>
+    /// Gets or sets the URI.
+    /// </summary>
+    /// <value>
+    /// The URI.
+    /// </value>
+    [JsonProperty("timePublished")]
+    public DateTime? PublishedTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the word count.
+    /// </summary>
+    /// <value>
+    /// The word count.
+    /// </value>
+    [JsonProperty("wordCount")]
+    public int WordCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance is article.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this instance is article; otherwise, <c>false</c>.
+    /// </value>
+    [JsonProperty("isArticle")]
+    public bool IsArticle { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance is video.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this instance is video; otherwise, <c>false</c>.
+    /// </value>
+    [JsonProperty("isVideo")]
+    public bool IsVideo { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance is index.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this instance is index; otherwise, <c>false</c>.
+    /// </value>
+    [JsonProperty("isIndex")]
+    public bool IsIndex { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance used fallback.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this instance used fallback; otherwise, <c>false</c>.
+    /// </value>
+    [JsonProperty("usedFallback")]
+    public bool UsedFallback { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance requires login.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this instance requires login; otherwise, <c>false</c>.
+    /// </value>
+    [JsonProperty("requiresLogin")]
+    public bool RequiresLogin { get; set; }
+
+    /// <summary>
+    /// Gets or sets the images.
+    /// </summary>
+    /// <value>
+    /// The images.
+    /// </value>
+    [JsonProperty("images")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketImage>))]
+    public IEnumerable<PocketImage> Images { get; set; }
+
+    /// <summary>
+    /// Gets or sets the videos.
+    /// </summary>
+    /// <value>
+    /// The videos.
+    /// </value>
+    [JsonProperty("videos")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketVideo>))]
+    public IEnumerable<PocketVideo> Videos { get; set; }
+
+    /// <summary>
+    /// Gets or sets the authors.
+    /// </summary>
+    /// <value>
+    /// The authors.
+    /// </value>
+    [JsonProperty("authors")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketAuthor>))]
+    public IEnumerable<PocketAuthor> Authors { get; set; }
+
+    /// <summary>
+    /// Gets or sets the article title.
+    /// </summary>
+    /// <value>
+    /// The Title.
+    /// </value>
+    [JsonProperty("title")]
+    public string Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Excerpt.
+    /// </summary>
+    /// <value>
+    /// The Excerpt.
+    /// </value>
+    [JsonProperty("excerpt")]
+    public string Excerpt { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Content.
+    /// </summary>
+    /// <value>
+    /// The Content.
+    /// </value>
+    [JsonProperty("article")]
+    public string Content { get; set; }
+  }
+}

PocketSharp/Models/PocketAuthor.cs

@@ -1,12 +1,14 @@
-using System;
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using PropertyChanged;
+using System;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Author
   /// </summary>
-  [DataContract]
+  [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketAuthor
   {
     /// <summary>
@@ -15,7 +17,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The ID.
     /// </value>
-    [DataMember(Name = "author_id")]
+    [JsonProperty("author_id")]
     public string ID { get; set; }
 
     /// <summary>
@@ -24,7 +26,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The name.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public string Name { get; set; }
 
     /// <summary>
@@ -33,7 +35,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The URI.
     /// </value>
-    [DataMember(Name = "url")]
+    [JsonProperty("url")]
     public Uri Uri { get; set; }
   }
 }

PocketSharp/Models/PocketBoolean.cs

@@ -0,0 +1,9 @@
+namespace PocketSharp.Models
+{
+  internal enum PocketBoolean
+  {
+    No = 0,
+    Yes = 1,
+    IsType = 2
+  }
+}

PocketSharp/Models/PocketImage.cs

@@ -1,12 +1,14 @@
-using System;
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using PropertyChanged;
+using System;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Image
   /// </summary>
-  [DataContract]
+  [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketImage
   {
     /// <summary>
@@ -15,7 +17,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The ID.
     /// </value>
-    [DataMember(Name = "image_id")]
+    [JsonProperty("image_id")]
     public string ID { get; set; }
 
     /// <summary>
@@ -24,7 +26,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The caption.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public string Caption { get; set; }
 
     /// <summary>
@@ -33,7 +35,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The credit.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public string Credit { get; set; }
 
     /// <summary>
@@ -42,7 +44,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The URI.
     /// </value>
-    [DataMember(Name = "src")]
+    [JsonProperty("src")]
     public Uri Uri { get; set; }
   }
 }

PocketSharp/Models/PocketItem.cs

@@ -1,6 +1,9 @@
-using System;
+using Newtonsoft.Json;
+using PropertyChanged;
+using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
+using System.Diagnostics;
+using System.Linq;
 
 namespace PocketSharp.Models
 {
@@ -8,8 +11,10 @@ namespace PocketSharp.Models
   /// Item containing all available data
   /// see: http://getpocket.com/developer/docs/v3/retrieve
   /// </summary>
-  [DataContract]
-  public class PocketItem
+  [JsonObject]
+  [ImplementPropertyChanged]
+  [DebuggerDisplay("Uri = {Uri}, Title = {Title}")]
+  public class PocketItem : IComparable
   {
     /// <summary>
     /// Gets or sets the ID.
@@ -17,8 +22,44 @@ namespace PocketSharp.Models
     /// <value>
     /// The ID.
     /// </value>
-    [DataMember(Name = "item_id")]
-    public int ID { get; set; }
+    [JsonProperty("item_id")]
+    public string ID { get; set; }
+
+    /// <summary>
+    /// Gets or sets the resolved identifier.
+    /// </summary>
+    /// <value>
+    /// The resolved identifier.
+    /// </value>
+    [JsonProperty("resolved_id")]
+    public string ResolvedId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the normal URI.
+    /// </summary>
+    /// <value>
+    /// The normal URI.
+    /// </value>
+    [JsonProperty("normal_url")]
+    private Uri _NormalUri { get; set; }
+
+    /// <summary>
+    /// Gets or sets the given URI.
+    /// </summary>
+    /// <value>
+    /// The given URI.
+    /// </value>
+    [JsonProperty("given_url")]
+    private Uri _GivenUri { get; set; }
+
+    /// <summary>
+    /// Gets or sets the resolved URI.
+    /// </summary>
+    /// <value>
+    /// The resolved URI.
+    /// </value>
+    [JsonProperty("resolved_url")]
+    private Uri _ResolvedUri { get; set; }
 
     /// <summary>
     /// Gets or sets the URI.
@@ -26,8 +67,12 @@ namespace PocketSharp.Models
     /// <value>
     /// The URI.
     /// </value>
-    [DataMember(Name = "resolved_url")]
-    public Uri Uri { get; set; }
+    [JsonIgnore]
+    public Uri Uri
+    {
+      get { return _ResolvedUri ?? _GivenUri ?? _NormalUri; }
+      set { _NormalUri = value; _ResolvedUri = value; _GivenUri = value; }
+    }
 
     /// <summary>
     /// Gets or sets the title.
@@ -35,8 +80,30 @@ namespace PocketSharp.Models
     /// <value>
     /// The title.
     /// </value>
-    [DataMember(Name = "resolved_title")]
-    public string Title { get; set; }
+    [JsonProperty("resolved_title")]
+    private string _ResolvedTitle { get; set; }
+
+    /// <summary>
+    /// Gets or sets the title.
+    /// </summary>
+    /// <value>
+    /// The title.
+    /// </value>
+    [JsonProperty("title")]
+    private string _InternalTitle { get; set; }
+
+    /// <summary>
+    /// Gets or sets the title.
+    /// </summary>
+    /// <value>
+    /// The title.
+    /// </value>
+    [JsonIgnore]
+    public string Title
+    {
+      get { return _InternalTitle ?? _ResolvedTitle ?? FullTitle; }
+      set { _InternalTitle = value; _ResolvedTitle = value; }
+    }
 
     /// <summary>
     /// Gets or sets the full title.
@@ -44,7 +111,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The full title.
     /// </value>
-    [DataMember(Name = "given_title")]
+    [JsonProperty("given_title")]
     public string FullTitle { get; set; }
 
     /// <summary>
@@ -53,7 +120,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The excerpt.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public string Excerpt { get; set; }
 
     /// <summary>
@@ -62,7 +129,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The status.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public int Status { get; set; }
 
     /// <summary>
@@ -71,7 +138,7 @@ namespace PocketSharp.Models
     /// <value>
     /// <c>true</c> if this instance is favorite; otherwise, <c>false</c>.
     /// </value>
-    [DataMember(Name = "favorite")]
+    [JsonProperty("favorite")]
     public bool IsFavorite { get; set; }
 
     /// <summary>
@@ -80,7 +147,7 @@ namespace PocketSharp.Models
     /// <value>
     /// <c>true</c> if this instance is archive; otherwise, <c>false</c>.
     /// </value>
-    [IgnoreDataMember]
+    [JsonIgnore]
     public bool IsArchive { get { return Status == 1; } }
 
     /// <summary>
@@ -89,7 +156,7 @@ namespace PocketSharp.Models
     /// <value>
     /// <c>true</c> if this instance is deleted; otherwise, <c>false</c>.
     /// </value>
-    [IgnoreDataMember]
+    [JsonIgnore]
     public bool IsDeleted { get { return Status == 2; } }
 
     /// <summary>
@@ -98,26 +165,47 @@ namespace PocketSharp.Models
     /// <value>
     /// <c>true</c> if this instance is article; otherwise, <c>false</c>.
     /// </value>
-    [DataMember(Name = "is_article")]
+    [JsonProperty("is_article")]
     public bool IsArticle { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating whether this instance has image.
-    /// </summary>
-    /// <value>
-    ///   <c>true</c> if this instance has image; otherwise, <c>false</c>.
-    /// </value>
-    [DataMember(Name = "has_image")]
-    public bool HasImage { get; set; }
-
     /// <summary>
     /// Gets or sets a value indicating whether this instance has video.
     /// </summary>
     /// <value>
     ///   <c>true</c> if this instance has video; otherwise, <c>false</c>.
     /// </value>
-    [DataMember(Name = "has_video")]
-    public bool HasVideo { get; set; }
+    [JsonProperty("has_video")]
+    private PocketBoolean? _HasVideo { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether [has video].
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if [has video]; otherwise, <c>false</c>.
+    /// </value>
+    [JsonIgnore]
+    public bool HasVideo
+    {
+      get
+      {
+        return _HasVideo == PocketBoolean.Yes || _HasVideo == PocketBoolean.IsType;
+      }
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether [is video].
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if [is video]; otherwise, <c>false</c>.
+    /// </value>
+    [JsonIgnore]
+    public bool IsVideo
+    {
+      get
+      {
+        return _HasVideo == PocketBoolean.IsType;
+      }
+    }
 
     /// <summary>
     /// Gets or sets the word count.
@@ -125,7 +213,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The word count.
     /// </value>
-    [DataMember(Name = "word_count")]
+    [JsonProperty("word_count")]
     public int WordCount { get; set; }
 
     /// <summary>
@@ -134,7 +222,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The sort.
     /// </value>
-    [DataMember(Name = "sort_id")]
+    [JsonProperty("sort_id")]
     public int Sort { get; set; }
 
 
@@ -144,7 +232,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The add time.
     /// </value>
-    [DataMember(Name = "time_added")]
+    [JsonProperty("time_added")]
     public DateTime? AddTime { get; set; }
 
     /// <summary>
@@ -153,88 +241,60 @@ namespace PocketSharp.Models
     /// <value>
     /// The update time.
     /// </value>
-    [DataMember(Name = "time_updated")]
+    [JsonProperty("time_updated")]
     public DateTime? UpdateTime { get; set; }
 
     /// <summary>
-    /// Gets or sets the read time.
-    /// </summary>
-    /// <value>
-    /// The read time.
-    /// </value>
-    [DataMember(Name = "time_read")]
-    public DateTime? ReadTime { get; set; }
-
-    /// <summary>
-    /// Gets or sets the favorite time.
-    /// </summary>
-    /// <value>
-    /// The favorite time.
-    /// </value>
-    [DataMember(Name = "time_favorited")]
-    public DateTime? FavoriteTime { get; set; }
-
-
-    /// <summary>
-    /// Gets or sets the _ tag dictionary.
-    /// </summary>
-    /// <value>
-    /// The _ tag dictionary.
-    /// </value>
-    [DataMember(Name = "tags")]
-    public Dictionary<string, PocketTag> TagDictionary { get; set; }
-
-    /// <summary>
-    /// Gets or sets the _ image dictionary.
-    /// </summary>
-    /// <value>
-    /// The _ image dictionary.
-    /// </value>
-    [DataMember(Name = "images")]
-    public Dictionary<string, PocketImage> ImageDictionary { get; set; }
-
-    /// <summary>
-    /// Gets or sets the _ video dictionary.
-    /// </summary>
-    /// <value>
-    /// The _ video dictionary.
-    /// </value>
-    [DataMember(Name = "videos")]
-    public Dictionary<string, PocketVideo> VideoDictionary { get; set; }
-
-    /// <summary>
-    /// Gets or sets the _ author dictionary.
-    /// </summary>
-    /// <value>
-    /// The _ author dictionary.
-    /// </value>
-    [DataMember(Name = "authors")]
-    public Dictionary<string, PocketAuthor> AuthorDictionary { get; set; }
-
-
-    /// <summary>
-    /// Gets the tags.
+    /// Gets or sets the tags as comma-separated strings.
     /// </summary>
     /// <value>
     /// The tags.
     /// </value>
-    [IgnoreDataMember]
-    public List<PocketTag> Tags
+    [JsonIgnore]
+    public string TagsString
     {
-      get { return Utilities.DictionaryToList<PocketTag>(TagDictionary); }
+      get { return Tags != null ? String.Join(",", Tags.Select(tag => tag.Name)) : ""; }
     }
 
     /// <summary>
-    /// Gets the images.
+    /// Gets or sets the tags.
+    /// </summary>
+    /// <value>
+    /// The tags.
+    /// </value>
+    [JsonProperty("tags")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketTag>))]
+    public IEnumerable<PocketTag> Tags { get; set; }
+
+    /// <summary>
+    /// Gets or sets the images.
     /// </summary>
     /// <value>
     /// The images.
     /// </value>
-    [IgnoreDataMember]
-    public List<PocketImage> Images
-    {
-      get { return Utilities.DictionaryToList<PocketImage>(ImageDictionary); }
-    }
+    [JsonProperty("images")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketImage>))]
+    public IEnumerable<PocketImage> Images { get; set; }
+
+    /// <summary>
+    /// Gets or sets the videos.
+    /// </summary>
+    /// <value>
+    /// The videos.
+    /// </value>
+    [JsonProperty("videos")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketVideo>))]
+    public IEnumerable<PocketVideo> Videos { get; set; }
+
+    /// <summary>
+    /// Gets or sets the authors.
+    /// </summary>
+    /// <value>
+    /// The authors.
+    /// </value>
+    [JsonProperty("authors")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketAuthor>))]
+    public IEnumerable<PocketAuthor> Authors { get; set; }
 
     /// <summary>
     /// Gets the lead image.
@@ -242,34 +302,119 @@ namespace PocketSharp.Models
     /// <value>
     /// The lead image.
     /// </value>
-    [IgnoreDataMember]
+    [JsonIgnore]
     public PocketImage LeadImage
     {
-      get { return Images != null ? Images[0] : null; }
+      get { return Images != null && Images.Count() > 0 ? Images.First() : null; }
     }
 
     /// <summary>
-    /// Gets the videos.
+    /// Compares the current instance with another object of the same type and returns an integer that indicates whether the current instance precedes, follows, or occurs in the same position in the sort order as the other object.
     /// </summary>
-    /// <value>
-    /// The videos.
-    /// </value>
-    [IgnoreDataMember]
-    public List<PocketVideo> Videos
+    /// <param name="obj">An object to compare with this instance.</param>
+    /// <returns>
+    /// A value that indicates the relative order of the objects being compared. The return value has these meanings: Value Meaning Less than zero This instance precedes <paramref name="obj" /> in the sort order. Zero This instance occurs in the same position in the sort order as <paramref name="obj" />. Greater than zero This instance follows <paramref name="obj" /> in the sort order.
+    /// </returns>
+    int IComparable.CompareTo(object obj)
     {
-      get { return Utilities.DictionaryToList<PocketVideo>(VideoDictionary); }
+      PocketItem item = (PocketItem)obj;
+
+      if (!AddTime.HasValue)
+      {
+        return 1;
+      }
+      if (!item.AddTime.HasValue)
+      {
+        return -1;
+      }
+
+      return DateTime.Compare(AddTime.Value, item.AddTime.Value);
     }
 
     /// <summary>
-    /// Gets the authors.
+    /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
     /// </summary>
-    /// <value>
-    /// The authors.
-    /// </value>
-    [IgnoreDataMember]
-    public List<PocketAuthor> Authors
+    /// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param>
+    /// <returns>
+    ///   <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.
+    /// </returns>
+    public override bool Equals(object obj)
     {
-      get { return Utilities.DictionaryToList<PocketAuthor>(AuthorDictionary); }
+      if (obj == null)
+      {
+        return false;
+      }
+
+      PocketItem item = (PocketItem)obj;
+
+      if ((Object)item == null)
+      {
+        return false;
+      }
+
+      return ID == item.ID;
+    }
+
+
+    /// <summary>
+    /// Implements the operator ==.
+    /// </summary>
+    /// <param name="a">A.</param>
+    /// <param name="b">The b.</param>
+    /// <returns>
+    /// The result of the operator.
+    /// </returns>
+    public static bool operator ==(PocketItem a, PocketItem b)
+    {
+      if (Object.ReferenceEquals(a, b))
+      {
+        return true;
+      }
+
+      PocketItem itemA = (PocketItem)a;
+      PocketItem itemB = (PocketItem)b;
+
+      if ((Object)itemA == null || (Object)itemB == null)
+      {
+        return false;
+      }
+
+      return itemA.ID == itemB.ID;
+    }
+
+    /// <summary>
+    /// Implements the operator !=.
+    /// </summary>
+    /// <param name="a">A.</param>
+    /// <param name="b">The b.</param>
+    /// <returns>
+    /// The result of the operator.
+    /// </returns>
+    public static bool operator !=(PocketItem a, PocketItem b)
+    {
+      return !(a == b);
+    }
+
+    /// <summary>
+    /// Returns a hash code for this instance.
+    /// </summary>
+    /// <returns>
+    /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+    /// </returns>
+    public override int GetHashCode()
+    {
+      return ID.GetHashCode();
+    }
+
+    /// <summary>
+    /// Returns a <see cref="System.String" /> that represents this instance.
+    /// </summary>
+    /// <returns>
+    /// A <see cref="System.String" /> that represents this instance.
+    /// </returns>
+    public override string ToString()
+    {
+      return ID;
     }
   }
 }

PocketSharp/Models/PocketLimits.cs

@@ -0,0 +1,67 @@
+using Newtonsoft.Json;
+using PropertyChanged;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// API Limitation Statistics
+  /// </summary>
+  [JsonObject]
+  [ImplementPropertyChanged]
+  public class PocketLimits
+  {
+    /// <summary>
+    /// Gets or sets the rate limit.
+    /// </summary>
+    /// <value>
+    /// Rate limit for current consumer key.
+    /// </value>
+    [JsonProperty("X-Limit-Key-Limit")]
+    public int RateLimitForConsumerKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the remaining calls.
+    /// </summary>
+    /// <value>
+    /// Remaining calls for current consumer key.
+    /// </value>
+    [JsonProperty("X-Limit-Key-Remaining")]
+    public int RemainingCallsForConsumerKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reset seconds.
+    /// </summary>
+    /// <value>
+    /// Seconds until limit resets for current consumer key.
+    /// </value>
+    [JsonProperty("X-Limit-Key-Reset")]
+    public int SecondsUntilLimitResetsForConsumerKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the rate limit.
+    /// </summary>
+    /// <value>
+    /// Rate limit for current user.
+    /// </value>
+    [JsonProperty("X-Limit-User-Limit")]
+    public int RateLimitForUser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the remaining calls.
+    /// </summary>
+    /// <value>
+    /// Remaining calls for current user.
+    /// </value>
+    [JsonProperty("X-Limit-User-Remaining")]
+    public int RemainingCallsForUser { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reset seconds.
+    /// </summary>
+    /// <value>
+    /// Seconds until limit resets for current user.
+    /// </value>
+    [JsonProperty("X-Limit-User-Reset")]
+    public int SecondsUntilLimitResetsForUser { get; set; }
+  }
+}

PocketSharp/Models/PocketStatistics.cs

@@ -0,0 +1,40 @@
+using Newtonsoft.Json;
+using PropertyChanged;
+
+namespace PocketSharp.Models
+{
+  /// <summary>
+  /// Statistics
+  /// </summary>
+  [JsonObject]
+  [ImplementPropertyChanged]
+  public class PocketStatistics
+  {
+    /// <summary>
+    /// Gets or sets all items.
+    /// </summary>
+    /// <value>
+    /// All items count.
+    /// </value>
+    [JsonProperty("count_list")]
+    public int CountAll { get; set; }
+
+    /// <summary>
+    /// Gets or sets all read items.
+    /// </summary>
+    /// <value>
+    /// Read items count.
+    /// </value>
+    [JsonProperty("count_read")]
+    public int CountRead { get; set; }
+
+    /// <summary>
+    /// Gets or sets all unread items.
+    /// </summary>
+    /// <value>
+    /// Unread items count.
+    /// </value>
+    [JsonProperty("count_unread")]
+    public int CountUnread { get; set; }
+  }
+}

PocketSharp/Models/PocketTag.cs

@@ -1,11 +1,13 @@
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Tag
   /// </summary>
-  [DataContract]
+  [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketTag
   {
     /// <summary>
@@ -14,7 +16,16 @@ namespace PocketSharp.Models
     /// <value>
     /// The name.
     /// </value>
-    [DataMember(Name = "tag")]
+    [JsonProperty("tag")]
     public string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the item iD.
+    /// </summary>
+    /// <value>
+    /// The name.
+    /// </value>
+    [JsonProperty("item_id")]
+    public string ItemID { get; set; }
   }
 }

PocketSharp/Models/PocketUser.cs

@@ -1,12 +1,14 @@
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using PropertyChanged;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Access Code
   /// </summary>
-  [DataContract]
-  internal class AccessCode
+  [JsonObject]
+  [ImplementPropertyChanged]
+  public class PocketUser
   {
     /// <summary>
     /// Gets or sets the code.
@@ -14,7 +16,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The code.
     /// </value>
-    [DataMember(Name = "access_token")]
+    [JsonProperty("access_token")]
     public string Code { get; set; }
 
     /// <summary>
@@ -23,7 +25,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The username.
     /// </value>
-    [DataMember]
+    [JsonProperty("username")]
     public string Username { get; set; }
   }
 }

PocketSharp/Models/PocketVideo.cs

@@ -1,12 +1,14 @@
-using System;
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using PropertyChanged;
+using System;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Video
   /// </summary>
-  [DataContract]
+  [JsonObject]
+  [ImplementPropertyChanged]
   public class PocketVideo
   {
     /// <summary>
@@ -15,7 +17,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The ID.
     /// </value>
-    [DataMember(Name = "video_id")]
+    [JsonProperty("video_id")]
     public string ID { get; set; }
 
     /// <summary>
@@ -24,7 +26,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The external ID.
     /// </value>
-    [DataMember(Name = "vid")]
+    [JsonProperty("vid")]
     public string ExternalID { get; set; }
 
     /// <summary>
@@ -33,7 +35,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The URI.
     /// </value>
-    [DataMember(Name = "src")]
+    [JsonProperty("src")]
     public Uri Uri { get; set; }
   }
 }

PocketSharp/Models/Response/Add.cs

@@ -1,11 +1,11 @@
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Add Response
   /// </summary>
-  [DataContract]
+  [JsonObject]
   internal class Add : ResponseBase
   {
     /// <summary>
@@ -14,7 +14,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The item.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public PocketItem Item { get; set; }
   }
 }

PocketSharp/Models/Response/Modify.cs

@@ -1,11 +1,11 @@
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Modify Response
   /// </summary>
-  [DataContract]
+  [JsonObject]
   internal class Modify : ResponseBase
   {
     /// <summary>
@@ -14,7 +14,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The action results.
     /// </value>
-    [DataMember(Name = "action_results")]
-    public bool[] ActionResults { get; set; }
+    //[JsonProperty("action_results")]
+    //public bool[] ActionResults { get; set; }
   }
 }

PocketSharp/Models/Response/RequestCode.cs

@@ -1,11 +1,11 @@
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Request Code
   /// </summary>
-  [DataContract]
+  [JsonObject]
   internal class RequestCode
   {
     /// <summary>
@@ -14,7 +14,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The code.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public string Code { get; set; }
 
     /// <summary>
@@ -23,7 +23,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The state.
     /// </value>
-    [DataMember]
+    [JsonProperty]
     public string State { get; set; }
   }
 }

PocketSharp/Models/Response/ResponseBase.cs

@@ -1,11 +1,11 @@
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Base for Responses
   /// </summary>
-  [DataContract]
+  [JsonObject]
   internal class ResponseBase
   {
     /// <summary>
@@ -14,7 +14,7 @@ namespace PocketSharp.Models
     /// <value>
     ///   <c>true</c> if status is OK; otherwise, <c>false</c>.
     /// </value>
-    [DataMember(Name = "status")]
+    [JsonProperty("status")]
     public bool Status { get; set; }
   }
 }

PocketSharp/Models/Response/Retrieve.cs

@@ -1,12 +1,13 @@
-using System.Collections.Generic;
-using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
 
 namespace PocketSharp.Models
 {
   /// <summary>
   /// Item Response
   /// </summary>
-  [DataContract]
+  [JsonObject]
   internal class Retrieve : ResponseBase
   {
     /// <summary>
@@ -15,7 +16,7 @@ namespace PocketSharp.Models
     /// <value>
     /// The complete.
     /// </value>
-    [DataMember(Name = "complete")]
+    [JsonProperty("complete")]
     public int Complete { get; set; }
 
     /// <summary>
@@ -24,17 +25,8 @@ namespace PocketSharp.Models
     /// <value>
     /// The since.
     /// </value>
-    [DataMember]
-    public int Since { get; set; }
-
-    /// <summary>
-    /// Gets or sets the _ item dictionary.
-    /// </summary>
-    /// <value>
-    /// The _ item dictionary.
-    /// </value>
-    [DataMember(Name = "list")]
-    public Dictionary<string, PocketItem> ItemDictionary { get; set; }
+    [JsonProperty("since")]
+    public DateTime Since { get; set; }
 
     /// <summary>
     /// Gets the items.
@@ -42,10 +34,8 @@ namespace PocketSharp.Models
     /// <value>
     /// The items.
     /// </value>
-    [IgnoreDataMember]
-    public List<PocketItem> Items
-    {
-      get { return Utilities.DictionaryToList<PocketItem>(ItemDictionary); }
-    }
+    [JsonProperty("list")]
+    [JsonConverter(typeof(ObjectToArrayConverter<PocketItem>))]
+    public IEnumerable<PocketItem> Items { get; set; }
   }
 }

PocketSharp/PocketClient.cs

@@ -1,21 +1,41 @@
-using PocketSharp.Models;
-using RestSharp;
-using RestSharp.Contrib;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using PocketSharp.Models;
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Linq;
 
 namespace PocketSharp
 {
   /// <summary>
   /// PocketClient
   /// </summary>
-  public partial class PocketClient
+  public partial class PocketClient : IPocketClient, IDisposable
   {
     /// <summary>
     /// REST client used for the API communication
     /// </summary>
-    protected readonly RestClient _restClient;
+    protected readonly HttpClient _restClient;
+
+    /// <summary>
+    /// REST client used for the API communication with the Text Parser API
+    /// </summary>
+    protected readonly HttpClient _restParserClient;
+
+    /// <summary>
+    /// Caches HTTP headers from last response
+    /// </summary>
+    public HttpResponseHeaders lastHeaders;
+
+    /// <summary>
+    /// Caches JSON data from last response
+    /// </summary>
+    public string lastResponseData;
 
     /// <summary>
     /// The base URL for the Pocket API
@@ -25,46 +45,95 @@ namespace PocketSharp
     /// <summary>
     /// The authentification URL
     /// </summary>
-    protected string authentificationUri = "https://getpocket.com/auth/authorize?request_token={0}&redirect_uri={1}";
+    protected string authentificationUri = "https://getpocket.com/auth/authorize?request_token={0}&redirect_uri={1}&mobile={2}&force={3}&webauthenticationbroker={4}";
 
     /// <summary>
-    /// callback URL for API calls
+    /// Indicates, whether this client is used for mobile or desktop
     /// </summary>
-    protected string CallbackUri { get; set; }
+    protected bool isMobileClient = true;
+
+    /// <summary>
+    /// Indicates, whether this client is used inside a broker (on Windows 8)
+    /// </summary>
+    protected bool useInsideWebAuthenticationBroker = true;
+
+    /// <summary>
+    /// Indicates, whether the last HTTP response is cached
+    /// </summary>
+    protected bool cacheHTTPResponseData;
+
+    /// <summary>
+    /// callback URLi for API calls
+    /// </summary>
+    /// <value>
+    /// The callback URI.
+    /// </value>
+    public string CallbackUri { get; set; }
 
     /// <summary>
     /// Accessor for the Pocket API key
     /// see: http://getpocket.com/developer
     /// </summary>
+    /// <value>
+    /// The consumer key.
+    /// </value>
     public string ConsumerKey { get; set; }
 
-    /// <summary>
-    /// Returns all associated data from the last request
-    /// </summary>
-    public IRestResponse LastRequestData { get; private set; }
-
     /// <summary>
     /// Code retrieved on authentification
     /// </summary>
+    /// <value>
+    /// The request code.
+    /// </value>
     public string RequestCode { get; set; }
 
     /// <summary>
     /// Code retrieved on authentification-success
     /// </summary>
+    /// <value>
+    /// The access code.
+    /// </value>
     public string AccessCode { get; set; }
 
+    /// <summary>
+    /// Action which is executed before every request
+    /// </summary>
+    /// <value>
+    /// The pre request callback.
+    /// </value>
+    public Action<string> PreRequest { get; set; }
+
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="PocketClient"/> class.
+    /// Initializes a new instance of the <see cref="PocketClient" /> class.
     /// </summary>
     /// <param name="consumerKey">The API key</param>
     /// <param name="accessCode">Provide an access code if the user is already authenticated</param>
     /// <param name="callbackUri">The callback URL is called by Pocket after authentication</param>
-    public PocketClient(string consumerKey, string accessCode = null, string callbackUri = null)
+    /// <param name="handler">The HttpMessage handler.</param>
+    /// <param name="timeout">Request timeout (in seconds).</param>
+    /// <param name="isMobileClient">Indicates, whether this client is used for mobile or desktop</param>
+    /// <param name="useInsideWebAuthenticationBroker">Indicates, whether this client is used inside a broker (on Windows 8), see: http://getpocket.com/developer/docs/getstarted/windows8 </param>
+    /// <param name="parserUri">Enables the wrapper for the private Text Parser API</param>
+    /// <param name="cacheHTTPResponseData">Caches the last HTTP response in public properties</param>
+    public PocketClient(
+      string consumerKey,
+      string accessCode = null,
+      string callbackUri = null,
+      HttpMessageHandler handler = null,
+      int? timeout = null,
+      bool isMobileClient = true,
+      bool useInsideWebAuthenticationBroker = false,
+      Uri parserUri = null,
+      bool cacheHTTPResponseData = true)
     {
       // assign public properties
       ConsumerKey = consumerKey;
 
+      this.isMobileClient = isMobileClient;
+      this.useInsideWebAuthenticationBroker = useInsideWebAuthenticationBroker;
+      this.cacheHTTPResponseData = cacheHTTPResponseData;
+
       // assign access code if submitted
       if (accessCode != null)
       {
@@ -74,58 +143,45 @@ namespace PocketSharp
       // assign callback uri if submitted
       if (callbackUri != null)
       {
-        CallbackUri = HttpUtility.UrlEncode(callbackUri.ToString());
+        CallbackUri = Uri.EscapeUriString(callbackUri.ToString());
+      }
+
+      // assign text parser if parserUri submitted
+      if (parserUri != null)
+      {
+        _restParserClient = new HttpClient(handler ?? new HttpClientHandler()
+        {
+          AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip
+        });
+        _restParserClient.BaseAddress = parserUri;
+        _restParserClient.DefaultRequestHeaders.Add("Accept", "*/*");
+        _restParserClient.DefaultRequestHeaders.Add("X-Accept", "application/json");
+
+        if (timeout.HasValue)
+        {
+          _restParserClient.Timeout = TimeSpan.FromSeconds(timeout.Value);
+        }
       }
 
       // initialize REST client
-      _restClient = new RestClient(baseUri.ToString());
+      _restClient = new HttpClient(handler ?? new HttpClientHandler()
+      {
+        AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip
+      });
 
-      // add default parameters to each request
-      _restClient.AddDefaultParameter("consumer_key", ConsumerKey);
+      if (timeout.HasValue)
+      {
+        _restClient.Timeout = TimeSpan.FromSeconds(timeout.Value);
+      }
+
+      // set base uri
+      _restClient.BaseAddress = baseUri;
 
       // Pocket needs this specific Accept header :-S
-      _restClient.AddDefaultHeader("Accept", "*/*");
+      _restClient.DefaultRequestHeaders.Add("Accept", "*/*");
 
       // defines the response format (according to the Pocket docs)
-      _restClient.AddDefaultHeader("X-Accept", "application/json");
-
-      // custom JSON deserializer (ServiceStack.Text)
-      _restClient.AddHandler("application/json", new JsonDeserializer());
-
-      // add custom deserialization lambdas
-      JsonDeserializer.AddCustomDeserialization();
-    }
-
-
-    /// <summary>
-    /// Makes a HTTP REST request to the API
-    /// </summary>
-    /// <param name="request">The request.</param>
-    /// <returns></returns>
-    protected string Request(RestRequest request)
-    {
-      IRestResponse response = _restClient.Execute(request);
-
-      LastRequestData = response;
-      ValidateResponse(response);
-
-      return response.Content;
-    }
-
-    /// <summary>
-    /// Makes a typed HTTP REST request to the API
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="request">The request.</param>
-    /// <returns></returns>
-    protected T Request<T>(RestRequest request) where T : new()
-    {
-      IRestResponse<T> response = _restClient.Execute<T>(request);
-
-      LastRequestData = response;
-      ValidateResponse(response);
-
-      return response.Data;
+      _restClient.DefaultRequestHeaders.Add("X-Accept", "application/json");
     }
 
 
@@ -134,53 +190,175 @@ namespace PocketSharp
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="method">Requested method (path after /v3/)</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
     /// <param name="parameters">Additional POST parameters</param>
     /// <param name="requireAuth">if set to <c>true</c> [require auth].</param>
     /// <returns></returns>
-    /// <exception cref="APIException">No access token available. Use authentification first.</exception>
-    protected T Get<T>(string method, List<Parameter> parameters = null, bool requireAuth = false) where T : class, new()
+    /// <exception cref="PocketException">No access token available. Use authentification first.</exception>
+    protected async Task<T> Request<T>(
+      string method,
+      CancellationToken cancellationToken,
+      Dictionary<string, string> parameters = null,
+      bool requireAuth = true,
+      bool isReaderRequest = false) where T : class, new()
     {
       if (requireAuth && AccessCode == null)
       {
-        throw new APIException("No access token available. Use authentification first.");
+        throw new PocketException("SDK error: No access token available. Use authentication first.");
+      }
+
+      // rewrite base if it is a request to the Parser API
+      if (isReaderRequest)
+      {
+        if (_restParserClient == null)
+        {
+          throw new PocketException("Please pass the parserUri in the PocketClient ctor.");
+        }
       }
 
       // every single Pocket API endpoint requires HTTP POST data
-      var request = new RestRequest(method, Method.POST);
+      HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, method);
+      HttpResponseMessage response = null;
+      string responseString = null;
+
+      if (parameters == null)
+      {
+        parameters = new Dictionary<string, string>();
+      }
+
+      // add consumer key to each request
+      parameters.Add("consumer_key", ConsumerKey);
 
       // add access token (necessary for all requests except authentification)
-      if (AccessCode != null)
+      if (AccessCode != null && requireAuth)
       {
-        request.AddParameter("access_token", AccessCode);
+        parameters.Add("access_token", AccessCode);
       }
 
-      // enumeration for params
-      if (parameters != null)
+      // content of the request
+      request.Content = new FormUrlEncodedContent(parameters);
+
+      // call pre request action
+      if (PreRequest != null)
       {
-        parameters.ForEach(delegate(Parameter param)
+        PreRequest(method);
+      }
+
+      // make async request
+      try
+      {
+        if (isReaderRequest)
         {
-          request.AddParameter(param);
-        });
+          response = await _restParserClient.SendAsync(request, cancellationToken);
+        }
+        else
+        {
+          response = await _restClient.SendAsync(request, cancellationToken);
+        }
+
+        // validate HTTP response
+        ValidateResponse(response);
+
+        // cache headers
+        if (cacheHTTPResponseData)
+        {
+          lastHeaders = response.Headers;
+        }
+
+        // read response
+        responseString = await response.Content.ReadAsStringAsync();
+      }
+      catch (HttpRequestException exc)
+      {
+        throw new PocketException(exc.Message, exc);
+      }
+      catch (PocketException exc)
+      {
+        throw exc;
+      }
+      finally
+      {
+        request.Dispose();
+
+        if (response != null)
+        {
+          response.Dispose();
+        }
       }
 
-      // do the request
-      return Request<T>(request);
+      // cache response
+      if (cacheHTTPResponseData)
+      {
+        lastResponseData = responseString;
+      }
+
+      return DeserializeJson<T>(responseString);
     }
 
 
     /// <summary>
-    /// Puts an action
+    /// Converts JSON to Pocket objects
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="json">Raw JSON response</param>
+    /// <returns></returns>
+    /// <exception cref="PocketException">Parse error.</exception>
+    protected T DeserializeJson<T>(string json) where T : class, new()
+    {
+      json = json.Replace("[]", "{}");
+
+      // deserialize object
+      T parsedResponse = JsonConvert.DeserializeObject<T>(
+        json,
+        new JsonSerializerSettings
+        {
+          Error = (object sender, ErrorEventArgs args) =>
+          {
+            throw new PocketException(String.Format("Parse error: {0}", args.ErrorContext.Error.Message));
+          },
+          Converters =
+          {
+            new PocketItemConverter(),
+            new BoolConverter(),
+            new UnixDateTimeConverter(),
+            new NullableIntConverter(),
+            new UriConverter()
+          }
+        }
+      );
+
+      return parsedResponse;
+    }
+
+
+    /// <summary>
+    /// Sends a list of actions
+    /// </summary>
+    /// <param name="actionParameters">The action parameters.</param>
+    /// <returns></returns>
+    internal async Task<bool> Send(IEnumerable<PocketAction> actionParameters, CancellationToken cancellationToken)
+    {
+      foreach (PocketAction action in actionParameters)
+      {
+        action.Time = action.Time.HasValue ? ((DateTime)action.Time).ToUniversalTime() : action.Time;
+      }
+
+      Dictionary<string, string> parameters = new Dictionary<string, string>() {{
+        "actions", JsonConvert.SerializeObject(actionParameters.Select(action => action.Convert()))                                                                    
+      }};
+
+      return (await Request<Modify>("send", cancellationToken, parameters)).Status;
+    }
+
+
+    /// <summary>
+    /// Sends an action
     /// </summary>
     /// <param name="actionParameter">The action parameter.</param>
     /// <returns></returns>
-    protected bool PutSendAction(ActionParameter actionParameter)
+    internal async Task<bool> Send(PocketAction actionParameter, CancellationToken cancellationToken)
     {
-      ModifyParameters parameters = new ModifyParameters()
-      {
-        Actions = new List<ActionParameter>() { actionParameter }
-      };
-
-      return Get<Modify>("send", parameters.Convert(), true).Status;
+      return await Send(new List<PocketAction>() { actionParameter }, cancellationToken);
     }
 
 
@@ -189,46 +367,94 @@ namespace PocketSharp
     /// </summary>
     /// <param name="response">The response.</param>
     /// <returns></returns>
-    /// <exception cref="APIException">
+    /// <exception cref="PocketException">
     /// Error retrieving response
     /// </exception>
-    protected void ValidateResponse(IRestResponse response)
+    protected void ValidateResponse(HttpResponseMessage response)
     {
-      if (response.StatusCode != HttpStatusCode.OK)
+      // no error found
+      if (response.StatusCode == HttpStatusCode.OK)
       {
-        // get pocket error headers
-        Parameter error = response.Headers[1];
-        Parameter errorCode = response.Headers[2];
-
-        string exceptionString = response.Content;
-
-        bool isPocketError = error.Name == "X-Error";
-
-        // update message to include pocket response data
-        if (isPocketError)
-        {
-          exceptionString = exceptionString + "\nPocketResponse: (" + errorCode.Value + ") " + error.Value;
-        }
-
-        // create exception
-        APIException exception = new APIException(exceptionString, response.ErrorException);
-
-        if (isPocketError)
-        {
-          // add custom pocket fields
-          exception.PocketError = error.Value.ToString();
-          exception.PocketErrorCode = Convert.ToInt32(errorCode.Value);
-
-          // add to generic exception data
-          exception.Data.Add(error.Name, error.Value);
-          exception.Data.Add(errorCode.Name, errorCode.Value);
-        }
-
-        throw exception;
+        return;
       }
-      else if (response.ErrorException != null)
+
+      string exceptionString = response.ReasonPhrase;
+      bool isPocketError = response.Headers.Contains("X-Error");
+
+      // fetch custom pocket headers
+      string error = TryGetHeaderValue(response.Headers, "X-Error");
+      int errorCode = Convert.ToInt32(TryGetHeaderValue(response.Headers, "X-Error-Code"));
+
+      // create exception strings
+      if (isPocketError)
       {
-        throw new APIException("Error retrieving response", response.ErrorException);
+        exceptionString = String.Format("Pocket error: {0} ({1}) ", error, errorCode);
+      }
+      else
+      {
+        exceptionString = String.Format("Request error: {0} ({1})", response.ReasonPhrase, (int)response.StatusCode);
+      }
+
+      // create exception
+      PocketException exception = new PocketException(exceptionString);
+
+      if (isPocketError)
+      {
+        // add custom pocket fields
+        exception.PocketError = error;
+        exception.PocketErrorCode = errorCode;
+
+        // add to generic exception data
+        exception.Data.Add("X-Error", error);
+        exception.Data.Add("X-Error-Code", errorCode);
+      }
+
+      throw exception;
+    }
+
+
+    /// <summary>
+    /// Tries to fetch a header value.
+    /// </summary>
+    /// <param name="headers">The headers.</param>
+    /// <param name="key">The key.</param>
+    /// <returns></returns>
+    protected string TryGetHeaderValue(HttpResponseHeaders headers, string key)
+    {
+      string result = null;
+
+      if (headers == null || String.IsNullOrEmpty(key))
+      {
+        return null;
+      }
+
+      foreach (var header in headers)
+      {
+        if (header.Key == key)
+        {
+          var headerEnumerator = header.Value.GetEnumerator();
+          headerEnumerator.MoveNext();
+
+          result = headerEnumerator.Current;
+          break;
+        }
+      }
+
+      return result;
+    }
+
+
+    /// <summary>
+    /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+    /// </summary>
+    public void Dispose()
+    {
+      _restClient.Dispose();
+      lastHeaders = null;
+
+      if (_restParserClient != null)
+      {
+        _restParserClient.Dispose();
       }
     }
   }

PocketSharp/PocketSharp.csproj

@@ -2,17 +2,41 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1A291041-ADD8-467C-A6E4-0ACA26328CDF}</ProjectGuid>
+    <ProjectGuid>{817200C3-A327-4E35-9B5F-63A51C088577}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PocketSharp</RootNamespace>
     <AssemblyName>PocketSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <NuGetPackageImportStamp>06ad0893</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,7 +46,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\PocketSharp.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,56 +56,94 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="RestSharp">
-      <HintPath>..\packages\RestSharp.104.1\lib\net4\RestSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.9.49\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="APIException.cs" />
+    <Compile Include="Components\Statistics.cs" />
+    <Compile Include="IPocketClient.cs" />
+    <Compile Include="Models\PocketArticle.cs" />
+    <Compile Include="Models\PocketBoolean.cs" />
+    <Compile Include="Models\PocketLimits.cs" />
+    <Compile Include="Models\PocketStatistics.cs" />
+    <Compile Include="Utilities\PocketAuthException.cs" />
+    <Compile Include="Utilities\PocketException.cs" />
     <Compile Include="Components\Add.cs" />
-    <Compile Include="Components\Authentification.cs" />
+    <Compile Include="Components\Account.cs" />
     <Compile Include="Components\Modify.cs" />
     <Compile Include="Components\ModifyTags.cs" />
-    <Compile Include="Components\Retrieve.cs" />
-    <Compile Include="JsonDeserializer.cs" />
-    <Compile Include="Models\Response\AccessCode.cs" />
-    <Compile Include="Models\Response\RequestCode.cs" />
+    <Compile Include="Components\Get.cs" />
+    <Compile Include="Utilities\JsonExtensions.cs" />
+    <Compile Include="Models\PocketAction.cs" />
     <Compile Include="Models\Parameters\AddParameters.cs" />
+    <Compile Include="Models\Parameters\ModifyParameters.cs" />
+    <Compile Include="Models\Parameters\Parameters.cs" />
+    <Compile Include="Models\Parameters\RetrieveParameters.cs" />
     <Compile Include="Models\PocketAuthor.cs" />
     <Compile Include="Models\PocketImage.cs" />
-    <Compile Include="Models\PocketVideo.cs" />
-    <Compile Include="Models\Response\Add.cs" />
-    <Compile Include="Models\Response\Modify.cs" />
-    <Compile Include="Models\Parameters\ActionParameter.cs" />
-    <Compile Include="Models\Parameters\ModifyParameters.cs" />
-    <Compile Include="Models\Parameters\RetrieveParameters.cs" />
     <Compile Include="Models\PocketItem.cs" />
     <Compile Include="Models\PocketTag.cs" />
+    <Compile Include="Models\PocketVideo.cs" />
+    <Compile Include="Models\PocketUser.cs" />
+    <Compile Include="Models\Response\Add.cs" />
+    <Compile Include="Models\Response\Modify.cs" />
+    <Compile Include="Models\Response\RequestCode.cs" />
     <Compile Include="Models\Response\ResponseBase.cs" />
     <Compile Include="Models\Response\Retrieve.cs" />
     <Compile Include="PocketClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities.cs" />
+    <Compile Include="Utilities\PocketLimitException.cs" />
+    <Compile Include="Utilities\PocketRequestException.cs" />
+    <Compile Include="Utilities\Utilities.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="authentication-screen.png" />
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="PropertyChanged">
+      <HintPath>..\packages\PropertyChanged.Fody.1.48.3\Lib\portable-net4+sl4+wp8+win8+wpa81+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Net.Http">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.22\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.22\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.22\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Content Include="FodyWeavers.xml" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
+  </Target>
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
+    <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
+  </Target>
+  <Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

PocketSharp/PocketSharp.nuspec

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <authors>$author$</authors>
+    <owners>$author$</owners>
+    <licenseUrl>https://raw.github.com/ceee/PocketSharp/master/LICENSE-MIT</licenseUrl>
+    <projectUrl>https://github.com/ceee/PocketSharp</projectUrl>
+    <iconUrl>https://raw.github.com/ceee/PocketSharp/master/Assets/pocketsharp.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>PocketSharp is a C#.NET portable class library that integrates the Pocket API v3.</description>
+    <language>en-US</language>
+    <releaseNotes>
+      <![CDATA[
+        For full release notes see https://github.com/ceee/PocketSharp/blob/master/CHANGELOG.md
+      ]]>
+    </releaseNotes>
+    <copyright>Copyright by cee, 2014</copyright>
+    <tags>PocketAPI Pocket API PocketSharp Tobias Klika cee Scott Lovegrove scottisafool NReadability SgmlReader Reader Article SDK Pockem</tags>
+  </metadata>
+</package>