diff --git a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
index e9ad8a0d6..1e7efdd19 100644
--- a/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
+++ b/Apps/Contoso.Android.Puppet/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.azure.mobile.xamarin.puppet" android:versionCode="37" android:versionName="0.16.1-SNAPSHOT" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.azure.mobile.xamarin.puppet" android:versionCode="39" android:versionName="0.17.0-SNAPSHOT" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="16" />
 	<application android:label="SXPuppet" android:icon="@drawable/Icon" android:theme="@style/PuppetTheme" />
 </manifest>
\ No newline at end of file
diff --git a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
index 5ecce9c1c..9e94c913c 100644
--- a/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Android.Puppet/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj
index 759e31c74..0f513d9f1 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Contoso.Forms.Demo.Droid.csproj
@@ -15,7 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AndroidTlsProvider>
     </AndroidTlsProvider>
   </PropertyGroup>
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml
index e390a2e40..7f1fc737b 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.azure.mobile.xamarin.forms.demo" android:versionName="0.16.0" android:versionCode="40">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.azure.mobile.xamarin.forms.demo" android:versionName="0.16.0" android:versionCode="41">
 	<uses-sdk android:minSdkVersion="15" />
 	<application android:label="MCFDemo">
 		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false" />
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/project.json b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/project.json
index e3ca08d05..eb7db0bb8 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/project.json
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.Azure.Mobile.Analytics": "0.16.0",
     "Microsoft.Azure.Mobile.Crashes": "0.16.0",
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/project.json b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/project.json
index 2edad10dd..0da7ca030 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/project.json
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.UWP/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.Azure.Mobile.Analytics": "0.16.0",
     "Microsoft.Azure.Mobile.Crashes": "0.16.0",
@@ -8,7 +8,7 @@
     "Xamarin.Forms": "2.3.4.231"
   },
   "frameworks": {
-    "uap10.0": {}
+    "uap10.0.10586": {}
   },
   "runtimes": {
     "win10-arm": {},
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs
index 5c1a51bc4..b1eeeeec1 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/AppDelegate.cs
@@ -12,7 +12,14 @@ namespace Contoso.Forms.Demo.iOS
             Xamarin.Forms.Forms.Init();
             Distribute.DontCheckForUpdatesInDebug();
             LoadApplication(new App());
+            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
             return base.FinishedLaunching(uiApplication, launchOptions);
         }
+
+        public override void WillEnterForeground(UIApplication uiApplication)
+        {
+            base.WillEnterForeground(uiApplication);
+            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
+        }
     }
 }
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj
index e429180e6..49d69fe5f 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/Contoso.Forms.Demo.iOS.csproj
@@ -22,7 +22,7 @@
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>true</MtouchFastDev>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386</MtouchArch>
+    <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchTlsProvider>Default</MtouchTlsProvider>
     <DeviceSpecificBuild>false</DeviceSpecificBuild>
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/project.json b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/project.json
index 97f0fdc2d..da82a9684 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/project.json
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.iOS/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.Azure.Mobile.Analytics": "0.16.0",
     "Microsoft.Azure.Mobile.Crashes": "0.16.0",
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs
index cb5ff1aa4..a590c2513 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/App.xaml.cs
@@ -71,8 +71,12 @@ namespace Contoso.Forms.Demo
         {
             Xamarin.Forms.Device.BeginInvokeOnMainThread(() =>
             {
-                var customData = "{" + string.Join(",", e.CustomData.Select(kv => kv.Key + "=" + kv.Value)) + "}";
-                Current.MainPage.DisplayAlert(e.Title, e.Message + "\nCustom data=" + customData, "OK");
+                var message = e.Message;
+                if (e.CustomData != null && e.CustomData.Count > 0)
+                {
+                    message += "\nCustom data = {" + string.Join(",", e.CustomData.Select(kv => kv.Key + "=" + kv.Value)) + "}";
+                }
+                Current.MainPage.DisplayAlert(e.Title, message, "OK");
             });
         }
 
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml
index e018a89e3..e467f99e1 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml
@@ -10,5 +10,5 @@
 		    <TableSection Title="Push">
                 <SwitchCell Text="Push Enabled" On="true" x:Name="PushEnabledSwitchCell" OnChanged="UpdatePushEnabled"/>
             </TableSection>
-        </TableView>
+    </TableView>
 </ContentPage>
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml.cs b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml.cs
index 43cbcce0e..74d4c6d00 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml.cs
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/ModulePages/OthersContentPage.xaml.cs
@@ -22,9 +22,11 @@ namespace Contoso.Forms.Demo
         protected override async void OnAppearing()
         {
             base.OnAppearing();
+            var mcEnabled = await MobileCenter.IsEnabledAsync();
             DistributeEnabledSwitchCell.On = await Distribute.IsEnabledAsync();
-            DistributeEnabledSwitchCell.IsEnabled = await MobileCenter.IsEnabledAsync();
+            DistributeEnabledSwitchCell.IsEnabled = mcEnabled;
             PushEnabledSwitchCell.On = await Push.IsEnabledAsync();
+            PushEnabledSwitchCell.IsEnabled = mcEnabled;
         }
 
         async void UpdateDistributeEnabled(object sender, ToggledEventArgs e)
diff --git a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/project.json b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/project.json
index f7daa5301..e42364014 100644
--- a/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/project.json
+++ b/Apps/Contoso.Forms.Demo/Contoso.Forms.Demo/project.json
@@ -1,4 +1,4 @@
-{
+{
   "dependencies": {
     "Microsoft.Azure.Mobile.Analytics": "0.16.0",
     "Microsoft.Azure.Mobile.Crashes": "0.16.0",
@@ -9,7 +9,7 @@
   },
   "frameworks": {
     "netstandard1.0": {
-        "imports": "portable-net45+win8+wpa81"
+      "imports": "portable-net45+win8+wpa81"
     }
   }
 }
\ No newline at end of file
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj
index 2e0722f26..b10c70fa1 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Contoso.Forms.Puppet.Droid.csproj
@@ -209,6 +209,14 @@
       <Project>{80B9A47A-7A97-4E5A-9706-43ACB25A7240}</Project>
       <Name>Microsoft.Azure.Mobile.Push.Android.Bindings</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Android.Bindings\Microsoft.Azure.Mobile.Rum.Android.Bindings.csproj">
+      <Project>{7E130457-B427-4043-A5A2-9484CB5809BF}</Project>
+      <Name>Microsoft.Azure.Mobile.Rum.Android.Bindings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Android\Microsoft.Azure.Mobile.Rum.Android.csproj">
+      <Project>{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}</Project>
+      <Name>Microsoft.Azure.Mobile.Rum.Android</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ProguardConfiguration Include="proguard.cfg" />
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
index 4f930349a..4bebeecf9 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="38" android:versionName="0.16.1-SNAPSHOT" package="com.microsoft.azure.mobile.xamarin.forms.puppet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="40" android:versionName="0.17.0-SNAPSHOT" package="com.microsoft.azure.mobile.xamarin.forms.puppet">
 	<uses-sdk android:minSdkVersion="15" />
 	<application android:label="MCFPuppet">
 		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver" android:exported="false" />
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs
index 06305d2bd..30b8e7568 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.Droid/Properties/AssemblyInfo.cs
@@ -19,8 +19,8 @@ using Android.App;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Contoso.Forms.Puppet.UWP.csproj b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Contoso.Forms.Puppet.UWP.csproj
index 8d76acd05..5b2233221 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Contoso.Forms.Puppet.UWP.csproj
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Contoso.Forms.Puppet.UWP.csproj
@@ -146,6 +146,10 @@
       <Project>{8072449c-c6a8-4b36-87dc-173f295d161c}</Project>
       <Name>Microsoft.Azure.Mobile.Push.UWP</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.UWP\Microsoft.Azure.Mobile.Rum.UWP.csproj">
+      <Project>{bcd888d1-a62f-458c-a72b-9df731ee1a55}</Project>
+      <Name>Microsoft.Azure.Mobile.Rum.UWP</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.UWP\Microsoft.Azure.Mobile.UWP.csproj">
       <Project>{15e3fc9b-7714-4468-a296-81627a5b8f01}</Project>
       <Name>Microsoft.Azure.Mobile.UWP</Name>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest
index 625611dde..9de9330d1 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="10805zumoTestUser.MobileCenter-Forms-UWP-Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="0.16.1.0" />
+  <Identity Name="10805zumoTestUser.MobileCenter-Forms-UWP-Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="0.17.0.0" />
   <mp:PhoneIdentity PhoneProductId="4a2ad72a-bf19-4c5f-b9a5-54d8911ebbba" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>MobileCenter-Forms-UWP-Puppet</DisplayName>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs
index 893c694da..58dd9d70e 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.UWP/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
 [assembly: ComVisible(false)]
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/AppDelegate.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/AppDelegate.cs
index 24a68445e..95a52e3d6 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/AppDelegate.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/AppDelegate.cs
@@ -15,8 +15,15 @@ namespace Contoso.Forms.Puppet.iOS
             Distribute.DontCheckForUpdatesInDebug();
             MSAnalytics.SetDelegate(new AnalyticsDelegate());
             LoadApplication(new App());
+            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
             return base.FinishedLaunching(uiApplication, launchOptions);
         }
+
+        public override void WillEnterForeground(UIApplication uiApplication)
+        {
+            base.WillEnterForeground(uiApplication);
+            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
+        }
     }
 
     public class AnalyticsDelegate : MSAnalyticsDelegate
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
index 527490e5c..778a69c4d 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet.iOS/Info.plist
@@ -5,9 +5,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.microsoft.azure.mobile.xamarin.forms.puppet</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.16.1</string>
+	<string>0.17.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.16.1</string>
+	<string>0.17.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
index 208a3fdf2..4430c2f95 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/App.xaml.cs
@@ -1,14 +1,15 @@
-using Microsoft.Azure.Mobile;
-using Microsoft.Azure.Mobile.Analytics;
-using Microsoft.Azure.Mobile.Crashes;
-using Microsoft.Azure.Mobile.Distribute;
-using Microsoft.Azure.Mobile.Push;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+using Microsoft.Azure.Mobile.Crashes;
+using Microsoft.Azure.Mobile.Distribute;
+using Microsoft.Azure.Mobile.Push;
+using Microsoft.Azure.Mobile.Rum;
 using Xamarin.Forms;
 
 namespace Contoso.Forms.Puppet
@@ -42,8 +43,9 @@ namespace Contoso.Forms.Puppet
             MobileCenter.SetLogUrl("https://in-integration.dev.avalanch.es");
             Distribute.SetInstallUrl("http://install.asgard-int.trafficmanager.net");
             Distribute.SetApiUrl("https://asgard-int.trafficmanager.net/api/v0.1");
+            RealUserMeasurements.SetRumKey("b1919553367d44d8b0ae72594c74e0ff");
             MobileCenter.Start($"uwp={UwpKey};android={AndroidKey};ios={IosKey}",
-                typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Push));
+                               typeof(Analytics), typeof(Crashes), typeof(Distribute), typeof(Push), typeof(RealUserMeasurements));
 
             // Need to use reflection because moving this to the Android specific
             // code causes crash. (Unable to access properties before init is called).
@@ -92,8 +94,12 @@ namespace Contoso.Forms.Puppet
         {
             Xamarin.Forms.Device.BeginInvokeOnMainThread(() =>
             {
-                var customData = "{" + string.Join(",", e.CustomData.Select(kv => kv.Key + "=" + kv.Value)) + "}";
-                Current.MainPage.DisplayAlert(e.Title, e.Message + "\nCustom data=" + customData, "OK");
+                var message = e.Message;
+                if (e.CustomData != null && e.CustomData.Count > 0)
+                {
+                    message += "\nCustom data = {" + string.Join(",", e.CustomData.Select(kv => kv.Key + "=" + kv.Value)) + "}";
+                }
+                Current.MainPage.DisplayAlert(e.Title, message, "OK");
             });
         }
 
@@ -222,7 +228,7 @@ namespace Contoso.Forms.Puppet
                 }
                 answer.ContinueWith((task) =>
                 {
-                    if (releaseDetails.MandatoryUpdate || ((Task<bool>) task).Result)
+                    if (releaseDetails.MandatoryUpdate || ((Task<bool>)task).Result)
                     {
                         Distribute.NotifyUpdateAction(UpdateAction.Update);
                     }
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Contoso.Forms.Puppet.csproj b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Contoso.Forms.Puppet.csproj
index 23de95cdf..e83587ca8 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Contoso.Forms.Puppet.csproj
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Contoso.Forms.Puppet.csproj
@@ -123,6 +123,10 @@
       <Project>{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}</Project>
       <Name>Microsoft.Azure.Mobile.Push</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum\Microsoft.Azure.Mobile.Rum.csproj">
+      <Project>{254D5434-9087-4F05-A43F-23A790E42024}</Project>
+      <Name>Microsoft.Azure.Mobile.Rum</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="ModulePages\CustomPropertiesContentPage.xaml">
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml
index 156930e7b..d7921e5d6 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml
@@ -6,25 +6,26 @@
         <TableView Intent="Form">
             <TableSection>
                 <SwitchCell Text="Crashes Enabled" On="true" x:Name="CrashesEnabledSwitchCell" OnChanged="UpdateEnabled"/>
+                <SwitchCell Text="Handle Exceptions" On="false" x:Name="HandleExceptionsSwitchCell"/>
             </TableSection>
             <TableSection>
-                <ViewCell Tapped="TestCrash">
-                    <Button Text="Generate Test Crash" InputTransparent="true" Clicked="TestCrash"/>
+                <ViewCell Tapped="TestException">
+                    <Button Text="Generate Test Exception" InputTransparent="true" Clicked="TestException"/>
                 </ViewCell>
                 <ViewCell Tapped="DivideByZero">
                     <Button Text="Divide 42 by 0" InputTransparent="true" Clicked="DivideByZero"/>
                 </ViewCell>
-                <ViewCell Tapped="CrashWithAggregateException">
-                    <Button Text="Crash With Aggregate Exception" InputTransparent="true" Clicked="CrashWithAggregateException"/>
+                <ViewCell Tapped="AggregateException">
+                    <Button Text="Aggregate Exception" InputTransparent="true" Clicked="AggregateException"/>
                </ViewCell>
-                <ViewCell Tapped="CrashWithNullReferenceException">
-                    <Button Text="Crash With NullReferenceException" InputTransparent="true" Clicked="CrashWithNullReferenceException"/>
+                <ViewCell Tapped="NullReferenceException">
+                    <Button Text="NullReferenceException" InputTransparent="true" Clicked="NullReferenceException"/>
                 </ViewCell>
                 <ViewCell Tapped="CatchNullReferenceException">
                     <Button Text="Test Catching NullReferenceException" InputTransparent="true" Clicked="CatchNullReferenceException"/>
                 </ViewCell>
-				<ViewCell Tapped="CrashAsync">
-                    <Button Text="Crash Inside Async Task" InputTransparent="true" Clicked="CrashAsync"/>
+				<ViewCell Tapped="AsyncException">
+                    <Button Text="Exception Inside Async Task" InputTransparent="true" Clicked="AsyncException"/>
                 </ViewCell>
             </TableSection>
         </TableView>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml.cs
index 275e74e94..6a78e6e7a 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/CrashesContentPage.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Reflection;
 using Microsoft.Azure.Mobile;
 using Microsoft.Azure.Mobile.Crashes;
 using Xamarin.Forms;
@@ -25,29 +26,36 @@ namespace Contoso.Forms.Puppet
             CrashesEnabledSwitchCell.IsEnabled = await MobileCenter.IsEnabledAsync();
         }
 
-        void TestCrash(object sender, EventArgs e)
+        async void UpdateEnabled(object sender, ToggledEventArgs e)
         {
-            Crashes.GenerateTestCrash();
+            await Crashes.SetEnabledAsync(e.Value);
+        }
+
+        void HandleOrThrow(Action action)
+        {
+            try
+            {
+                action();
+            }
+            catch (Exception e) when (HandleExceptionsSwitchCell.On)
+            {
+                TrackException(e);
+            }
+        }
+
+        void TestException(object sender, EventArgs e)
+        {
+            HandleOrThrow(() => Crashes.GenerateTestCrash());
         }
 
         void DivideByZero(object sender, EventArgs e)
         {
             /* This is supposed to cause a crash, so we don't care that the variable 'x' is never used */
 #pragma warning disable CS0219
-            int x = (42 / int.Parse("0"));
+            HandleOrThrow(() => (42 / int.Parse("0")).ToString());
 #pragma warning restore CS0219
         }
 
-        async void UpdateEnabled(object sender, ToggledEventArgs e)
-        {
-            await Crashes.SetEnabledAsync(e.Value);
-        }
-
-        void GenerateTestCrash(object sender, EventArgs e)
-        {
-            Crashes.GenerateTestCrash();
-        }
-
         void CatchNullReferenceException(object sender, EventArgs e)
         {
             try
@@ -60,9 +68,9 @@ namespace Contoso.Forms.Puppet
             }
         }
 
-        void CrashWithNullReferenceException(object sender, EventArgs e)
+        void NullReferenceException(object sender, EventArgs e)
         {
-            TriggerNullReferenceException();
+            HandleOrThrow(() => TriggerNullReferenceException());
         }
 
         void TriggerNullReferenceException()
@@ -77,9 +85,9 @@ namespace Contoso.Forms.Puppet
             System.Diagnostics.Debug.WriteLine("");
         }
 
-        void CrashWithAggregateException(object sender, EventArgs e)
+        void AggregateException(object sender, EventArgs e)
         {
-            throw PrepareException();
+            HandleOrThrow(() => throw PrepareException());
         }
 
         static Exception PrepareException()
@@ -118,9 +126,21 @@ namespace Contoso.Forms.Puppet
             }
         }
 
-        public async void CrashAsync(object sender, EventArgs e)
+        public async void AsyncException(object sender, EventArgs e)
         {
-            await FakeService.DoStuffInBackground();
+            try
+            {
+                await FakeService.DoStuffInBackground();
+            }
+            catch (Exception ex) when (HandleExceptionsSwitchCell.On)
+            {
+                TrackException(ex);
+            }
+        }
+
+        private void TrackException(Exception e)
+        {
+            typeof(Crashes).GetTypeInfo().GetDeclaredMethod("TrackException").Invoke(null, new object[] { e });
         }
     }
 }
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml
index b7e91c8ec..531a7bbd2 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml
@@ -11,5 +11,8 @@
                 <SwitchCell Text="Push Enabled" On="true" x:Name="PushEnabledSwitchCell" OnChanged="UpdatePushEnabled"/>
 			    <SwitchCell Text="Firebase Analytics Enabled" On="true" x:Name="FirebaseAnalyticsEnabledSwitchCell" OnChanged="UpdateFirebaseAnalyticsEnabled"/>
             </TableSection>
+            <TableSection Title="Rum">
+                <SwitchCell Text="Rum Enabled" On="true" x:Name="RumEnabledSwitchCell" OnChanged="UpdateRumEnabled"/>
+            </TableSection>
         </TableView>
 </ContentPage>
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml.cs
index 342fcd7a5..3ddefd9d2 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/ModulePages/OthersContentPage.xaml.cs
@@ -1,6 +1,7 @@
 using Microsoft.Azure.Mobile;
 using Microsoft.Azure.Mobile.Distribute;
 using Microsoft.Azure.Mobile.Push;
+using Microsoft.Azure.Mobile.Rum;
 using Xamarin.Forms;
 
 namespace Contoso.Forms.Puppet
@@ -30,10 +31,11 @@ namespace Contoso.Forms.Puppet
         protected override async void OnAppearing()
         {
             base.OnAppearing();
+            var mcEnabled = await MobileCenter.IsEnabledAsync();
             DistributeEnabledSwitchCell.On = await Distribute.IsEnabledAsync();
-            DistributeEnabledSwitchCell.IsEnabled = await MobileCenter.IsEnabledAsync();
+            DistributeEnabledSwitchCell.IsEnabled = mcEnabled;
             PushEnabledSwitchCell.On = await Push.IsEnabledAsync();
-            PushEnabledSwitchCell.IsEnabled = await MobileCenter.IsEnabledAsync();
+            PushEnabledSwitchCell.IsEnabled = mcEnabled;
             if (XamarinDevice.RuntimePlatform == XamarinDevice.Android)
             {
                 if (!Application.Current.Properties.ContainsKey(FirebaseEnabledKey))
@@ -42,6 +44,8 @@ namespace Contoso.Forms.Puppet
                 }
                 FirebaseAnalyticsEnabledSwitchCell.On = (bool)Application.Current.Properties[FirebaseEnabledKey];
             }
+            RumEnabledSwitchCell.On = await RealUserMeasurements.IsEnabledAsync();
+            RumEnabledSwitchCell.IsEnabled = mcEnabled;
         }
 
         async void UpdateDistributeEnabled(object sender, ToggledEventArgs e)
@@ -51,12 +55,17 @@ namespace Contoso.Forms.Puppet
 
         async void UpdatePushEnabled(object sender, ToggledEventArgs e)
         {
-	        await Push.SetEnabledAsync(e.Value);
+            await Push.SetEnabledAsync(e.Value);
         }
 
         void UpdateFirebaseAnalyticsEnabled(object sender, ToggledEventArgs e)
         {
             Application.Current.Properties[FirebaseEnabledKey] = e.Value;
         }
+
+        async void UpdateRumEnabled(object sender, ToggledEventArgs e)
+        {
+            await RealUserMeasurements.SetEnabledAsync(e.Value);
+        }
     }
 }
diff --git a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs
index 22040275c..beb408ef1 100644
--- a/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.Forms.Puppet/Contoso.Forms.Puppet/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@ using System.Reflection;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Apps/Contoso.UWP.Puppet/Package.appxmanifest b/Apps/Contoso.UWP.Puppet/Package.appxmanifest
index 515300719..c48de636a 100644
--- a/Apps/Contoso.UWP.Puppet/Package.appxmanifest
+++ b/Apps/Contoso.UWP.Puppet/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="10805zumoTestUser.MobileCenter-UWP-Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="0.16.1.0" />
+  <Identity Name="10805zumoTestUser.MobileCenter-UWP-Puppet" Publisher="CN=B2D1C358-6AF8-4416-BF73-129CC1F3C152" Version="0.17.0.0" />
   <mp:PhoneIdentity PhoneProductId="5ab53d3f-9aae-42d1-83b0-e53698a0389e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>MobileCenter-UWP-Puppet</DisplayName>
diff --git a/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
index bdda8b5ca..6f2558676 100644
--- a/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
+++ b/Apps/Contoso.UWP.Puppet/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Demo/App.config b/Apps/Contoso.WPF.Demo/App.config
new file mode 100644
index 000000000..88fa4027b
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Demo/App.xaml b/Apps/Contoso.WPF.Demo/App.xaml
new file mode 100644
index 000000000..c1d106e4a
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="Contoso.WPF.Demo.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Contoso.WPF.Demo"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/Apps/Contoso.WPF.Demo/App.xaml.cs b/Apps/Contoso.WPF.Demo/App.xaml.cs
new file mode 100644
index 000000000..7b0f54029
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/App.xaml.cs
@@ -0,0 +1,20 @@
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+using Microsoft.Azure.Mobile.Crashes;
+using System.Windows;
+
+namespace Contoso.WPF.Demo
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            MobileCenter.LogLevel = LogLevel.Verbose;
+            MobileCenter.SetLogUrl("https://in-integration.dev.avalanch.es");
+            MobileCenter.Start("42f4a839-c54c-44da-8072-a2f2a61751b2", typeof(Analytics), typeof(Crashes));
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj b/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj
new file mode 100644
index 000000000..8660b504f
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/Contoso.WPF.Demo.csproj
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" 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>{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Contoso.WPF.Demo</RootNamespace>
+    <AssemblyName>Contoso.WPF.Demo</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </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>
+  </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>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <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.Net.Http" />
+    <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="Property.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="project.json" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Demo/MainWindow.xaml b/Apps/Contoso.WPF.Demo/MainWindow.xaml
new file mode 100644
index 000000000..c61857db8
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/MainWindow.xaml
@@ -0,0 +1,90 @@
+<Window x:Class="Contoso.WPF.Demo.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Contoso.WPF.Demo"
+        mc:Ignorable="d"
+        Title="Mobile Center WPF Demo App" Height="257.794" Width="335">
+    <StackPanel>
+        <TabControl SelectionChanged="TabControl_SelectionChanged">
+            <TabItem Header="Mobile Center">
+                <StackPanel>
+                    <CheckBox Name="mobileCenterEnabled" Content="Mobile Center Enabled" Margin="0,10,0,10" Checked="mobileCenterEnabled_Checked" Unchecked="mobileCenterEnabled_Checked"/>
+                    <StackPanel Orientation ="Horizontal" HorizontalAlignment="Right" >
+                        <Label Content="Log Level"/>
+                        <ComboBox Name="mobileCenterLogLevel" Width="200" SelectionChanged="mobileCenterLogLevel_SelectionChanged">
+                            <ComboBoxItem Content="Verbose"/>
+                            <ComboBoxItem Content="Debug"/>
+                            <ComboBoxItem Content="Info"/>
+                            <ComboBoxItem Content="Warning"/>
+                            <ComboBoxItem Content="Error"/>
+                        </ComboBox>
+                    </StackPanel>
+                    <GroupBox Header="Log">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="2*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+
+                            <Label Content="Log Tag" Grid.Column="0" Grid.Row="0"/>
+                            <Label Content="Log Message" Grid.Column="0" Grid.Row="1"/>
+                            <Label Content="Log Level" Grid.Column="0" Grid.Row="2"/>
+
+                            <TextBox Name="logTag" Grid.Column="1" Grid.Row="0" Margin="2"/>
+                            <TextBox Name="logMessage" Grid.Column="1" Grid.Row="1" Margin="2"/>
+                            <ComboBox Name="logLevel" Grid.Column="1" Grid.Row="2" Margin="2">
+                                <ComboBoxItem Content="Verbose"/>
+                                <ComboBoxItem Content="Debug"/>
+                                <ComboBoxItem Content="Info"/>
+                                <ComboBoxItem Content="Warning"/>
+                                <ComboBoxItem Content="Error"/>
+                            </ComboBox>
+
+                            <Button Name="writeLog" Content="Write Log" Grid.ColumnSpan="2"  Grid.Row="3" Margin="2" Click="writeLog_Click"/>
+                        </Grid>
+
+                    </GroupBox>
+                </StackPanel>
+
+            </TabItem>
+            <TabItem Header="Analytics">
+                <StackPanel>
+                    <CheckBox Name="analyticsEnabled" Content="Analytics Enabled" Margin="0,10,0,10" Checked="analyticsEnabled_Checked" Unchecked="analyticsEnabled_Checked"/>
+                    <GroupBox Header="Event">
+                        <StackPanel Orientation="Vertical">
+                            <DockPanel LastChildFill="True">
+                                <Label Content="Event Name"/>
+                                <TextBox Name="eventName" VerticalAlignment="Center" />
+                            </DockPanel>
+                            <DataGrid Name="eventProperties" AutoGenerateColumns="False" CanUserAddRows="True" MinHeight="60" HorizontalAlignment="Stretch" VerticalScrollBarVisibility="Auto" SelectionMode="Single" Margin="0,10,0,10">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="Property Key" Width="*" Binding="{Binding Key}"/>
+                                    <DataGridTextColumn Header="Property Value" Width="*" Binding="{Binding Value}"/>
+                                </DataGrid.Columns>
+                            </DataGrid>
+                            <Button Name="trackEvent" Content="Track event" Click="trackEvent_Click"/>
+                        </StackPanel>
+                    </GroupBox>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="Crashes">
+                <StackPanel>
+                    <GroupBox Header="Crash">
+                        <StackPanel Orientation="Vertical">
+                            <Button Name="CrashWithNullReference" Content="Crash with NullReferenceException" Click="CrashWithNullReference_Click"/>
+                        </StackPanel>
+                    </GroupBox>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="Others"/>
+        </TabControl>
+    </StackPanel>
+</Window>
diff --git a/Apps/Contoso.WPF.Demo/MainWindow.xaml.cs b/Apps/Contoso.WPF.Demo/MainWindow.xaml.cs
new file mode 100644
index 000000000..055de8506
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/MainWindow.xaml.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+
+
+namespace Contoso.WPF.Demo
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        private static readonly IDictionary<LogLevel, Action<string, string>> LogFunctions = new Dictionary<LogLevel, Action<string, string>> {
+            { LogLevel.Verbose, MobileCenterLog.Verbose },
+            { LogLevel.Debug, MobileCenterLog.Debug },
+            { LogLevel.Info, MobileCenterLog.Info },
+            { LogLevel.Warn, MobileCenterLog.Warn },
+            { LogLevel.Error, MobileCenterLog.Error }
+        };
+
+        public ObservableCollection<Property> Properties = new ObservableCollection<Property>();
+
+        public MainWindow()
+        {
+            InitializeComponent();
+            UpdateState();
+            mobileCenterLogLevel.SelectedIndex = (int) MobileCenter.LogLevel;
+            eventProperties.ItemsSource = Properties;
+        }
+
+        private void UpdateState()
+        {
+            mobileCenterEnabled.IsChecked = MobileCenter.IsEnabledAsync().Result;
+            analyticsEnabled.IsChecked = Analytics.IsEnabledAsync().Result;
+        }
+
+        private void mobileCenterEnabled_Checked(object sender, RoutedEventArgs e)
+        {
+            if (mobileCenterEnabled.IsChecked.HasValue)
+            {
+                MobileCenter.SetEnabledAsync(mobileCenterEnabled.IsChecked.Value).Wait();
+            }
+        }
+
+        private void analyticsEnabled_Checked(object sender, RoutedEventArgs e)
+        {
+            if (analyticsEnabled.IsChecked.HasValue)
+            {
+                Analytics.SetEnabledAsync(analyticsEnabled.IsChecked.Value).Wait();
+            }
+        }
+
+        private void mobileCenterLogLevel_SelectionChanged(object sender, RoutedEventArgs e)
+        {
+            MobileCenter.LogLevel = (LogLevel) mobileCenterLogLevel.SelectedIndex;
+        }
+
+        private void TabControl_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            UpdateState();
+        }
+
+        private void writeLog_Click(object sender, RoutedEventArgs e)
+        {
+            if (logLevel.SelectedIndex == -1)
+            {
+                return;
+            }
+            var level = (LogLevel) logLevel.SelectedIndex;
+            var tag = logTag.Text;
+            var message = logMessage.Text;
+            LogFunctions[level](tag, message);
+        }
+
+        private void trackEvent_Click(object sender, RoutedEventArgs e)
+        {
+            var name = eventName.Text;
+            var propertiesDictionary = Properties.Where(property => property.Key != null && property.Value != null)
+                                                 .ToDictionary(property => property.Key, property => property.Value);
+            Analytics.TrackEvent(name, propertiesDictionary);
+        }
+
+        private void CrashWithNullReference_Click(object sender, RoutedEventArgs e)
+        {
+            string[] values = { "a", null, "c" };
+            var b = values[1].Trim();
+            System.Diagnostics.Debug.WriteLine(b);
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs b/Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..99532d5ce
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+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("Contoso.WPF.Demo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.16.0.0")]
+[assembly: AssemblyInformationalVersion("0.16.0")]
diff --git a/Apps/Contoso.WPF.Demo/Properties/Resources.Designer.cs b/Apps/Contoso.WPF.Demo/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..a9a1b4e41
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WPF.Demo.Properties
+{
+
+
+    /// <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 ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Contoso.WPF.Demo.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Demo/Properties/Resources.resx b/Apps/Contoso.WPF.Demo/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/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>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Demo/Properties/Settings.Designer.cs b/Apps/Contoso.WPF.Demo/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..8a90a3b19
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WPF.Demo.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Demo/Properties/Settings.settings b/Apps/Contoso.WPF.Demo/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/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>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Demo/Property.cs b/Apps/Contoso.WPF.Demo/Property.cs
new file mode 100644
index 000000000..8fbfed247
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/Property.cs
@@ -0,0 +1,48 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Contoso.WPF.Demo
+{
+    public class Property : INotifyPropertyChanged
+    {
+        private string _key;
+        private string _value;
+        public string Key
+        {
+            get
+            {
+                return _key;
+            }
+            set
+            {
+                if (_key != value)
+                {
+                    _key = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+        public string Value
+        {
+            get
+            {
+                return _value;
+            }
+            set
+            {
+                if (_value != value)
+                {
+                    _value = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Demo/project.json b/Apps/Contoso.WPF.Demo/project.json
new file mode 100644
index 000000000..57b00c7dc
--- /dev/null
+++ b/Apps/Contoso.WPF.Demo/project.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "Microsoft.Azure.Mobile.Analytics": "0.16.0",
+    "Microsoft.Azure.Mobile.Crashes": "0.16.0"
+  },
+  "frameworks": {
+    "net452": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Puppet/App.config b/Apps/Contoso.WPF.Puppet/App.config
new file mode 100644
index 000000000..88fa4027b
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Puppet/App.xaml b/Apps/Contoso.WPF.Puppet/App.xaml
new file mode 100644
index 000000000..caa8e711c
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="Contoso.WPF.Puppet.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Contoso.WPF.Puppet"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/Apps/Contoso.WPF.Puppet/App.xaml.cs b/Apps/Contoso.WPF.Puppet/App.xaml.cs
new file mode 100644
index 000000000..e67b2e822
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/App.xaml.cs
@@ -0,0 +1,20 @@
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+using Microsoft.Azure.Mobile.Crashes;
+using System.Windows;
+
+namespace Contoso.WPF.Puppet
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            MobileCenter.LogLevel = LogLevel.Verbose;
+            MobileCenter.SetLogUrl("https://in-integration.dev.avalanch.es");
+            MobileCenter.Start("42f4a839-c54c-44da-8072-a2f2a61751b2", typeof(Analytics), typeof(Crashes));
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Puppet/Contoso.WPF.Puppet.csproj b/Apps/Contoso.WPF.Puppet/Contoso.WPF.Puppet.csproj
new file mode 100644
index 000000000..b630cfe19
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/Contoso.WPF.Puppet.csproj
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" 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>{951ABE8D-7AF6-4162-8639-E78B022B1048}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Contoso.WPF.Puppet</RootNamespace>
+    <AssemblyName>Contoso.WPF.Puppet</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </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>
+  </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>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Numerics" />
+    <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.Net.Http" />
+    <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="Property.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="project.json" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.WindowsDesktop\Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj">
+      <Project>{1f6c139a-29bb-4e74-8df2-f8ccab399a67}</Project>
+      <Name>Microsoft.Azure.Mobile.Analytics.WindowsDesktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.WindowsDesktop\Microsoft.Azure.Mobile.Crashes.WindowsDesktop.csproj">
+      <Project>{dc55c086-714d-4e2f-b6ce-3c14bc3b6646}</Project>
+      <Name>Microsoft.Azure.Mobile.Crashes.WindowsDesktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj">
+      <Project>{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}</Project>
+      <Name>Microsoft.Azure.Mobile.WindowsDesktop</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
+    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
+    <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
+  <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
+</Project>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Puppet/MainWindow.xaml b/Apps/Contoso.WPF.Puppet/MainWindow.xaml
new file mode 100644
index 000000000..b3133d954
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/MainWindow.xaml
@@ -0,0 +1,90 @@
+<Window x:Class="Contoso.WPF.Puppet.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Contoso.WPF.Puppet"
+        mc:Ignorable="d"
+        Title="Mobile Center WPF Puppet App" Height="257.794" Width="335">
+    <StackPanel>
+        <TabControl SelectionChanged="TabControl_SelectionChanged">
+            <TabItem Header="Mobile Center">
+                <StackPanel>
+                    <CheckBox Name="mobileCenterEnabled" Content="Mobile Center Enabled" Margin="0,10,0,10" Checked="mobileCenterEnabled_Checked" Unchecked="mobileCenterEnabled_Checked"/>
+                    <StackPanel Orientation ="Horizontal" HorizontalAlignment="Right" >
+                        <Label Content="Log Level"/>
+                        <ComboBox Name="mobileCenterLogLevel" Width="200" SelectionChanged="mobileCenterLogLevel_SelectionChanged">
+                            <ComboBoxItem Content="Verbose"/>
+                            <ComboBoxItem Content="Debug"/>
+                            <ComboBoxItem Content="Info"/>
+                            <ComboBoxItem Content="Warning"/>
+                            <ComboBoxItem Content="Error"/>
+                        </ComboBox>
+                    </StackPanel>
+                    <GroupBox Header="Log">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="2*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+
+                            <Label Content="Log Tag" Grid.Column="0" Grid.Row="0"/>
+                            <Label Content="Log Message" Grid.Column="0" Grid.Row="1"/>
+                            <Label Content="Log Level" Grid.Column="0" Grid.Row="2"/>
+
+                            <TextBox Name="logTag" Grid.Column="1" Grid.Row="0" Margin="2"/>
+                            <TextBox Name="logMessage" Grid.Column="1" Grid.Row="1" Margin="2"/>
+                            <ComboBox Name="logLevel" Grid.Column="1" Grid.Row="2" Margin="2">
+                                <ComboBoxItem Content="Verbose"/>
+                                <ComboBoxItem Content="Debug"/>
+                                <ComboBoxItem Content="Info"/>
+                                <ComboBoxItem Content="Warning"/>
+                                <ComboBoxItem Content="Error"/>
+                            </ComboBox>
+
+                            <Button Name="writeLog" Content="Write Log" Grid.ColumnSpan="2"  Grid.Row="3" Margin="2" Click="writeLog_Click"/>
+                        </Grid>
+
+                    </GroupBox>
+                </StackPanel>
+
+            </TabItem>
+            <TabItem Header="Analytics">
+                <StackPanel>
+                    <CheckBox Name="analyticsEnabled" Content="Analytics Enabled" Margin="0,10,0,10" Checked="analyticsEnabled_Checked" Unchecked="analyticsEnabled_Checked"/>
+                    <GroupBox Header="Event">
+                        <StackPanel Orientation="Vertical">
+                            <DockPanel LastChildFill="True">
+                                <Label Content="Event Name"/>
+                                <TextBox Name="eventName" VerticalAlignment="Center" />
+                            </DockPanel>
+                            <DataGrid Name="eventProperties" AutoGenerateColumns="False" CanUserAddRows="True" MinHeight="60" HorizontalAlignment="Stretch" VerticalScrollBarVisibility="Auto" SelectionMode="Single" Margin="0,10,0,10">
+                                <DataGrid.Columns>
+                                    <DataGridTextColumn Header="Property Key" Width="*" Binding="{Binding Key}"/>
+                                    <DataGridTextColumn Header="Property Value" Width="*" Binding="{Binding Value}"/>
+                                </DataGrid.Columns>
+                            </DataGrid>
+                            <Button Name="trackEvent" Content="Track event" Click="trackEvent_Click"/>
+                        </StackPanel>
+                    </GroupBox>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="Crashes">
+                <StackPanel>
+                    <GroupBox Header="Crash">
+                        <StackPanel Orientation="Vertical">
+                            <Button Name="CrashWithNullReference" Content="Crash with NullReferenceException" Click="CrashWithNullReference_Click"/>
+                        </StackPanel>
+                    </GroupBox>
+                </StackPanel>
+            </TabItem>
+            <TabItem Header="Others"/>
+        </TabControl>
+    </StackPanel>
+</Window>
diff --git a/Apps/Contoso.WPF.Puppet/MainWindow.xaml.cs b/Apps/Contoso.WPF.Puppet/MainWindow.xaml.cs
new file mode 100644
index 000000000..1760de9f5
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/MainWindow.xaml.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+
+
+namespace Contoso.WPF.Puppet
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        private static readonly IDictionary<LogLevel, Action<string, string>> LogFunctions = new Dictionary<LogLevel, Action<string, string>> {
+            { LogLevel.Verbose, MobileCenterLog.Verbose },
+            { LogLevel.Debug, MobileCenterLog.Debug },
+            { LogLevel.Info, MobileCenterLog.Info },
+            { LogLevel.Warn, MobileCenterLog.Warn },
+            { LogLevel.Error, MobileCenterLog.Error }
+        };
+
+        public ObservableCollection<Property> Properties = new ObservableCollection<Property>();
+
+        public MainWindow()
+        {
+            InitializeComponent();
+            UpdateState();
+            mobileCenterLogLevel.SelectedIndex = (int) MobileCenter.LogLevel;
+            eventProperties.ItemsSource = Properties;
+        }
+
+
+        private void UpdateState()
+        {
+            mobileCenterEnabled.IsChecked = MobileCenter.IsEnabledAsync().Result;
+            analyticsEnabled.IsChecked = Analytics.IsEnabledAsync().Result;
+        }
+
+        private void mobileCenterEnabled_Checked(object sender, RoutedEventArgs e)
+        {
+            if (mobileCenterEnabled.IsChecked.HasValue)
+            {
+                MobileCenter.SetEnabledAsync(mobileCenterEnabled.IsChecked.Value).Wait();
+            }
+        }
+
+        private void analyticsEnabled_Checked(object sender, RoutedEventArgs e)
+        {
+            if (analyticsEnabled.IsChecked.HasValue)
+            {
+                Analytics.SetEnabledAsync(analyticsEnabled.IsChecked.Value).Wait();
+            }
+        }
+
+
+        private void mobileCenterLogLevel_SelectionChanged(object sender, RoutedEventArgs e)
+        {
+            MobileCenter.LogLevel = (LogLevel) mobileCenterLogLevel.SelectedIndex;
+        }
+
+        private void TabControl_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+            UpdateState();
+        }
+
+        private void writeLog_Click(object sender, RoutedEventArgs e)
+        {
+            if (logLevel.SelectedIndex == -1)
+            {
+                return;
+            }
+            var level = (LogLevel) logLevel.SelectedIndex;
+            var tag = logTag.Text;
+            var message = logMessage.Text;
+            LogFunctions[level](tag, message);
+        }
+
+        private void trackEvent_Click(object sender, RoutedEventArgs e)
+        {
+            var name = eventName.Text;
+            var propertiesDictionary = Properties.Where(property => property.Key != null && property.Value != null)
+                                                 .ToDictionary(property => property.Key, property => property.Value);
+            Analytics.TrackEvent(name, propertiesDictionary);
+        }
+
+        private void CrashWithNullReference_Click(object sender, RoutedEventArgs e)
+        {
+            string[] values = { "a", null, "c" };
+            var b = values[1].Trim();
+            System.Diagnostics.Debug.WriteLine(b);
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..e565e656c
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+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("Contoso.WPF.Puppet")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/Apps/Contoso.WPF.Puppet/Properties/Resources.Designer.cs b/Apps/Contoso.WPF.Puppet/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..534c182ae
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WPF.Puppet.Properties
+{
+
+
+    /// <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 ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Contoso.WPF.Puppet.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Puppet/Properties/Resources.resx b/Apps/Contoso.WPF.Puppet/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/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>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Puppet/Properties/Settings.Designer.cs b/Apps/Contoso.WPF.Puppet/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..ce64fcd05
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WPF.Puppet.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Puppet/Properties/Settings.settings b/Apps/Contoso.WPF.Puppet/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/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>
\ No newline at end of file
diff --git a/Apps/Contoso.WPF.Puppet/Property.cs b/Apps/Contoso.WPF.Puppet/Property.cs
new file mode 100644
index 000000000..d98c6145b
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/Property.cs
@@ -0,0 +1,48 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Contoso.WPF.Puppet
+{
+    public class Property : INotifyPropertyChanged
+    {
+        private string _key;
+        private string _value;
+        public string Key
+        {
+            get
+            {
+                return _key;
+            }
+            set
+            {
+                if (_key != value)
+                {
+                    _key = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+        public string Value
+        {
+            get
+            {
+                return _value;
+            }
+            set
+            {
+                if (_value != value)
+                {
+                    _value = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/Apps/Contoso.WPF.Puppet/project.json b/Apps/Contoso.WPF.Puppet/project.json
new file mode 100644
index 000000000..e0cf888d4
--- /dev/null
+++ b/Apps/Contoso.WPF.Puppet/project.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "sqlite-net-pcl": "1.3.1"
+  },
+  "frameworks": {
+    "net452": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Demo/App.config b/Apps/Contoso.WinForms.Demo/App.config
new file mode 100644
index 000000000..88fa4027b
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj b/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj
new file mode 100644
index 000000000..af11e61e1
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/Contoso.WinForms.Demo.csproj
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 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>{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Contoso.WinForms.Demo</RootNamespace>
+    <AssemblyName>Contoso.WinForms.Demo</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </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>
+  </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>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="project.json" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Demo/MainForm.Designer.cs b/Apps/Contoso.WinForms.Demo/MainForm.Designer.cs
new file mode 100644
index 000000000..dc1555478
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/MainForm.Designer.cs
@@ -0,0 +1,425 @@
+namespace Contoso.WinForms.Demo
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tabs = new System.Windows.Forms.TabControl();
+            this.mobileCenter = new System.Windows.Forms.TabPage();
+            this.logBox = new System.Windows.Forms.GroupBox();
+            this.writeLog = new System.Windows.Forms.Button();
+            this.logTag = new System.Windows.Forms.TextBox();
+            this.logMessage = new System.Windows.Forms.TextBox();
+            this.logMessageLabel = new System.Windows.Forms.Label();
+            this.logTagLabel = new System.Windows.Forms.Label();
+            this.logLevelLabel = new System.Windows.Forms.Label();
+            this.logLevel = new System.Windows.Forms.ComboBox();
+            this.mobileCenterLogLevelLabel = new System.Windows.Forms.Label();
+            this.mobileCenterLogLevel = new System.Windows.Forms.ComboBox();
+            this.mobileCenterEnabled = new System.Windows.Forms.CheckBox();
+            this.analytics = new System.Windows.Forms.TabPage();
+            this.eventBox = new System.Windows.Forms.GroupBox();
+            this.trackEvent = new System.Windows.Forms.Button();
+            this.eventProperties = new System.Windows.Forms.DataGridView();
+            this.Key = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Value = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.eventName = new System.Windows.Forms.TextBox();
+            this.eventNameLabel = new System.Windows.Forms.Label();
+            this.analyticsEnabled = new System.Windows.Forms.CheckBox();
+            this.crashes = new System.Windows.Forms.TabPage();
+            this.others = new System.Windows.Forms.TabPage();
+            this.CrashWithNullReferenceException = new System.Windows.Forms.Button();
+            this.tabs.SuspendLayout();
+            this.mobileCenter.SuspendLayout();
+            this.logBox.SuspendLayout();
+            this.analytics.SuspendLayout();
+            this.eventBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.eventProperties)).BeginInit();
+            this.crashes.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabs
+            // 
+            this.tabs.Controls.Add(this.mobileCenter);
+            this.tabs.Controls.Add(this.analytics);
+            this.tabs.Controls.Add(this.crashes);
+            this.tabs.Controls.Add(this.others);
+            this.tabs.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabs.Location = new System.Drawing.Point(0, 0);
+            this.tabs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tabs.Name = "tabs";
+            this.tabs.SelectedIndex = 0;
+            this.tabs.Size = new System.Drawing.Size(576, 402);
+            this.tabs.TabIndex = 0;
+            this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged);
+            // 
+            // mobileCenter
+            // 
+            this.mobileCenter.Controls.Add(this.logBox);
+            this.mobileCenter.Controls.Add(this.mobileCenterLogLevelLabel);
+            this.mobileCenter.Controls.Add(this.mobileCenterLogLevel);
+            this.mobileCenter.Controls.Add(this.mobileCenterEnabled);
+            this.mobileCenter.Location = new System.Drawing.Point(4, 29);
+            this.mobileCenter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenter.Name = "mobileCenter";
+            this.mobileCenter.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenter.Size = new System.Drawing.Size(568, 369);
+            this.mobileCenter.TabIndex = 0;
+            this.mobileCenter.Text = "Mobile Center";
+            this.mobileCenter.UseVisualStyleBackColor = true;
+            // 
+            // logBox
+            // 
+            this.logBox.Controls.Add(this.writeLog);
+            this.logBox.Controls.Add(this.logTag);
+            this.logBox.Controls.Add(this.logMessage);
+            this.logBox.Controls.Add(this.logMessageLabel);
+            this.logBox.Controls.Add(this.logTagLabel);
+            this.logBox.Controls.Add(this.logLevelLabel);
+            this.logBox.Controls.Add(this.logLevel);
+            this.logBox.Location = new System.Drawing.Point(12, 97);
+            this.logBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logBox.Name = "logBox";
+            this.logBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logBox.Size = new System.Drawing.Size(540, 200);
+            this.logBox.TabIndex = 5;
+            this.logBox.TabStop = false;
+            this.logBox.Text = "Log";
+            // 
+            // writeLog
+            // 
+            this.writeLog.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.writeLog.Location = new System.Drawing.Point(14, 155);
+            this.writeLog.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.writeLog.Name = "writeLog";
+            this.writeLog.Size = new System.Drawing.Size(513, 35);
+            this.writeLog.TabIndex = 11;
+            this.writeLog.Text = "Write Log";
+            this.writeLog.UseVisualStyleBackColor = true;
+            this.writeLog.Click += new System.EventHandler(this.writeLog_Click);
+            // 
+            // logTag
+            // 
+            this.logTag.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.logTag.Location = new System.Drawing.Point(159, 29);
+            this.logTag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logTag.Name = "logTag";
+            this.logTag.Size = new System.Drawing.Size(366, 26);
+            this.logTag.TabIndex = 10;
+            // 
+            // logMessage
+            // 
+            this.logMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.logMessage.Location = new System.Drawing.Point(159, 65);
+            this.logMessage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logMessage.Name = "logMessage";
+            this.logMessage.Size = new System.Drawing.Size(366, 26);
+            this.logMessage.TabIndex = 9;
+            // 
+            // logMessageLabel
+            // 
+            this.logMessageLabel.Location = new System.Drawing.Point(9, 62);
+            this.logMessageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.logMessageLabel.Name = "logMessageLabel";
+            this.logMessageLabel.Size = new System.Drawing.Size(141, 35);
+            this.logMessageLabel.TabIndex = 8;
+            this.logMessageLabel.Text = "Log Message";
+            this.logMessageLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // logTagLabel
+            // 
+            this.logTagLabel.Location = new System.Drawing.Point(9, 26);
+            this.logTagLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.logTagLabel.Name = "logTagLabel";
+            this.logTagLabel.Size = new System.Drawing.Size(141, 35);
+            this.logTagLabel.TabIndex = 7;
+            this.logTagLabel.Text = "Log Tag";
+            this.logTagLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // logLevelLabel
+            // 
+            this.logLevelLabel.Location = new System.Drawing.Point(9, 102);
+            this.logLevelLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.logLevelLabel.Name = "logLevelLabel";
+            this.logLevelLabel.Size = new System.Drawing.Size(141, 35);
+            this.logLevelLabel.TabIndex = 6;
+            this.logLevelLabel.Text = "Log Level";
+            this.logLevelLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // logLevel
+            // 
+            this.logLevel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.logLevel.FormattingEnabled = true;
+            this.logLevel.Items.AddRange(new object[] {
+            "Verbose",
+            "Debug",
+            "Info",
+            "Warning",
+            "Error"});
+            this.logLevel.Location = new System.Drawing.Point(159, 105);
+            this.logLevel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logLevel.Name = "logLevel";
+            this.logLevel.Size = new System.Drawing.Size(366, 28);
+            this.logLevel.TabIndex = 5;
+            // 
+            // mobileCenterLogLevelLabel
+            // 
+            this.mobileCenterLogLevelLabel.Location = new System.Drawing.Point(30, 55);
+            this.mobileCenterLogLevelLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mobileCenterLogLevelLabel.Name = "mobileCenterLogLevelLabel";
+            this.mobileCenterLogLevelLabel.Size = new System.Drawing.Size(132, 35);
+            this.mobileCenterLogLevelLabel.TabIndex = 4;
+            this.mobileCenterLogLevelLabel.Text = "Log Level";
+            this.mobileCenterLogLevelLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // mobileCenterLogLevel
+            // 
+            this.mobileCenterLogLevel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.mobileCenterLogLevel.FormattingEnabled = true;
+            this.mobileCenterLogLevel.Items.AddRange(new object[] {
+            "Verbose",
+            "Debug",
+            "Info",
+            "Warning",
+            "Error"});
+            this.mobileCenterLogLevel.Location = new System.Drawing.Point(171, 58);
+            this.mobileCenterLogLevel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenterLogLevel.Name = "mobileCenterLogLevel";
+            this.mobileCenterLogLevel.Size = new System.Drawing.Size(366, 28);
+            this.mobileCenterLogLevel.TabIndex = 3;
+            this.mobileCenterLogLevel.SelectedIndexChanged += new System.EventHandler(this.mobileCenterLogLevel_SelectedIndexChanged);
+            // 
+            // mobileCenterEnabled
+            // 
+            this.mobileCenterEnabled.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.mobileCenterEnabled.Location = new System.Drawing.Point(12, 9);
+            this.mobileCenterEnabled.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenterEnabled.Name = "mobileCenterEnabled";
+            this.mobileCenterEnabled.Size = new System.Drawing.Size(540, 37);
+            this.mobileCenterEnabled.TabIndex = 1;
+            this.mobileCenterEnabled.Text = "Mobile Center Enabled";
+            this.mobileCenterEnabled.UseVisualStyleBackColor = true;
+            this.mobileCenterEnabled.CheckedChanged += new System.EventHandler(this.mobileCenterEnabled_CheckedChanged);
+            // 
+            // analytics
+            // 
+            this.analytics.Controls.Add(this.eventBox);
+            this.analytics.Controls.Add(this.analyticsEnabled);
+            this.analytics.Location = new System.Drawing.Point(4, 29);
+            this.analytics.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.analytics.Name = "analytics";
+            this.analytics.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.analytics.Size = new System.Drawing.Size(568, 369);
+            this.analytics.TabIndex = 1;
+            this.analytics.Text = "Analytics";
+            this.analytics.UseVisualStyleBackColor = true;
+            // 
+            // eventBox
+            // 
+            this.eventBox.Controls.Add(this.trackEvent);
+            this.eventBox.Controls.Add(this.eventProperties);
+            this.eventBox.Controls.Add(this.eventName);
+            this.eventBox.Controls.Add(this.eventNameLabel);
+            this.eventBox.Location = new System.Drawing.Point(12, 55);
+            this.eventBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventBox.Name = "eventBox";
+            this.eventBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventBox.Size = new System.Drawing.Size(540, 294);
+            this.eventBox.TabIndex = 3;
+            this.eventBox.TabStop = false;
+            this.eventBox.Text = "Event";
+            // 
+            // trackEvent
+            // 
+            this.trackEvent.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.trackEvent.Location = new System.Drawing.Point(14, 249);
+            this.trackEvent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.trackEvent.Name = "trackEvent";
+            this.trackEvent.Size = new System.Drawing.Size(513, 35);
+            this.trackEvent.TabIndex = 14;
+            this.trackEvent.Text = "Track Event";
+            this.trackEvent.UseVisualStyleBackColor = true;
+            this.trackEvent.Click += new System.EventHandler(this.trackEvent_Click);
+            // 
+            // eventProperties
+            // 
+            this.eventProperties.AllowUserToResizeColumns = false;
+            this.eventProperties.AllowUserToResizeRows = false;
+            this.eventProperties.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.eventProperties.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.eventProperties.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Key,
+            this.Value});
+            this.eventProperties.Location = new System.Drawing.Point(14, 68);
+            this.eventProperties.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventProperties.Name = "eventProperties";
+            this.eventProperties.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.eventProperties.Size = new System.Drawing.Size(513, 169);
+            this.eventProperties.TabIndex = 13;
+            // 
+            // Key
+            // 
+            this.Key.HeaderText = "Key";
+            this.Key.MaxInputLength = 64;
+            this.Key.Name = "Key";
+            this.Key.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            // 
+            // Value
+            // 
+            this.Value.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.Value.HeaderText = "Value";
+            this.Value.MaxInputLength = 64;
+            this.Value.Name = "Value";
+            this.Value.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            // 
+            // eventName
+            // 
+            this.eventName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.eventName.Location = new System.Drawing.Point(159, 28);
+            this.eventName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventName.MaxLength = 256;
+            this.eventName.Name = "eventName";
+            this.eventName.Size = new System.Drawing.Size(366, 26);
+            this.eventName.TabIndex = 12;
+            // 
+            // eventNameLabel
+            // 
+            this.eventNameLabel.Location = new System.Drawing.Point(9, 25);
+            this.eventNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.eventNameLabel.Name = "eventNameLabel";
+            this.eventNameLabel.Size = new System.Drawing.Size(141, 35);
+            this.eventNameLabel.TabIndex = 11;
+            this.eventNameLabel.Text = "Event Name";
+            this.eventNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // analyticsEnabled
+            // 
+            this.analyticsEnabled.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.analyticsEnabled.Location = new System.Drawing.Point(12, 9);
+            this.analyticsEnabled.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.analyticsEnabled.Name = "analyticsEnabled";
+            this.analyticsEnabled.Size = new System.Drawing.Size(540, 37);
+            this.analyticsEnabled.TabIndex = 2;
+            this.analyticsEnabled.Text = "Analytics Enabled";
+            this.analyticsEnabled.UseVisualStyleBackColor = true;
+            this.analyticsEnabled.CheckedChanged += new System.EventHandler(this.analyticsEnabled_CheckedChanged);
+            // 
+            // crashes
+            // 
+            this.crashes.Controls.Add(this.CrashWithNullReferenceException);
+            this.crashes.Location = new System.Drawing.Point(4, 29);
+            this.crashes.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.crashes.Name = "crashes";
+            this.crashes.Size = new System.Drawing.Size(568, 369);
+            this.crashes.TabIndex = 2;
+            this.crashes.Text = "Crashes";
+            this.crashes.UseVisualStyleBackColor = true;
+            // 
+            // others
+            // 
+            this.others.Location = new System.Drawing.Point(4, 29);
+            this.others.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.others.Name = "others";
+            this.others.Size = new System.Drawing.Size(568, 369);
+            this.others.TabIndex = 3;
+            this.others.Text = "Others";
+            this.others.UseVisualStyleBackColor = true;
+            // 
+            // CrashWithNullReferenceException
+            // 
+            this.CrashWithNullReferenceException.Location = new System.Drawing.Point(35, 31);
+            this.CrashWithNullReferenceException.Name = "CrashWithNullReferenceException";
+            this.CrashWithNullReferenceException.Size = new System.Drawing.Size(497, 38);
+            this.CrashWithNullReferenceException.TabIndex = 0;
+            this.CrashWithNullReferenceException.Text = "Crash with NullReferenceException";
+            this.CrashWithNullReferenceException.UseVisualStyleBackColor = true;
+            this.CrashWithNullReferenceException.Click += new System.EventHandler(this.CrashWithNullReferenceException_Click);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(576, 402);
+            this.Controls.Add(this.tabs);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.MaximizeBox = false;
+            this.Name = "MainForm";
+            this.Text = "Mobile Center Demo App";
+            this.tabs.ResumeLayout(false);
+            this.mobileCenter.ResumeLayout(false);
+            this.logBox.ResumeLayout(false);
+            this.logBox.PerformLayout();
+            this.analytics.ResumeLayout(false);
+            this.eventBox.ResumeLayout(false);
+            this.eventBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.eventProperties)).EndInit();
+            this.crashes.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl tabs;
+        private System.Windows.Forms.TabPage mobileCenter;
+        private System.Windows.Forms.TabPage analytics;
+        private System.Windows.Forms.TabPage crashes;
+        private System.Windows.Forms.TabPage others;
+        private System.Windows.Forms.CheckBox mobileCenterEnabled;
+        private System.Windows.Forms.Label mobileCenterLogLevelLabel;
+        private System.Windows.Forms.ComboBox mobileCenterLogLevel;
+        private System.Windows.Forms.GroupBox logBox;
+        private System.Windows.Forms.Button writeLog;
+        private System.Windows.Forms.TextBox logTag;
+        private System.Windows.Forms.TextBox logMessage;
+        private System.Windows.Forms.Label logMessageLabel;
+        private System.Windows.Forms.Label logTagLabel;
+        private System.Windows.Forms.Label logLevelLabel;
+        private System.Windows.Forms.ComboBox logLevel;
+        private System.Windows.Forms.GroupBox eventBox;
+        private System.Windows.Forms.CheckBox analyticsEnabled;
+        private System.Windows.Forms.TextBox eventName;
+        private System.Windows.Forms.Label eventNameLabel;
+        private System.Windows.Forms.DataGridView eventProperties;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Key;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Value;
+        private System.Windows.Forms.Button trackEvent;
+        private System.Windows.Forms.Button CrashWithNullReferenceException;
+    }
+}
+
diff --git a/Apps/Contoso.WinForms.Demo/MainForm.cs b/Apps/Contoso.WinForms.Demo/MainForm.cs
new file mode 100644
index 000000000..04d5ed290
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/MainForm.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+
+namespace Contoso.WinForms.Demo
+{
+    public partial class MainForm : Form
+    {
+        private static readonly IDictionary<LogLevel, Action<string, string>> LogFunctions = new Dictionary<LogLevel, Action<string, string>> {
+            { LogLevel.Verbose, MobileCenterLog.Verbose },
+            { LogLevel.Debug, MobileCenterLog.Debug },
+            { LogLevel.Info, MobileCenterLog.Info },
+            { LogLevel.Warn, MobileCenterLog.Warn },
+            { LogLevel.Error, MobileCenterLog.Error }
+        };
+
+        public MainForm()
+        {
+            InitializeComponent();
+            UpdateState();
+            mobileCenterLogLevel.SelectedIndex = (int) MobileCenter.LogLevel;
+        }
+
+        private void UpdateState()
+        {
+            mobileCenterEnabled.Checked = MobileCenter.IsEnabledAsync().Result;
+            analyticsEnabled.Checked = Analytics.IsEnabledAsync().Result;
+        }
+
+        private void mobileCenterEnabled_CheckedChanged(object sender, EventArgs e)
+        {
+            MobileCenter.SetEnabledAsync(mobileCenterEnabled.Checked).Wait();
+        }
+
+        private void analyticsEnabled_CheckedChanged(object sender, EventArgs e)
+        {
+            Analytics.SetEnabledAsync(analyticsEnabled.Checked).Wait();
+        }
+
+        private void mobileCenterLogLevel_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            MobileCenter.LogLevel = (LogLevel)mobileCenterLogLevel.SelectedIndex;
+        }
+
+        private void tabs_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            UpdateState();
+        }
+
+        private void writeLog_Click(object sender, EventArgs e)
+        {
+            if (logLevel.SelectedIndex == -1)
+            {
+                return;
+            }
+            var level = (LogLevel)logLevel.SelectedIndex;
+            var tag = logTag.Text;
+            var message = logMessage.Text;
+            LogFunctions[level](tag, message);
+        }
+
+        private void trackEvent_Click(object sender, EventArgs e)
+        {
+            var name = eventName.Text;
+            var properties = eventProperties.Rows.Cast<DataGridViewRow>()
+                .Where(row => row.Cells["Key"].Value != null && row.Cells["Value"].Value != null)
+                .ToDictionary(
+                    row => row.Cells["Key"].Value?.ToString(),
+                    row => row.Cells["Value"].Value?.ToString());
+            Analytics.TrackEvent(name, properties);
+        }
+
+        private void CrashWithNullReferenceException_Click(object sender, EventArgs e)
+        {
+            string[] values = { "a", null, "c" };
+            var b = values[1].Trim();
+            System.Diagnostics.Debug.WriteLine(b);
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Demo/MainForm.resx b/Apps/Contoso.WinForms.Demo/MainForm.resx
new file mode 100644
index 000000000..5bca00836
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/MainForm.resx
@@ -0,0 +1,126 @@
+<?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>
+  <metadata name="Key.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Value.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Demo/Program.cs b/Apps/Contoso.WinForms.Demo/Program.cs
new file mode 100644
index 000000000..ebcaf1c26
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/Program.cs
@@ -0,0 +1,27 @@
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+using Microsoft.Azure.Mobile.Crashes;
+using System;
+using System.Windows.Forms;
+
+namespace Contoso.WinForms.Demo
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.SetUnhandledExceptionMode(UnhandledExceptionMode.ThrowException);
+            MobileCenter.LogLevel = LogLevel.Verbose;
+            MobileCenter.SetLogUrl("https://in-integration.dev.avalanch.es");
+            MobileCenter.Start("42f4a839-c54c-44da-8072-a2f2a61751b2", typeof(Analytics), typeof(Crashes));
+
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new MainForm());
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Demo/Properties/AssemblyInfo.cs b/Apps/Contoso.WinForms.Demo/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..ffa5399a1
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/Properties/AssemblyInfo.cs
@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("Contoso.WinForms.Demo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.16.0.0")]
+[assembly: AssemblyInformationalVersion("0.16.0")]
diff --git a/Apps/Contoso.WinForms.Demo/Properties/Resources.Designer.cs b/Apps/Contoso.WinForms.Demo/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..b4caafebc
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WinForms.Demo.Properties
+{
+
+
+    /// <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 ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Contoso.WinForms.Demo.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Demo/Properties/Resources.resx b/Apps/Contoso.WinForms.Demo/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/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>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Demo/Properties/Settings.Designer.cs b/Apps/Contoso.WinForms.Demo/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..a16bfc753
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WinForms.Demo.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Demo/Properties/Settings.settings b/Apps/Contoso.WinForms.Demo/Properties/Settings.settings
new file mode 100644
index 000000000..39645652a
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
diff --git a/Apps/Contoso.WinForms.Demo/project.json b/Apps/Contoso.WinForms.Demo/project.json
new file mode 100644
index 000000000..57b00c7dc
--- /dev/null
+++ b/Apps/Contoso.WinForms.Demo/project.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "Microsoft.Azure.Mobile.Analytics": "0.16.0",
+    "Microsoft.Azure.Mobile.Crashes": "0.16.0"
+  },
+  "frameworks": {
+    "net452": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Puppet/App.config b/Apps/Contoso.WinForms.Puppet/App.config
new file mode 100644
index 000000000..8227adb98
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+    </startup>
+</configuration>
diff --git a/Apps/Contoso.WinForms.Puppet/Contoso.WinForms.Puppet.csproj b/Apps/Contoso.WinForms.Puppet/Contoso.WinForms.Puppet.csproj
new file mode 100644
index 000000000..4b4a591df
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/Contoso.WinForms.Puppet.csproj
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 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>{44E1971C-3399-4C88-AFE5-54EB53737D31}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Contoso.WinForms.Puppet</RootNamespace>
+    <AssemblyName>Contoso.WinForms.Puppet</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
+    <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>9</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </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>
+  </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>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>D0CA9F94468ACD1133409BDDC0375AA4AC15BADA</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>Contoso.WinForms.Puppet_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="Contoso.WinForms.Puppet_TemporaryKey.pfx" />
+    <None Include="project.json" />
+    <None Include="Properties\app.manifest" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <PublishFile Include="Microsoft.Rest.ClientRuntime">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="Newtonsoft.Json">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SQLite-net">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SQLitePCLRaw.batteries_green">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SQLitePCLRaw.batteries_v2">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SQLitePCLRaw.core">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SQLitePCLRaw.provider.e_sqlite3">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="System.Runtime.InteropServices.RuntimeInformation">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.WindowsDesktop\Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj">
+      <Project>{1f6c139a-29bb-4e74-8df2-f8ccab399a67}</Project>
+      <Name>Microsoft.Azure.Mobile.Analytics.WindowsDesktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.WindowsDesktop\Microsoft.Azure.Mobile.Crashes.WindowsDesktop.csproj">
+      <Project>{dc55c086-714d-4e2f-b6ce-3c14bc3b6646}</Project>
+      <Name>Microsoft.Azure.Mobile.Crashes.WindowsDesktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj">
+      <Project>{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}</Project>
+      <Name>Microsoft.Azure.Mobile.WindowsDesktop</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Puppet/MainForm.Designer.cs b/Apps/Contoso.WinForms.Puppet/MainForm.Designer.cs
new file mode 100644
index 000000000..1f3170396
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/MainForm.Designer.cs
@@ -0,0 +1,425 @@
+namespace Contoso.WinForms.Demo
+{
+    partial class MainForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tabs = new System.Windows.Forms.TabControl();
+            this.mobileCenter = new System.Windows.Forms.TabPage();
+            this.logBox = new System.Windows.Forms.GroupBox();
+            this.writeLog = new System.Windows.Forms.Button();
+            this.logTag = new System.Windows.Forms.TextBox();
+            this.logMessage = new System.Windows.Forms.TextBox();
+            this.logMessageLabel = new System.Windows.Forms.Label();
+            this.logTagLabel = new System.Windows.Forms.Label();
+            this.logLevelLabel = new System.Windows.Forms.Label();
+            this.logLevel = new System.Windows.Forms.ComboBox();
+            this.mobileCenterLogLevelLabel = new System.Windows.Forms.Label();
+            this.mobileCenterLogLevel = new System.Windows.Forms.ComboBox();
+            this.mobileCenterEnabled = new System.Windows.Forms.CheckBox();
+            this.analytics = new System.Windows.Forms.TabPage();
+            this.eventBox = new System.Windows.Forms.GroupBox();
+            this.trackEvent = new System.Windows.Forms.Button();
+            this.eventProperties = new System.Windows.Forms.DataGridView();
+            this.Key = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Value = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.eventName = new System.Windows.Forms.TextBox();
+            this.eventNameLabel = new System.Windows.Forms.Label();
+            this.analyticsEnabled = new System.Windows.Forms.CheckBox();
+            this.crashes = new System.Windows.Forms.TabPage();
+            this.others = new System.Windows.Forms.TabPage();
+            this.CrashWithNullReferenceException = new System.Windows.Forms.Button();
+            this.tabs.SuspendLayout();
+            this.mobileCenter.SuspendLayout();
+            this.logBox.SuspendLayout();
+            this.analytics.SuspendLayout();
+            this.eventBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.eventProperties)).BeginInit();
+            this.crashes.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabs
+            // 
+            this.tabs.Controls.Add(this.mobileCenter);
+            this.tabs.Controls.Add(this.analytics);
+            this.tabs.Controls.Add(this.crashes);
+            this.tabs.Controls.Add(this.others);
+            this.tabs.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabs.Location = new System.Drawing.Point(0, 0);
+            this.tabs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.tabs.Name = "tabs";
+            this.tabs.SelectedIndex = 0;
+            this.tabs.Size = new System.Drawing.Size(576, 402);
+            this.tabs.TabIndex = 0;
+            this.tabs.SelectedIndexChanged += new System.EventHandler(this.tabs_SelectedIndexChanged);
+            // 
+            // mobileCenter
+            // 
+            this.mobileCenter.Controls.Add(this.logBox);
+            this.mobileCenter.Controls.Add(this.mobileCenterLogLevelLabel);
+            this.mobileCenter.Controls.Add(this.mobileCenterLogLevel);
+            this.mobileCenter.Controls.Add(this.mobileCenterEnabled);
+            this.mobileCenter.Location = new System.Drawing.Point(4, 29);
+            this.mobileCenter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenter.Name = "mobileCenter";
+            this.mobileCenter.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenter.Size = new System.Drawing.Size(568, 369);
+            this.mobileCenter.TabIndex = 0;
+            this.mobileCenter.Text = "Mobile Center";
+            this.mobileCenter.UseVisualStyleBackColor = true;
+            // 
+            // logBox
+            // 
+            this.logBox.Controls.Add(this.writeLog);
+            this.logBox.Controls.Add(this.logTag);
+            this.logBox.Controls.Add(this.logMessage);
+            this.logBox.Controls.Add(this.logMessageLabel);
+            this.logBox.Controls.Add(this.logTagLabel);
+            this.logBox.Controls.Add(this.logLevelLabel);
+            this.logBox.Controls.Add(this.logLevel);
+            this.logBox.Location = new System.Drawing.Point(12, 97);
+            this.logBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logBox.Name = "logBox";
+            this.logBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logBox.Size = new System.Drawing.Size(540, 200);
+            this.logBox.TabIndex = 5;
+            this.logBox.TabStop = false;
+            this.logBox.Text = "Log";
+            // 
+            // writeLog
+            // 
+            this.writeLog.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.writeLog.Location = new System.Drawing.Point(14, 155);
+            this.writeLog.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.writeLog.Name = "writeLog";
+            this.writeLog.Size = new System.Drawing.Size(513, 35);
+            this.writeLog.TabIndex = 11;
+            this.writeLog.Text = "Write Log";
+            this.writeLog.UseVisualStyleBackColor = true;
+            this.writeLog.Click += new System.EventHandler(this.writeLog_Click);
+            // 
+            // logTag
+            // 
+            this.logTag.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.logTag.Location = new System.Drawing.Point(159, 29);
+            this.logTag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logTag.Name = "logTag";
+            this.logTag.Size = new System.Drawing.Size(366, 26);
+            this.logTag.TabIndex = 10;
+            // 
+            // logMessage
+            // 
+            this.logMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.logMessage.Location = new System.Drawing.Point(159, 65);
+            this.logMessage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logMessage.Name = "logMessage";
+            this.logMessage.Size = new System.Drawing.Size(366, 26);
+            this.logMessage.TabIndex = 9;
+            // 
+            // logMessageLabel
+            // 
+            this.logMessageLabel.Location = new System.Drawing.Point(9, 62);
+            this.logMessageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.logMessageLabel.Name = "logMessageLabel";
+            this.logMessageLabel.Size = new System.Drawing.Size(141, 35);
+            this.logMessageLabel.TabIndex = 8;
+            this.logMessageLabel.Text = "Log Message";
+            this.logMessageLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // logTagLabel
+            // 
+            this.logTagLabel.Location = new System.Drawing.Point(9, 26);
+            this.logTagLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.logTagLabel.Name = "logTagLabel";
+            this.logTagLabel.Size = new System.Drawing.Size(141, 35);
+            this.logTagLabel.TabIndex = 7;
+            this.logTagLabel.Text = "Log Tag";
+            this.logTagLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // logLevelLabel
+            // 
+            this.logLevelLabel.Location = new System.Drawing.Point(9, 102);
+            this.logLevelLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.logLevelLabel.Name = "logLevelLabel";
+            this.logLevelLabel.Size = new System.Drawing.Size(141, 35);
+            this.logLevelLabel.TabIndex = 6;
+            this.logLevelLabel.Text = "Log Level";
+            this.logLevelLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // logLevel
+            // 
+            this.logLevel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.logLevel.FormattingEnabled = true;
+            this.logLevel.Items.AddRange(new object[] {
+            "Verbose",
+            "Debug",
+            "Info",
+            "Warning",
+            "Error"});
+            this.logLevel.Location = new System.Drawing.Point(159, 105);
+            this.logLevel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.logLevel.Name = "logLevel";
+            this.logLevel.Size = new System.Drawing.Size(366, 28);
+            this.logLevel.TabIndex = 5;
+            // 
+            // mobileCenterLogLevelLabel
+            // 
+            this.mobileCenterLogLevelLabel.Location = new System.Drawing.Point(30, 55);
+            this.mobileCenterLogLevelLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mobileCenterLogLevelLabel.Name = "mobileCenterLogLevelLabel";
+            this.mobileCenterLogLevelLabel.Size = new System.Drawing.Size(132, 35);
+            this.mobileCenterLogLevelLabel.TabIndex = 4;
+            this.mobileCenterLogLevelLabel.Text = "Log Level";
+            this.mobileCenterLogLevelLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // mobileCenterLogLevel
+            // 
+            this.mobileCenterLogLevel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.mobileCenterLogLevel.FormattingEnabled = true;
+            this.mobileCenterLogLevel.Items.AddRange(new object[] {
+            "Verbose",
+            "Debug",
+            "Info",
+            "Warning",
+            "Error"});
+            this.mobileCenterLogLevel.Location = new System.Drawing.Point(171, 58);
+            this.mobileCenterLogLevel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenterLogLevel.Name = "mobileCenterLogLevel";
+            this.mobileCenterLogLevel.Size = new System.Drawing.Size(366, 28);
+            this.mobileCenterLogLevel.TabIndex = 3;
+            this.mobileCenterLogLevel.SelectedIndexChanged += new System.EventHandler(this.mobileCenterLogLevel_SelectedIndexChanged);
+            // 
+            // mobileCenterEnabled
+            // 
+            this.mobileCenterEnabled.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.mobileCenterEnabled.Location = new System.Drawing.Point(12, 9);
+            this.mobileCenterEnabled.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.mobileCenterEnabled.Name = "mobileCenterEnabled";
+            this.mobileCenterEnabled.Size = new System.Drawing.Size(540, 37);
+            this.mobileCenterEnabled.TabIndex = 1;
+            this.mobileCenterEnabled.Text = "Mobile Center Enabled";
+            this.mobileCenterEnabled.UseVisualStyleBackColor = true;
+            this.mobileCenterEnabled.CheckedChanged += new System.EventHandler(this.mobileCenterEnabled_CheckedChanged);
+            // 
+            // analytics
+            // 
+            this.analytics.Controls.Add(this.eventBox);
+            this.analytics.Controls.Add(this.analyticsEnabled);
+            this.analytics.Location = new System.Drawing.Point(4, 29);
+            this.analytics.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.analytics.Name = "analytics";
+            this.analytics.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.analytics.Size = new System.Drawing.Size(568, 369);
+            this.analytics.TabIndex = 1;
+            this.analytics.Text = "Analytics";
+            this.analytics.UseVisualStyleBackColor = true;
+            // 
+            // eventBox
+            // 
+            this.eventBox.Controls.Add(this.trackEvent);
+            this.eventBox.Controls.Add(this.eventProperties);
+            this.eventBox.Controls.Add(this.eventName);
+            this.eventBox.Controls.Add(this.eventNameLabel);
+            this.eventBox.Location = new System.Drawing.Point(12, 55);
+            this.eventBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventBox.Name = "eventBox";
+            this.eventBox.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventBox.Size = new System.Drawing.Size(540, 294);
+            this.eventBox.TabIndex = 3;
+            this.eventBox.TabStop = false;
+            this.eventBox.Text = "Event";
+            // 
+            // trackEvent
+            // 
+            this.trackEvent.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.trackEvent.Location = new System.Drawing.Point(14, 249);
+            this.trackEvent.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.trackEvent.Name = "trackEvent";
+            this.trackEvent.Size = new System.Drawing.Size(513, 35);
+            this.trackEvent.TabIndex = 14;
+            this.trackEvent.Text = "Track Event";
+            this.trackEvent.UseVisualStyleBackColor = true;
+            this.trackEvent.Click += new System.EventHandler(this.trackEvent_Click);
+            // 
+            // eventProperties
+            // 
+            this.eventProperties.AllowUserToResizeColumns = false;
+            this.eventProperties.AllowUserToResizeRows = false;
+            this.eventProperties.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.eventProperties.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.eventProperties.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Key,
+            this.Value});
+            this.eventProperties.Location = new System.Drawing.Point(14, 68);
+            this.eventProperties.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventProperties.Name = "eventProperties";
+            this.eventProperties.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            this.eventProperties.Size = new System.Drawing.Size(513, 169);
+            this.eventProperties.TabIndex = 13;
+            // 
+            // Key
+            // 
+            this.Key.HeaderText = "Key";
+            this.Key.MaxInputLength = 64;
+            this.Key.Name = "Key";
+            this.Key.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            // 
+            // Value
+            // 
+            this.Value.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.Value.HeaderText = "Value";
+            this.Value.MaxInputLength = 64;
+            this.Value.Name = "Value";
+            this.Value.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            // 
+            // eventName
+            // 
+            this.eventName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.eventName.Location = new System.Drawing.Point(159, 28);
+            this.eventName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.eventName.MaxLength = 256;
+            this.eventName.Name = "eventName";
+            this.eventName.Size = new System.Drawing.Size(366, 26);
+            this.eventName.TabIndex = 12;
+            // 
+            // eventNameLabel
+            // 
+            this.eventNameLabel.Location = new System.Drawing.Point(9, 25);
+            this.eventNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.eventNameLabel.Name = "eventNameLabel";
+            this.eventNameLabel.Size = new System.Drawing.Size(141, 35);
+            this.eventNameLabel.TabIndex = 11;
+            this.eventNameLabel.Text = "Event Name";
+            this.eventNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // analyticsEnabled
+            // 
+            this.analyticsEnabled.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.analyticsEnabled.Location = new System.Drawing.Point(12, 9);
+            this.analyticsEnabled.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.analyticsEnabled.Name = "analyticsEnabled";
+            this.analyticsEnabled.Size = new System.Drawing.Size(540, 37);
+            this.analyticsEnabled.TabIndex = 2;
+            this.analyticsEnabled.Text = "Analytics Enabled";
+            this.analyticsEnabled.UseVisualStyleBackColor = true;
+            this.analyticsEnabled.CheckedChanged += new System.EventHandler(this.analyticsEnabled_CheckedChanged);
+            // 
+            // crashes
+            // 
+            this.crashes.Controls.Add(this.CrashWithNullReferenceException);
+            this.crashes.Location = new System.Drawing.Point(4, 29);
+            this.crashes.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.crashes.Name = "crashes";
+            this.crashes.Size = new System.Drawing.Size(568, 369);
+            this.crashes.TabIndex = 2;
+            this.crashes.Text = "Crashes";
+            this.crashes.UseVisualStyleBackColor = true;
+            // 
+            // others
+            // 
+            this.others.Location = new System.Drawing.Point(4, 29);
+            this.others.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.others.Name = "others";
+            this.others.Size = new System.Drawing.Size(568, 369);
+            this.others.TabIndex = 3;
+            this.others.Text = "Others";
+            this.others.UseVisualStyleBackColor = true;
+            // 
+            // CrashWithNullReferenceException
+            // 
+            this.CrashWithNullReferenceException.Location = new System.Drawing.Point(35, 31);
+            this.CrashWithNullReferenceException.Name = "CrashWithNullReferenceException";
+            this.CrashWithNullReferenceException.Size = new System.Drawing.Size(497, 38);
+            this.CrashWithNullReferenceException.TabIndex = 0;
+            this.CrashWithNullReferenceException.Text = "Crash with NullReferenceException";
+            this.CrashWithNullReferenceException.UseVisualStyleBackColor = true;
+            this.CrashWithNullReferenceException.Click += new System.EventHandler(this.CrashWithNullReferenceException_Click);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(576, 402);
+            this.Controls.Add(this.tabs);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.MaximizeBox = false;
+            this.Name = "MainForm";
+            this.Text = "Mobile Center Puppet App";
+            this.tabs.ResumeLayout(false);
+            this.mobileCenter.ResumeLayout(false);
+            this.logBox.ResumeLayout(false);
+            this.logBox.PerformLayout();
+            this.analytics.ResumeLayout(false);
+            this.eventBox.ResumeLayout(false);
+            this.eventBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.eventProperties)).EndInit();
+            this.crashes.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TabControl tabs;
+        private System.Windows.Forms.TabPage mobileCenter;
+        private System.Windows.Forms.TabPage analytics;
+        private System.Windows.Forms.TabPage crashes;
+        private System.Windows.Forms.TabPage others;
+        private System.Windows.Forms.CheckBox mobileCenterEnabled;
+        private System.Windows.Forms.Label mobileCenterLogLevelLabel;
+        private System.Windows.Forms.ComboBox mobileCenterLogLevel;
+        private System.Windows.Forms.GroupBox logBox;
+        private System.Windows.Forms.Button writeLog;
+        private System.Windows.Forms.TextBox logTag;
+        private System.Windows.Forms.TextBox logMessage;
+        private System.Windows.Forms.Label logMessageLabel;
+        private System.Windows.Forms.Label logTagLabel;
+        private System.Windows.Forms.Label logLevelLabel;
+        private System.Windows.Forms.ComboBox logLevel;
+        private System.Windows.Forms.GroupBox eventBox;
+        private System.Windows.Forms.CheckBox analyticsEnabled;
+        private System.Windows.Forms.TextBox eventName;
+        private System.Windows.Forms.Label eventNameLabel;
+        private System.Windows.Forms.DataGridView eventProperties;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Key;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Value;
+        private System.Windows.Forms.Button trackEvent;
+        private System.Windows.Forms.Button CrashWithNullReferenceException;
+    }
+}
+
diff --git a/Apps/Contoso.WinForms.Puppet/MainForm.cs b/Apps/Contoso.WinForms.Puppet/MainForm.cs
new file mode 100644
index 000000000..04d5ed290
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/MainForm.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+
+namespace Contoso.WinForms.Demo
+{
+    public partial class MainForm : Form
+    {
+        private static readonly IDictionary<LogLevel, Action<string, string>> LogFunctions = new Dictionary<LogLevel, Action<string, string>> {
+            { LogLevel.Verbose, MobileCenterLog.Verbose },
+            { LogLevel.Debug, MobileCenterLog.Debug },
+            { LogLevel.Info, MobileCenterLog.Info },
+            { LogLevel.Warn, MobileCenterLog.Warn },
+            { LogLevel.Error, MobileCenterLog.Error }
+        };
+
+        public MainForm()
+        {
+            InitializeComponent();
+            UpdateState();
+            mobileCenterLogLevel.SelectedIndex = (int) MobileCenter.LogLevel;
+        }
+
+        private void UpdateState()
+        {
+            mobileCenterEnabled.Checked = MobileCenter.IsEnabledAsync().Result;
+            analyticsEnabled.Checked = Analytics.IsEnabledAsync().Result;
+        }
+
+        private void mobileCenterEnabled_CheckedChanged(object sender, EventArgs e)
+        {
+            MobileCenter.SetEnabledAsync(mobileCenterEnabled.Checked).Wait();
+        }
+
+        private void analyticsEnabled_CheckedChanged(object sender, EventArgs e)
+        {
+            Analytics.SetEnabledAsync(analyticsEnabled.Checked).Wait();
+        }
+
+        private void mobileCenterLogLevel_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            MobileCenter.LogLevel = (LogLevel)mobileCenterLogLevel.SelectedIndex;
+        }
+
+        private void tabs_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            UpdateState();
+        }
+
+        private void writeLog_Click(object sender, EventArgs e)
+        {
+            if (logLevel.SelectedIndex == -1)
+            {
+                return;
+            }
+            var level = (LogLevel)logLevel.SelectedIndex;
+            var tag = logTag.Text;
+            var message = logMessage.Text;
+            LogFunctions[level](tag, message);
+        }
+
+        private void trackEvent_Click(object sender, EventArgs e)
+        {
+            var name = eventName.Text;
+            var properties = eventProperties.Rows.Cast<DataGridViewRow>()
+                .Where(row => row.Cells["Key"].Value != null && row.Cells["Value"].Value != null)
+                .ToDictionary(
+                    row => row.Cells["Key"].Value?.ToString(),
+                    row => row.Cells["Value"].Value?.ToString());
+            Analytics.TrackEvent(name, properties);
+        }
+
+        private void CrashWithNullReferenceException_Click(object sender, EventArgs e)
+        {
+            string[] values = { "a", null, "c" };
+            var b = values[1].Trim();
+            System.Diagnostics.Debug.WriteLine(b);
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Puppet/MainForm.resx b/Apps/Contoso.WinForms.Puppet/MainForm.resx
new file mode 100644
index 000000000..5bca00836
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/MainForm.resx
@@ -0,0 +1,126 @@
+<?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>
+  <metadata name="Key.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Value.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Puppet/Program.cs b/Apps/Contoso.WinForms.Puppet/Program.cs
new file mode 100644
index 000000000..ebcaf1c26
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/Program.cs
@@ -0,0 +1,27 @@
+using Microsoft.Azure.Mobile;
+using Microsoft.Azure.Mobile.Analytics;
+using Microsoft.Azure.Mobile.Crashes;
+using System;
+using System.Windows.Forms;
+
+namespace Contoso.WinForms.Demo
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.SetUnhandledExceptionMode(UnhandledExceptionMode.ThrowException);
+            MobileCenter.LogLevel = LogLevel.Verbose;
+            MobileCenter.SetLogUrl("https://in-integration.dev.avalanch.es");
+            MobileCenter.Start("42f4a839-c54c-44da-8072-a2f2a61751b2", typeof(Analytics), typeof(Crashes));
+
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new MainForm());
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs b/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..4533b5610
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/Properties/AssemblyInfo.cs
@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("Contoso.WinForms.Puppet")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/Resources.Designer.cs b/Apps/Contoso.WinForms.Puppet/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..81ae7ad81
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WinForms.Demo.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("Contoso.WinForms.Puppet.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/Resources.resx b/Apps/Contoso.WinForms.Puppet/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/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>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/Settings.Designer.cs b/Apps/Contoso.WinForms.Puppet/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..a73de79d7
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Contoso.WinForms.Demo.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.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;
+            }
+        }
+    }
+}
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/Settings.settings b/Apps/Contoso.WinForms.Puppet/Properties/Settings.settings
new file mode 100644
index 000000000..39645652a
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
diff --git a/Apps/Contoso.WinForms.Puppet/Properties/app.manifest b/Apps/Contoso.WinForms.Puppet/Properties/app.manifest
new file mode 100644
index 000000000..cd90d8bac
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/Properties/app.manifest
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <PermissionSet class="System.Security.PermissionSet" version="1" Unrestricted="true" ID="Custom" SameSite="site" />
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on and is
+           is designed to work with. Uncomment the appropriate elements and Windows will 
+           automatically selected the most compatible environment. -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+</assembly>
\ No newline at end of file
diff --git a/Apps/Contoso.WinForms.Puppet/project.json b/Apps/Contoso.WinForms.Puppet/project.json
new file mode 100644
index 000000000..e0cf888d4
--- /dev/null
+++ b/Apps/Contoso.WinForms.Puppet/project.json
@@ -0,0 +1,11 @@
+{
+  "dependencies": {
+    "sqlite-net-pcl": "1.3.1"
+  },
+  "frameworks": {
+    "net452": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/Apps/Contoso.iOS.Puppet/Info.plist b/Apps/Contoso.iOS.Puppet/Info.plist
index 9972019e7..92de9c0b7 100644
--- a/Apps/Contoso.iOS.Puppet/Info.plist
+++ b/Apps/Contoso.iOS.Puppet/Info.plist
@@ -7,9 +7,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.microsoft.azure.mobile.xamarin.puppet</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.16.1</string>
+	<string>0.17.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.16.1</string>
+	<string>0.17.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/MobileCenter-Mac.sln b/MobileCenter-Mac.sln
index 92a0ff52f..5aa518c44 100644
--- a/MobileCenter-Mac.sln
+++ b/MobileCenter-Mac.sln
@@ -107,6 +107,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Push
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Push.Shared", "SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.shproj", "{A5D2FD20-13EE-4CA4-8278-09520CC376CD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MobileCenterRum", "MobileCenterRum", "{96552695-58F3-472E-8654-52ECE3EE5CF2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum\Microsoft.Azure.Mobile.Rum.csproj", "{254D5434-9087-4F05-A43F-23A790E42024}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum.Android.Bindings", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Android.Bindings\Microsoft.Azure.Mobile.Rum.Android.Bindings.csproj", "{7E130457-B427-4043-A5A2-9484CB5809BF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum.Android", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Android\Microsoft.Azure.Mobile.Rum.Android.csproj", "{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Rum.Shared", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.shproj", "{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{119c1730-e109-4bc9-aa89-9dca2c50bfd5}*SharedItemsImports = 4
@@ -1950,6 +1960,150 @@ Global
 		{D8F25BA5-249D-4BB0-A4B1-A3245F2437FF}.Release|x64.Build.0 = Release|Any CPU
 		{D8F25BA5-249D-4BB0-A4B1-A3245F2437FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{D8F25BA5-249D-4BB0-A4B1-A3245F2437FF}.Release|x86.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x64.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x86.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|ARM.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhone.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x64.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x86.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x64.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x86.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|ARM.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhone.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x64.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2004,34 +2158,18 @@ Global
 		{DF7C7C03-E335-4C23-83BA-8E490AC5B61D} = {917E1CDC-B6CD-43D4-AAAB-29D8CDE228D9}
 		{D8F25BA5-249D-4BB0-A4B1-A3245F2437FF} = {917E1CDC-B6CD-43D4-AAAB-29D8CDE228D9}
 		{A5D2FD20-13EE-4CA4-8278-09520CC376CD} = {917E1CDC-B6CD-43D4-AAAB-29D8CDE228D9}
+		{96552695-58F3-472E-8654-52ECE3EE5CF2} = {8CDD4942-2E48-4CF7-AC99-85718F238455}
+		{254D5434-9087-4F05-A43F-23A790E42024} = {96552695-58F3-472E-8654-52ECE3EE5CF2}
+		{7E130457-B427-4043-A5A2-9484CB5809BF} = {96552695-58F3-472E-8654-52ECE3EE5CF2}
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9} = {96552695-58F3-472E-8654-52ECE3EE5CF2}
+		{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3} = {96552695-58F3-472E-8654-52ECE3EE5CF2}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
 		$0.TextStylePolicy = $1
-		$1.inheritsSet = VisualStudio
 		$1.scope = text/plain
-		$1.FileWidth = 120
-		$1.inheritsScope = text/plain
+		$1.TabsToSpaces = True
 		$0.CSharpFormattingPolicy = $2
-		$2.IndentSwitchSection = True
-		$2.NewLinesForBracesInProperties = True
-		$2.NewLinesForBracesInAccessors = True
-		$2.NewLinesForBracesInAnonymousMethods = True
-		$2.NewLinesForBracesInControlBlocks = True
-		$2.NewLinesForBracesInAnonymousTypes = True
-		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
-		$2.NewLinesForBracesInLambdaExpressionBody = True
-		$2.NewLineForElse = True
-		$2.NewLineForCatch = True
-		$2.NewLineForFinally = True
-		$2.NewLineForMembersInObjectInit = True
-		$2.NewLineForMembersInAnonymousTypes = True
-		$2.NewLineForClausesInQuery = True
-		$2.SpacingAfterMethodDeclarationName = False
-		$2.SpaceAfterMethodCallName = False
-		$2.SpaceBeforeOpenSquareBracket = False
-		$2.inheritsSet = Mono
-		$2.inheritsScope = text/x-csharp
 		$2.scope = text/x-csharp
 	EndGlobalSection
 EndGlobal
diff --git a/MobileCenter-SDK-Build-Mac.sln b/MobileCenter-SDK-Build-Mac.sln
index 8d5e25f0a..367f90d3d 100644
--- a/MobileCenter-SDK-Build-Mac.sln
+++ b/MobileCenter-SDK-Build-Mac.sln
@@ -73,6 +73,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Push
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Push.Shared", "SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.shproj", "{A5D2FD20-13EE-4CA4-8278-09520CC376CD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MobileCenterRum", "MobileCenterRum", "{83DE67B9-4AF0-4153-900D-E222BA53627E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum\Microsoft.Azure.Mobile.Rum.csproj", "{254D5434-9087-4F05-A43F-23A790E42024}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum.Android", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Android\Microsoft.Azure.Mobile.Rum.Android.csproj", "{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum.Android.Bindings", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Android.Bindings\Microsoft.Azure.Mobile.Rum.Android.Bindings.csproj", "{7E130457-B427-4043-A5A2-9484CB5809BF}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Rum.Shared", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.shproj", "{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{119c1730-e109-4bc9-aa89-9dca2c50bfd5}*SharedItemsImports = 4
@@ -1314,6 +1324,150 @@ Global
 		{9417E221-3287-47AC-BD56-5223057DC389}.Release|x64.Build.0 = Release|Any CPU
 		{9417E221-3287-47AC-BD56-5223057DC389}.Release|x86.ActiveCfg = Release|Any CPU
 		{9417E221-3287-47AC-BD56-5223057DC389}.Release|x86.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x64.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.AppStore|x86.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|ARM.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhone.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x64.Build.0 = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}.Release|x86.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x64.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.AppStore|x86.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|ARM.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhone.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x64.Build.0 = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E130457-B427-4043-A5A2-9484CB5809BF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1353,34 +1507,18 @@ Global
 		{D8F25BA5-249D-4BB0-A4B1-A3245F2437FF} = {75195C32-F130-4FB1-957E-CCCC7EE50CE6}
 		{9417E221-3287-47AC-BD56-5223057DC389} = {75195C32-F130-4FB1-957E-CCCC7EE50CE6}
 		{A5D2FD20-13EE-4CA4-8278-09520CC376CD} = {75195C32-F130-4FB1-957E-CCCC7EE50CE6}
+		{83DE67B9-4AF0-4153-900D-E222BA53627E} = {8CDD4942-2E48-4CF7-AC99-85718F238455}
+		{254D5434-9087-4F05-A43F-23A790E42024} = {83DE67B9-4AF0-4153-900D-E222BA53627E}
+		{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9} = {83DE67B9-4AF0-4153-900D-E222BA53627E}
+		{7E130457-B427-4043-A5A2-9484CB5809BF} = {83DE67B9-4AF0-4153-900D-E222BA53627E}
+		{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3} = {83DE67B9-4AF0-4153-900D-E222BA53627E}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
 		$0.TextStylePolicy = $1
-		$1.inheritsSet = VisualStudio
 		$1.scope = text/plain
-		$1.FileWidth = 120
-		$1.inheritsScope = text/plain
+		$1.TabsToSpaces = True
 		$0.CSharpFormattingPolicy = $2
-		$2.IndentSwitchSection = True
-		$2.NewLinesForBracesInProperties = True
-		$2.NewLinesForBracesInAccessors = True
-		$2.NewLinesForBracesInAnonymousMethods = True
-		$2.NewLinesForBracesInControlBlocks = True
-		$2.NewLinesForBracesInAnonymousTypes = True
-		$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
-		$2.NewLinesForBracesInLambdaExpressionBody = True
-		$2.NewLineForElse = True
-		$2.NewLineForCatch = True
-		$2.NewLineForFinally = True
-		$2.NewLineForMembersInObjectInit = True
-		$2.NewLineForMembersInAnonymousTypes = True
-		$2.NewLineForClausesInQuery = True
-		$2.SpacingAfterMethodDeclarationName = False
-		$2.SpaceAfterMethodCallName = False
-		$2.SpaceBeforeOpenSquareBracket = False
-		$2.inheritsSet = Mono
-		$2.inheritsScope = text/x-csharp
 		$2.scope = text/x-csharp
 	EndGlobalSection
 EndGlobal
diff --git a/MobileCenter-SDK-Build-Windows.sln b/MobileCenter-SDK-Build-Windows.sln
index 2a849f092..c3abe6e77 100644
--- a/MobileCenter-SDK-Build-Windows.sln
+++ b/MobileCenter-SDK-Build-Windows.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{8CDD4942-2E48-4CF7-AC99-85718F238455}"
 EndProject
@@ -35,20 +35,47 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatsonRegistrationUtility",
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Push.Shared", "SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.shproj", "{A5D2FD20-13EE-4CA4-8278-09520CC376CD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.WindowsDesktop", "SDK\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj", "{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Analytics.WindowsDesktop", "SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.WindowsDesktop\Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj", "{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Crashes.WindowsDesktop", "SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.WindowsDesktop\Microsoft.Azure.Mobile.Crashes.WindowsDesktop.csproj", "{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MobileCenterRum", "MobileCenterRum", "{86ABB975-56B5-489E-AA61-95EA6B890DBB}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Rum.Shared", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.shproj", "{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum\Microsoft.Azure.Mobile.Rum.csproj", "{254D5434-9087-4F05-A43F-23A790E42024}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Rum.Windows.Shared", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Windows.Shared\Microsoft.Azure.Mobile.Rum.Windows.Shared.shproj", "{7EEA1E57-8244-42A4-AA3E-CFB995E86467}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum.UWP", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.UWP\Microsoft.Azure.Mobile.Rum.UWP.csproj", "{BCD888D1-A62F-458C-A72B-9DF731EE1A55}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{15e3fc9b-7714-4468-a296-81627a5b8f01}*SharedItemsImports = 4
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{15e3fc9b-7714-4468-a296-81627a5b8f01}*SharedItemsImports = 4
+		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}*SharedItemsImports = 4
+		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}*SharedItemsImports = 4
+		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{1f6c139a-29bb-4e74-8df2-f8ccab399a67}*SharedItemsImports = 4
 		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{200073bf-fa7e-42af-8ed5-aa50be7c0295}*SharedItemsImports = 4
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems*{254d5434-9087-4f05-a43f-23a790e42024}*SharedItemsImports = 4
 		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems*{2f715d51-643c-4f7f-9ea4-6554d4eeccb2}*SharedItemsImports = 4
+		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems*{2f715d51-643c-4f7f-9ea4-6554d4eeccb2}*SharedItemsImports = 4
 		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{7ce5bf9e-3650-4151-8b54-c1301aa73606}*SharedItemsImports = 13
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Windows.Shared\Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems*{7eea1e57-8244-42a4-aa3e-cfb995e86467}*SharedItemsImports = 13
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.projitems*{8072449c-c6a8-4b36-87dc-173f295d161c}*SharedItemsImports = 4
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Windows.Shared\Microsoft.Azure.Mobile.Push.Windows.Shared.projitems*{8072449c-c6a8-4b36-87dc-173f295d161c}*SharedItemsImports = 4
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems*{8e7b80c4-d22a-4f80-a7ae-e3882e72ffb3}*SharedItemsImports = 13
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.projitems*{a5d2fd20-13ee-4ca4-8278-09520cc376cd}*SharedItemsImports = 13
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{b4e6ad1c-21a0-43a4-bd73-ed9bfc19be6f}*SharedItemsImports = 13
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Windows.Shared\Microsoft.Azure.Mobile.Push.Windows.Shared.projitems*{ba25a66a-fcea-49c2-a85a-0f6f54463675}*SharedItemsImports = 13
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems*{bcd888d1-a62f-458c-a72b-9df731ee1a55}*SharedItemsImports = 4
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Windows.Shared\Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems*{bcd888d1-a62f-458c-a72b-9df731ee1a55}*SharedItemsImports = 4
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{c6c4937c-d5f4-4e00-8b51-8d826ad83c5e}*SharedItemsImports = 13
 		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems*{db5a0b7d-8090-4a0c-97c7-cdf17aacaaf2}*SharedItemsImports = 13
+		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems*{dc55c086-714d-4e2f-b6ce-3c14bc3b6646}*SharedItemsImports = 4
+		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems*{dc55c086-714d-4e2f-b6ce-3c14bc3b6646}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -354,6 +381,306 @@ Global
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Release|x64.Build.0 = Release|x64
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Release|x86.ActiveCfg = Release|Win32
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Release|x86.Build.0 = Release|Win32
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|ARM.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|x64.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.AppStore|x86.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|ARM.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|ARM.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|iPhone.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|iPhone.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x64.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x64.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x86.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x86.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|ARM.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhone.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x64.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x86.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|ARM.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|x64.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.AppStore|x86.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x64.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|ARM.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|ARM.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|iPhone.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|iPhone.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x64.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x64.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x86.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x86.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|ARM.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhone.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x64.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x64.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x86.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|ARM.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|x64.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.AppStore|x86.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|ARM.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x64.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x86.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|ARM.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|ARM.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|iPhone.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|iPhone.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|x64.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|x64.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|x86.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Reference|x86.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|ARM.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhone.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x64.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x86.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|ARM.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x64.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.AppStore|x86.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|ARM.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|ARM.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|iPhone.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|iPhone.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|x64.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|x64.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|x86.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Reference|x86.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|ARM.Build.0 = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|x64.ActiveCfg = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|x64.Build.0 = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|x86.ActiveCfg = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Ad-Hoc|x86.Build.0 = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|ARM.ActiveCfg = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|ARM.Build.0 = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|x64.ActiveCfg = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|x64.Build.0 = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|x86.ActiveCfg = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.AppStore|x86.Build.0 = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|ARM.Build.0 = Debug|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x64.ActiveCfg = Debug|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x64.Build.0 = Debug|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x86.ActiveCfg = Debug|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x86.Build.0 = Debug|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|ARM.ActiveCfg = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|ARM.Build.0 = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|iPhone.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|iPhone.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|x64.ActiveCfg = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|x64.Build.0 = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|x86.ActiveCfg = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Reference|x86.Build.0 = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|ARM.ActiveCfg = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|ARM.Build.0 = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhone.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x64.ActiveCfg = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x64.Build.0 = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x86.ActiveCfg = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -374,6 +701,17 @@ Global
 		{BA25A66A-FCEA-49C2-A85A-0F6F54463675} = {07D963ED-6766-434B-B279-2CDFA2527459}
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D} = {7FAAA086-4453-4B62-AD9A-2E2ED216E3C4}
 		{A5D2FD20-13EE-4CA4-8278-09520CC376CD} = {07D963ED-6766-434B-B279-2CDFA2527459}
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590} = {13744327-9529-490B-A970-06A1D3144117}
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67} = {C4C63221-60D5-412B-92CC-D59A8EA62E23}
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646} = {7FAAA086-4453-4B62-AD9A-2E2ED216E3C4}
+		{86ABB975-56B5-489E-AA61-95EA6B890DBB} = {8CDD4942-2E48-4CF7-AC99-85718F238455}
+		{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3} = {86ABB975-56B5-489E-AA61-95EA6B890DBB}
+		{254D5434-9087-4F05-A43F-23A790E42024} = {86ABB975-56B5-489E-AA61-95EA6B890DBB}
+		{7EEA1E57-8244-42A4-AA3E-CFB995E86467} = {86ABB975-56B5-489E-AA61-95EA6B890DBB}
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55} = {86ABB975-56B5-489E-AA61-95EA6B890DBB}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {230680B3-D7BC-4263-964C-023F34CB6001}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		Policies = $0
diff --git a/MobileCenter-SDK-Test-Windows.sln b/MobileCenter-SDK-Test-Windows.sln
index 3979ee3ac..02f996715 100644
--- a/MobileCenter-SDK-Test-Windows.sln
+++ b/MobileCenter-SDK-Test-Windows.sln
@@ -41,10 +41,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Push
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Test.UWP", "Tests\Microsoft.Azure.Mobile.Test.UWP\Microsoft.Azure.Mobile.Test.UWP.csproj", "{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Test.WindowsDesktop", "Tests\Microsoft.Azure.Mobile.Test.WindowsDesktop\Microsoft.Azure.Mobile.Test.WindowsDesktop.csproj", "{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.WindowsDesktop", "SDK\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj", "{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Analytics.WindowsDesktop", "SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.WindowsDesktop\Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj", "{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{15e3fc9b-7714-4468-a296-81627a5b8f01}*SharedItemsImports = 4
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{15e3fc9b-7714-4468-a296-81627a5b8f01}*SharedItemsImports = 4
+		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}*SharedItemsImports = 4
+		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}*SharedItemsImports = 4
+		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{1f6c139a-29bb-4e74-8df2-f8ccab399a67}*SharedItemsImports = 4
 		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{200073bf-fa7e-42af-8ed5-aa50be7c0295}*SharedItemsImports = 4
 		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{7ce5bf9e-3650-4151-8b54-c1301aa73606}*SharedItemsImports = 13
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.projitems*{8072449c-c6a8-4b36-87dc-173f295d161c}*SharedItemsImports = 4
@@ -321,6 +330,78 @@ Global
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Release|x86.ActiveCfg = Release|x86
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Release|x86.Build.0 = Release|x86
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Release|x86.Deploy.0 = Release|x86
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Debug|x86.Build.0 = Debug|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|ARM.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|ARM.Build.0 = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|x64.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|x64.Build.0 = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|x86.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Reference|x86.Build.0 = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|ARM.Build.0 = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|x64.Build.0 = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|x86.ActiveCfg = Release|Any CPU
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}.Release|x86.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|ARM.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|ARM.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x64.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x64.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x86.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Reference|x86.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|ARM.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x64.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x86.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x64.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|Any CPU.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|Any CPU.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|ARM.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|ARM.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x64.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x64.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x86.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Reference|x86.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|ARM.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x64.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x64.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -343,5 +424,8 @@ Global
 		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295} = {7D1BE3C5-199E-483C-A62F-D0376346B0D7}
 		{8072449C-C6A8-4B36-87DC-173F295D161C} = {20870E0A-068E-4016-9B51-53B46696352B}
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D} = {BC900C35-E0AD-46D2-BA4A-EF1904820B4A}
+		{C4674357-EFBA-43AA-9DB8-DE62A3309EB6} = {BC900C35-E0AD-46D2-BA4A-EF1904820B4A}
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590} = {B699D34F-C961-4E03-89AD-6B00FF643AE8}
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67} = {7D1BE3C5-199E-483C-A62F-D0376346B0D7}
 	EndGlobalSection
 EndGlobal
diff --git a/MobileCenter-Windows.sln b/MobileCenter-Windows.sln
index b2fe57dee..0109d015f 100644
--- a/MobileCenter-Windows.sln
+++ b/MobileCenter-Windows.sln
@@ -77,34 +77,80 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Push
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Push.NET", "Tests\Microsoft.Azure.Mobile.Push.NET\Microsoft.Azure.Mobile.Push.NET.csproj", "{8A885E5E-A160-4AD2-BD03-59E3A6366C32}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contoso.WinForms.Puppet", "Contoso.WinForms.Puppet", "{87A5B88A-B001-4D2F-BFD5-6E7129D91973}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.WinForms.Puppet", "Apps\Contoso.WinForms.Puppet\Contoso.WinForms.Puppet.csproj", "{44E1971C-3399-4C88-AFE5-54EB53737D31}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatsonRegistrationUtility", "SDK\MobileCenterCrashes\WatsonRegistrationUtility\WatsonRegistrationUtility.vcxproj", "{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Push", "SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push\Microsoft.Azure.Mobile.Push.csproj", "{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Push.Shared", "SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.shproj", "{A5D2FD20-13EE-4CA4-8278-09520CC376CD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MobileCenterRum", "MobileCenterRum", "{2C6C128A-4416-41F7-AA9A-48AD4679701D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Rum.Shared", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.shproj", "{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum\Microsoft.Azure.Mobile.Rum.csproj", "{254D5434-9087-4F05-A43F-23A790E42024}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Rum.UWP", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.UWP\Microsoft.Azure.Mobile.Rum.UWP.csproj", "{BCD888D1-A62F-458C-A72B-9DF731EE1A55}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Rum.Windows.Shared", "SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Windows.Shared\Microsoft.Azure.Mobile.Rum.Windows.Shared.shproj", "{7EEA1E57-8244-42A4-AA3E-CFB995E86467}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.WinForms.Demo", "Apps\Contoso.WinForms.Demo\Contoso.WinForms.Demo.csproj", "{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contoso.WinForms.Demo", "Contoso.WinForms.Demo", "{9E5968DD-EA77-45A7-B6B8-3290CE70ED7A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contoso.WPF.Puppet", "Contoso.WPF.Puppet", "{2CE90D96-B5DD-417D-BC25-B5EB20D993B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contoso.WPF.Demo", "Contoso.WPF.Demo", "{A0A24A9A-89CB-48EF-8865-705AB81E53F5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.WPF.Demo", "Apps\Contoso.WPF.Demo\Contoso.WPF.Demo.csproj", "{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.WPF.Puppet", "Apps\Contoso.WPF.Puppet\Contoso.WPF.Puppet.csproj", "{951ABE8D-7AF6-4162-8639-E78B022B1048}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.WindowsDesktop", "SDK\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj", "{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Analytics.WindowsDesktop", "SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.WindowsDesktop\Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj", "{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.Mobile.Crashes.WindowsDesktop", "SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.WindowsDesktop\Microsoft.Azure.Mobile.Crashes.WindowsDesktop.csproj", "{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Azure.Mobile.Crashes.Windows.Shared", "SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.shproj", "{3F190EDF-F524-4B8D-9031-CD7B045EB6A5}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{15e3fc9b-7714-4468-a296-81627a5b8f01}*SharedItemsImports = 4
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{15e3fc9b-7714-4468-a296-81627a5b8f01}*SharedItemsImports = 4
+		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}*SharedItemsImports = 4
+		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}*SharedItemsImports = 4
+		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{1f6c139a-29bb-4e74-8df2-f8ccab399a67}*SharedItemsImports = 4
 		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{200073bf-fa7e-42af-8ed5-aa50be7c0295}*SharedItemsImports = 4
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems*{254d5434-9087-4f05-a43f-23a790e42024}*SharedItemsImports = 4
 		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems*{2f715d51-643c-4f7f-9ea4-6554d4eeccb2}*SharedItemsImports = 4
+		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems*{2f715d51-643c-4f7f-9ea4-6554d4eeccb2}*SharedItemsImports = 4
 		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems*{302f0881-77ae-4cce-acf4-930ad5d4fb08}*SharedItemsImports = 4
+		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems*{3f190edf-f524-4b8d-9031-cd7b045eb6a5}*SharedItemsImports = 13
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{3fe04b97-48de-4895-8612-ecbdfebd917c}*SharedItemsImports = 4
 		SDK\MobileCenterDistribute\Microsoft.Azure.Mobile.Distribute.Shared\Microsoft.Azure.Mobile.Distribute.Shared.projitems*{41febc72-c12b-47e1-b6f6-51d50158c825}*SharedItemsImports = 4
 		SDK\MobileCenterDistribute\Microsoft.Azure.Mobile.Distribute.Shared\Microsoft.Azure.Mobile.Distribute.Shared.projitems*{5aef073d-7370-41c1-86cd-a61b4deb9883}*SharedItemsImports = 13
 		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{7ce5bf9e-3650-4151-8b54-c1301aa73606}*SharedItemsImports = 13
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Windows.Shared\Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems*{7eea1e57-8244-42a4-aa3e-cfb995e86467}*SharedItemsImports = 13
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.projitems*{8072449c-c6a8-4b36-87dc-173f295d161c}*SharedItemsImports = 4
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Windows.Shared\Microsoft.Azure.Mobile.Push.Windows.Shared.projitems*{8072449c-c6a8-4b36-87dc-173f295d161c}*SharedItemsImports = 4
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.projitems*{8a885e5e-a160-4ad2-bd03-59e3a6366c32}*SharedItemsImports = 4
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Windows.Shared\Microsoft.Azure.Mobile.Push.Windows.Shared.projitems*{8a885e5e-a160-4ad2-bd03-59e3a6366c32}*SharedItemsImports = 4
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems*{8e7b80c4-d22a-4f80-a7ae-e3882e72ffb3}*SharedItemsImports = 13
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.projitems*{8ee6b5da-6547-43c8-aeb6-8e0eae3f81c9}*SharedItemsImports = 4
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Shared\Microsoft.Azure.Mobile.Push.Shared.projitems*{a5d2fd20-13ee-4ca4-8278-09520cc376cd}*SharedItemsImports = 13
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{b4e6ad1c-21a0-43a4-bd73-ed9bfc19be6f}*SharedItemsImports = 13
 		SDK\MobileCenterPush\Microsoft.Azure.Mobile.Push.Windows.Shared\Microsoft.Azure.Mobile.Push.Windows.Shared.projitems*{ba25a66a-fcea-49c2-a85a-0f6f54463675}*SharedItemsImports = 13
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems*{bcd888d1-a62f-458c-a72b-9df731ee1a55}*SharedItemsImports = 4
+		SDK\MobileCenterRum\Microsoft.Azure.Mobile.Rum.Windows.Shared\Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems*{bcd888d1-a62f-458c-a72b-9df731ee1a55}*SharedItemsImports = 4
 		SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems*{c5dac35e-b902-4e24-a8f7-963ad0f85f7a}*SharedItemsImports = 4
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{c6c4937c-d5f4-4e00-8b51-8d826ad83c5e}*SharedItemsImports = 13
 		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems*{db5a0b7d-8090-4a0c-97c7-cdf17aacaaf2}*SharedItemsImports = 13
+		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems*{dc55c086-714d-4e2f-b6ce-3c14bc3b6646}*SharedItemsImports = 4
+		SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems*{dc55c086-714d-4e2f-b6ce-3c14bc3b6646}*SharedItemsImports = 4
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems*{e76dc547-2b63-4911-971c-767587ebfab6}*SharedItemsImports = 4
 		SDK\MobileCenter\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems*{e76dc547-2b63-4911-971c-767587ebfab6}*SharedItemsImports = 4
 	EndGlobalSection
@@ -115,12 +161,6 @@ Global
 		Debug|iPhoneSimulator = Debug|iPhoneSimulator
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Reference|Any CPU = Reference|Any CPU
-		Reference|ARM = Reference|ARM
-		Reference|iPhone = Reference|iPhone
-		Reference|iPhoneSimulator = Reference|iPhoneSimulator
-		Reference|x64 = Reference|x64
-		Reference|x86 = Reference|x86
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
 		Release|iPhone = Release|iPhone
@@ -141,18 +181,6 @@ Global
 		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Debug|x86.Build.0 = Debug|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|ARM.ActiveCfg = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|ARM.Build.0 = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|x64.ActiveCfg = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|x64.Build.0 = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|x86.ActiveCfg = Reference|Any CPU
-		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Reference|x86.Build.0 = Reference|Any CPU
 		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3FE04B97-48DE-4895-8612-ECBDFEBD917C}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -175,20 +203,8 @@ Global
 		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Debug|x64.ActiveCfg = Debug|x64
 		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Debug|x64.Build.0 = Debug|x64
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Debug|x86.Build.0 = Debug|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|ARM.ActiveCfg = Reference|ARM
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|ARM.Build.0 = Reference|ARM
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|x64.ActiveCfg = Reference|x64
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|x64.Build.0 = Reference|x64
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|x86.ActiveCfg = Reference|x86
-		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Reference|x86.Build.0 = Reference|x86
+		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Debug|x86.ActiveCfg = Debug|x86
+		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Debug|x86.Build.0 = Debug|x86
 		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15E3FC9B-7714-4468-A296-81627A5B8F01}.Release|ARM.ActiveCfg = Release|ARM
@@ -213,18 +229,6 @@ Global
 		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Debug|x64.Build.0 = Debug|Any CPU
 		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Debug|x86.Build.0 = Debug|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|ARM.ActiveCfg = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|ARM.Build.0 = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|x64.ActiveCfg = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|x64.Build.0 = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|x86.ActiveCfg = Reference|Any CPU
-		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Reference|x86.Build.0 = Reference|Any CPU
 		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0F13E444-717E-460A-BDE7-8AD537F0A418}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -247,20 +251,8 @@ Global
 		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Debug|x64.ActiveCfg = Debug|x64
 		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Debug|x64.Build.0 = Debug|x64
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Debug|x86.Build.0 = Debug|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|ARM.ActiveCfg = Reference|ARM
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|ARM.Build.0 = Reference|ARM
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|x64.ActiveCfg = Reference|x64
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|x64.Build.0 = Reference|x64
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|x86.ActiveCfg = Reference|x86
-		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Reference|x86.Build.0 = Reference|x86
+		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Debug|x86.ActiveCfg = Debug|x86
+		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Debug|x86.Build.0 = Debug|x86
 		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Release|Any CPU.Build.0 = Release|Any CPU
 		{200073BF-FA7E-42AF-8ED5-AA50BE7C0295}.Release|ARM.ActiveCfg = Release|ARM
@@ -285,18 +277,6 @@ Global
 		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Debug|x64.Build.0 = Debug|Any CPU
 		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Debug|x86.Build.0 = Debug|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|ARM.ActiveCfg = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|ARM.Build.0 = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|x64.ActiveCfg = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|x64.Build.0 = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|x86.ActiveCfg = Reference|Any CPU
-		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Reference|x86.Build.0 = Reference|Any CPU
 		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Release|Any CPU.Build.0 = Release|Any CPU
 		{302F0881-77AE-4CCE-ACF4-930AD5D4FB08}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -321,20 +301,8 @@ Global
 		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Debug|x64.Build.0 = Debug|x64
 		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Debug|x86.ActiveCfg = Debug|x86
 		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Debug|x86.Build.0 = Debug|x86
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|ARM.ActiveCfg = Reference|ARM
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|ARM.Build.0 = Reference|ARM
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|x64.ActiveCfg = Reference|x64
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|x64.Build.0 = Reference|x64
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|x86.ActiveCfg = Reference|x86
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Reference|x86.Build.0 = Reference|x86
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Release|Any CPU.ActiveCfg = Release|x86
-		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Release|Any CPU.Build.0 = Release|x86
+		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Release|ARM.ActiveCfg = Release|ARM
 		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Release|ARM.Build.0 = Release|ARM
 		{2F715D51-643C-4F7F-9EA4-6554D4EECCB2}.Release|iPhone.ActiveCfg = Release|Any CPU
@@ -357,18 +325,6 @@ Global
 		{92313C69-3BC4-4276-A1C8-100C86183F12}.Debug|x64.Build.0 = Debug|Any CPU
 		{92313C69-3BC4-4276-A1C8-100C86183F12}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{92313C69-3BC4-4276-A1C8-100C86183F12}.Debug|x86.Build.0 = Debug|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|ARM.ActiveCfg = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|ARM.Build.0 = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|x64.ActiveCfg = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|x64.Build.0 = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|x86.ActiveCfg = Reference|Any CPU
-		{92313C69-3BC4-4276-A1C8-100C86183F12}.Reference|x86.Build.0 = Reference|Any CPU
 		{92313C69-3BC4-4276-A1C8-100C86183F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92313C69-3BC4-4276-A1C8-100C86183F12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{92313C69-3BC4-4276-A1C8-100C86183F12}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -395,18 +351,6 @@ Global
 		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Debug|x86.ActiveCfg = Debug|x86
 		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Debug|x86.Build.0 = Debug|x86
 		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Debug|x86.Deploy.0 = Debug|x86
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|Any CPU.ActiveCfg = Reference|x86
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|ARM.ActiveCfg = Reference|ARM
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|ARM.Build.0 = Reference|ARM
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|ARM.Deploy.0 = Reference|ARM
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|iPhone.ActiveCfg = Reference|x86
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|iPhoneSimulator.ActiveCfg = Reference|x86
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|x64.ActiveCfg = Reference|x64
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|x64.Build.0 = Reference|x64
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|x64.Deploy.0 = Reference|x64
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|x86.ActiveCfg = Reference|x86
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|x86.Build.0 = Reference|x86
-		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Reference|x86.Deploy.0 = Reference|x86
 		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Release|Any CPU.ActiveCfg = Release|x86
 		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Release|Any CPU.Build.0 = Release|x86
 		{F2E21B65-DF87-40F0-BB2E-E67E728B86DA}.Release|Any CPU.Deploy.0 = Release|x86
@@ -433,12 +377,6 @@ Global
 		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Debug|x86.Build.0 = Debug|Any CPU
-		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Reference|Any CPU.ActiveCfg = Release|Any CPU
-		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Reference|ARM.ActiveCfg = Release|Any CPU
-		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Reference|iPhone.ActiveCfg = Release|Any CPU
-		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Reference|x64.ActiveCfg = Release|Any CPU
-		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Reference|x86.ActiveCfg = Release|Any CPU
 		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E52C5D53-4485-4350-9F4E-AFF85CC18FD7}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -463,12 +401,6 @@ Global
 		{E76DC547-2B63-4911-971C-767587EBFAB6}.Debug|x64.Build.0 = Debug|Any CPU
 		{E76DC547-2B63-4911-971C-767587EBFAB6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E76DC547-2B63-4911-971C-767587EBFAB6}.Debug|x86.Build.0 = Debug|Any CPU
-		{E76DC547-2B63-4911-971C-767587EBFAB6}.Reference|Any CPU.ActiveCfg = Release|Any CPU
-		{E76DC547-2B63-4911-971C-767587EBFAB6}.Reference|ARM.ActiveCfg = Release|Any CPU
-		{E76DC547-2B63-4911-971C-767587EBFAB6}.Reference|iPhone.ActiveCfg = Release|Any CPU
-		{E76DC547-2B63-4911-971C-767587EBFAB6}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{E76DC547-2B63-4911-971C-767587EBFAB6}.Reference|x64.ActiveCfg = Release|Any CPU
-		{E76DC547-2B63-4911-971C-767587EBFAB6}.Reference|x86.ActiveCfg = Release|Any CPU
 		{E76DC547-2B63-4911-971C-767587EBFAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E76DC547-2B63-4911-971C-767587EBFAB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E76DC547-2B63-4911-971C-767587EBFAB6}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -493,12 +425,6 @@ Global
 		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Debug|x86.Build.0 = Debug|Any CPU
-		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Reference|Any CPU.ActiveCfg = Release|Any CPU
-		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Reference|ARM.ActiveCfg = Release|Any CPU
-		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Reference|iPhone.ActiveCfg = Release|Any CPU
-		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Reference|x64.ActiveCfg = Release|Any CPU
-		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Reference|x86.ActiveCfg = Release|Any CPU
 		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5DAC35E-B902-4E24-A8F7-963AD0F85F7A}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -523,12 +449,6 @@ Global
 		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Debug|x86.Build.0 = Debug|Any CPU
-		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Reference|Any CPU.ActiveCfg = Release|Any CPU
-		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Reference|ARM.ActiveCfg = Release|Any CPU
-		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Reference|iPhone.ActiveCfg = Release|Any CPU
-		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Reference|x64.ActiveCfg = Release|Any CPU
-		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Reference|x86.ActiveCfg = Release|Any CPU
 		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4CFBAE12-D17F-49FF-B41D-C861EEB965C4}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -555,18 +475,6 @@ Global
 		{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|x86.ActiveCfg = Debug|x86
 		{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|x86.Build.0 = Debug|x86
 		{2F81AF7B-06FC-4163-859A-979F375330FF}.Debug|x86.Deploy.0 = Debug|x86
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|Any CPU.ActiveCfg = Reference|x86
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|ARM.ActiveCfg = Reference|ARM
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|ARM.Build.0 = Reference|ARM
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|ARM.Deploy.0 = Reference|ARM
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|iPhone.ActiveCfg = Reference|x86
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|iPhoneSimulator.ActiveCfg = Reference|x86
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|x64.ActiveCfg = Reference|x64
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|x64.Build.0 = Reference|x64
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|x64.Deploy.0 = Reference|x64
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|x86.ActiveCfg = Reference|x86
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|x86.Build.0 = Reference|x86
-		{2F81AF7B-06FC-4163-859A-979F375330FF}.Reference|x86.Deploy.0 = Reference|x86
 		{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|Any CPU.ActiveCfg = Release|x86
 		{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|Any CPU.Build.0 = Release|x86
 		{2F81AF7B-06FC-4163-859A-979F375330FF}.Release|Any CPU.Deploy.0 = Release|x86
@@ -593,18 +501,6 @@ Global
 		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Debug|x86.Build.0 = Debug|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|ARM.ActiveCfg = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|ARM.Build.0 = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|x64.ActiveCfg = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|x64.Build.0 = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|x86.ActiveCfg = Reference|Any CPU
-		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Reference|x86.Build.0 = Reference|Any CPU
 		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -631,18 +527,6 @@ Global
 		{665362D9-5EE2-45DE-A907-25DC86999A68}.Debug|x86.ActiveCfg = Debug|x86
 		{665362D9-5EE2-45DE-A907-25DC86999A68}.Debug|x86.Build.0 = Debug|x86
 		{665362D9-5EE2-45DE-A907-25DC86999A68}.Debug|x86.Deploy.0 = Debug|x86
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|Any CPU.ActiveCfg = Reference|x86
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|ARM.ActiveCfg = Reference|ARM
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|ARM.Build.0 = Reference|ARM
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|ARM.Deploy.0 = Reference|ARM
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|iPhone.ActiveCfg = Reference|x86
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|iPhoneSimulator.ActiveCfg = Reference|x86
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|x64.ActiveCfg = Reference|x64
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|x64.Build.0 = Reference|x64
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|x64.Deploy.0 = Reference|x64
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|x86.ActiveCfg = Reference|x86
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|x86.Build.0 = Reference|x86
-		{665362D9-5EE2-45DE-A907-25DC86999A68}.Reference|x86.Deploy.0 = Reference|x86
 		{665362D9-5EE2-45DE-A907-25DC86999A68}.Release|Any CPU.ActiveCfg = Release|x86
 		{665362D9-5EE2-45DE-A907-25DC86999A68}.Release|Any CPU.Build.0 = Release|x86
 		{665362D9-5EE2-45DE-A907-25DC86999A68}.Release|Any CPU.Deploy.0 = Release|x86
@@ -669,18 +553,6 @@ Global
 		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Debug|x64.Build.0 = Debug|Any CPU
 		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Debug|x86.Build.0 = Debug|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|ARM.ActiveCfg = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|ARM.Build.0 = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|x64.ActiveCfg = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|x64.Build.0 = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|x86.ActiveCfg = Reference|Any CPU
-		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Reference|x86.Build.0 = Reference|Any CPU
 		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41FEBC72-C12B-47E1-B6F6-51D50158C825}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -705,12 +577,6 @@ Global
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|x86.ActiveCfg = Debug|x86
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|x86.Build.0 = Debug|x86
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Debug|x86.Deploy.0 = Debug|x86
-		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Reference|Any CPU.ActiveCfg = Release|x64
-		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Reference|ARM.ActiveCfg = Release|ARM
-		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Reference|iPhone.ActiveCfg = Release|x64
-		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Reference|iPhoneSimulator.ActiveCfg = Release|x64
-		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Reference|x64.ActiveCfg = Release|x64
-		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Reference|x86.ActiveCfg = Release|x86
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Release|Any CPU.ActiveCfg = Release|x86
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Release|ARM.ActiveCfg = Release|ARM
 		{6D86EE4F-2871-4DC3-BCA4-A692DBEAE59D}.Release|ARM.Build.0 = Release|ARM
@@ -733,21 +599,9 @@ Global
 		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x64.ActiveCfg = Debug|x64
 		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x64.Build.0 = Debug|x64
 		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x64.Deploy.0 = Debug|x64
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x86.Build.0 = Debug|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|Any CPU.ActiveCfg = Reference|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|Any CPU.Build.0 = Reference|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|ARM.ActiveCfg = Reference|ARM
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|ARM.Build.0 = Reference|ARM
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|iPhone.ActiveCfg = Reference|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|iPhone.Build.0 = Reference|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|iPhoneSimulator.ActiveCfg = Reference|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|iPhoneSimulator.Build.0 = Reference|Any CPU
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|x64.ActiveCfg = Reference|x64
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|x64.Build.0 = Reference|x64
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|x86.ActiveCfg = Reference|x86
-		{8072449C-C6A8-4B36-87DC-173F295D161C}.Reference|x86.Build.0 = Reference|x86
+		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x86.ActiveCfg = Debug|x86
+		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x86.Build.0 = Debug|x86
+		{8072449C-C6A8-4B36-87DC-173F295D161C}.Debug|x86.Deploy.0 = Debug|x86
 		{8072449C-C6A8-4B36-87DC-173F295D161C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8072449C-C6A8-4B36-87DC-173F295D161C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8072449C-C6A8-4B36-87DC-173F295D161C}.Release|ARM.ActiveCfg = Release|ARM
@@ -773,18 +627,6 @@ Global
 		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Debug|x64.Build.0 = Debug|Any CPU
 		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Debug|x86.Build.0 = Debug|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|Any CPU.ActiveCfg = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|Any CPU.Build.0 = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|ARM.ActiveCfg = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|ARM.Build.0 = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|iPhone.ActiveCfg = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|iPhone.Build.0 = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|x64.ActiveCfg = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|x64.Build.0 = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|x86.ActiveCfg = Release|Any CPU
-		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Reference|x86.Build.0 = Release|Any CPU
 		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39DFE901-EBE0-4907-871C-D2638FEA2D49}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -809,18 +651,6 @@ Global
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|Any CPU.ActiveCfg = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|Any CPU.Build.0 = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|ARM.ActiveCfg = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|ARM.Build.0 = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|iPhone.ActiveCfg = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|iPhone.Build.0 = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|x64.ActiveCfg = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|x64.Build.0 = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|x86.ActiveCfg = Release|Any CPU
-		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Reference|x86.Build.0 = Release|Any CPU
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -833,6 +663,30 @@ Global
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Release|x64.Build.0 = Release|Any CPU
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Release|x86.ActiveCfg = Release|Any CPU
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32}.Release|x86.Build.0 = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|ARM.Build.0 = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|x64.Build.0 = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Debug|x86.Build.0 = Debug|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|ARM.ActiveCfg = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|ARM.Build.0 = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|iPhone.Build.0 = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|x64.ActiveCfg = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|x64.Build.0 = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|x86.ActiveCfg = Release|Any CPU
+		{44E1971C-3399-4C88-AFE5-54EB53737D31}.Release|x86.Build.0 = Release|Any CPU
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Debug|ARM.Build.0 = Debug|ARM
@@ -842,15 +696,6 @@ Global
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Debug|x64.Build.0 = Debug|x64
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Debug|x86.ActiveCfg = Debug|Win32
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Debug|x86.Build.0 = Debug|Win32
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|Any CPU.ActiveCfg = Reference|Win32
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|ARM.ActiveCfg = Reference|ARM
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|ARM.Build.0 = Reference|ARM
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|iPhone.ActiveCfg = Reference|Win32
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|iPhoneSimulator.ActiveCfg = Reference|Win32
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|x64.ActiveCfg = Reference|x64
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|x64.Build.0 = Reference|x64
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|x86.ActiveCfg = Reference|Win32
-		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Reference|x86.Build.0 = Reference|Win32
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Release|Any CPU.Build.0 = Release|Win32
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D}.Release|ARM.ActiveCfg = Release|ARM
@@ -873,18 +718,6 @@ Global
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Debug|x86.Build.0 = Debug|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|Any CPU.ActiveCfg = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|Any CPU.Build.0 = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|ARM.ActiveCfg = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|ARM.Build.0 = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|iPhone.ActiveCfg = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|iPhone.Build.0 = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|x64.ActiveCfg = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|x64.Build.0 = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|x86.ActiveCfg = Release|Any CPU
-		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Reference|x86.Build.0 = Release|Any CPU
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -897,6 +730,198 @@ Global
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Release|x64.Build.0 = Release|Any CPU
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Release|x86.ActiveCfg = Release|Any CPU
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9}.Release|x86.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|ARM.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x64.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Debug|x86.Build.0 = Debug|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|ARM.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhone.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x64.Build.0 = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.ActiveCfg = Release|Any CPU
+		{254D5434-9087-4F05-A43F-23A790E42024}.Release|x86.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|ARM.Build.0 = Debug|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x64.ActiveCfg = Debug|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x64.Build.0 = Debug|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x86.ActiveCfg = Debug|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Debug|x86.Build.0 = Debug|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|ARM.ActiveCfg = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|ARM.Build.0 = Release|ARM
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhone.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x64.ActiveCfg = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x64.Build.0 = Release|x64
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x86.ActiveCfg = Release|x86
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55}.Release|x86.Build.0 = Release|x86
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|ARM.Build.0 = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|iPhone.Build.0 = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|x64.Build.0 = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A}.Release|x86.Build.0 = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|x64.Build.0 = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Debug|x86.Build.0 = Debug|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|ARM.Build.0 = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|iPhone.Build.0 = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|x64.ActiveCfg = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|x64.Build.0 = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|x86.ActiveCfg = Release|Any CPU
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F}.Release|x86.Build.0 = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|ARM.Build.0 = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|x64.Build.0 = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Debug|x86.Build.0 = Debug|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|Any CPU.Build.0 = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|ARM.ActiveCfg = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|ARM.Build.0 = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|iPhone.Build.0 = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|x64.ActiveCfg = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|x64.Build.0 = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|x86.ActiveCfg = Release|Any CPU
+		{951ABE8D-7AF6-4162-8639-E78B022B1048}.Release|x86.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|ARM.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhone.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x64.Build.0 = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}.Release|x86.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x64.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Debug|x86.Build.0 = Debug|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|ARM.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhone.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x64.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x64.Build.0 = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}.Release|x86.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|ARM.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x64.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Debug|x86.Build.0 = Debug|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|ARM.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhone.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x64.Build.0 = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -936,9 +961,26 @@ Global
 		{8072449C-C6A8-4B36-87DC-173F295D161C} = {CE57D13B-E5A1-4747-9641-AB47F5B95DFC}
 		{39DFE901-EBE0-4907-871C-D2638FEA2D49} = {BC900C35-E0AD-46D2-BA4A-EF1904820B4A}
 		{8A885E5E-A160-4AD2-BD03-59E3A6366C32} = {BC900C35-E0AD-46D2-BA4A-EF1904820B4A}
+		{87A5B88A-B001-4D2F-BFD5-6E7129D91973} = {AA6821F3-930A-49E4-BA3F-D68255F39F1E}
+		{44E1971C-3399-4C88-AFE5-54EB53737D31} = {87A5B88A-B001-4D2F-BFD5-6E7129D91973}
 		{B977BF28-3A1C-4A89-A673-A22EDDC9D23D} = {A60D537E-41F7-44D6-95C8-5DDB77B07308}
 		{8EE6B5DA-6547-43C8-AEB6-8E0EAE3F81C9} = {CE57D13B-E5A1-4747-9641-AB47F5B95DFC}
 		{A5D2FD20-13EE-4CA4-8278-09520CC376CD} = {CE57D13B-E5A1-4747-9641-AB47F5B95DFC}
+		{2C6C128A-4416-41F7-AA9A-48AD4679701D} = {52B933EB-4C7D-4646-B12B-DF6BBAD7921A}
+		{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3} = {2C6C128A-4416-41F7-AA9A-48AD4679701D}
+		{254D5434-9087-4F05-A43F-23A790E42024} = {2C6C128A-4416-41F7-AA9A-48AD4679701D}
+		{BCD888D1-A62F-458C-A72B-9DF731EE1A55} = {2C6C128A-4416-41F7-AA9A-48AD4679701D}
+		{7EEA1E57-8244-42A4-AA3E-CFB995E86467} = {2C6C128A-4416-41F7-AA9A-48AD4679701D}
+		{9C1FB3A1-383A-49F4-8DB1-07B495B3136A} = {9E5968DD-EA77-45A7-B6B8-3290CE70ED7A}
+		{9E5968DD-EA77-45A7-B6B8-3290CE70ED7A} = {AA6821F3-930A-49E4-BA3F-D68255F39F1E}
+		{2CE90D96-B5DD-417D-BC25-B5EB20D993B9} = {AA6821F3-930A-49E4-BA3F-D68255F39F1E}
+		{A0A24A9A-89CB-48EF-8865-705AB81E53F5} = {AA6821F3-930A-49E4-BA3F-D68255F39F1E}
+		{AA7C64B6-2E77-4DA5-95ED-AA367D004A8F} = {A0A24A9A-89CB-48EF-8865-705AB81E53F5}
+		{951ABE8D-7AF6-4162-8639-E78B022B1048} = {2CE90D96-B5DD-417D-BC25-B5EB20D993B9}
+		{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590} = {A0839AAC-BC4D-4DDE-9ACB-C094BC599C16}
+		{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67} = {95CACF52-25AA-4C05-B587-2BBF4B5514D1}
+		{DC55C086-714D-4E2F-B6CE-3C14BC3B6646} = {A60D537E-41F7-44D6-95C8-5DDB77B07308}
+		{3F190EDF-F524-4B8D-9031-CD7B045EB6A5} = {A60D537E-41F7-44D6-95C8-5DDB77B07308}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {328868E2-F749-412D-B82F-84A683A1719C}
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Android.Bindings/Properties/AssemblyInfo.cs
index 14b67a3fe..dfe91c601 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Android.Bindings/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Android/Properties/AssemblyInfo.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Android/Properties/AssemblyInfo.cs
index de9adc00f..4a9735fc8 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Android/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Android/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Shared/WrapperSdk.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Shared/WrapperSdk.cs
index 3efa105b0..f89032527 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Shared/WrapperSdk.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Shared/WrapperSdk.cs
@@ -5,6 +5,6 @@ namespace Microsoft.Azure.Mobile
         public const string Name = "mobilecenter.xamarin";
 
         /* We can't use reflection for assemblyInformationalVersion on iOS with "Link All" optimization. */
-        internal const string Version = "0.16.1-SNAPSHOT";
+        internal const string Version = "0.17.0-SNAPSHOT";
     }
 }
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.UWP/Properties/AssemblyInfo.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.UWP/Properties/AssemblyInfo.cs
index e4392c6a6..90b712842 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.UWP/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // 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("Microsoft.Azure.Mobile")]
+[assembly: AssemblyTitle("Microsoft.Azure.Mobile.UWP")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft Corporation")]
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 [assembly: ComVisible(false)]
 [assembly: InternalsVisibleTo("Microsoft.Azure.Mobile.Test.UWP")]
\ No newline at end of file
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/HttpNetworkAdapter.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/HttpNetworkAdapter.cs
index 9fa869016..7019d861b 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/HttpNetworkAdapter.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/HttpNetworkAdapter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Text;
@@ -19,7 +20,7 @@ namespace Microsoft.Azure.Mobile.Ingestion.Http
         //      0x80072EE7: WININET_E_NAME_NOT_RESOLVED
         //      0x80072EFD: WININET_E_CANNOT_CONNECT
         private static readonly uint[] NetworkUnavailableCodes = { 0x80072EE7, 0x80072EFD };
-        
+
         private HttpClient HttpClient
         {
             get
@@ -38,9 +39,9 @@ namespace Microsoft.Azure.Mobile.Ingestion.Http
         }
 
         /// <exception cref="IngestionException"/>
-        public async Task<string> SendAsync(string uri, IDictionary<string, string> headers, string jsonContent, CancellationToken cancellationToken)
+        public async Task<string> SendAsync(string uri, HttpMethod method, IDictionary<string, string> headers, string jsonContent, CancellationToken cancellationToken)
         {
-            using (var request = CreateRequest(uri, headers, jsonContent))
+            using (var request = CreateRequest(uri, method, headers, jsonContent))
             using (var response = await SendRequestAsync(request, cancellationToken).ConfigureAwait(false))
             {
                 if (response == null)
@@ -48,11 +49,25 @@ namespace Microsoft.Azure.Mobile.Ingestion.Http
                     throw new IngestionException("Null response received");
                 }
                 var responseContent = "(null)";
+                string contentType = null;
                 if (response.Content != null)
                 {
                     responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    if (response.Content.Headers.TryGetValues("Content-Type", out var contentTypeHeaders))
+                    {
+                        contentType = contentTypeHeaders.FirstOrDefault();
+                    }
                 }
-                MobileCenterLog.Verbose(MobileCenterLog.LogTag, $"HTTP response status={(int)response.StatusCode} ({response.StatusCode}) payload={responseContent}");
+                string logPayload;
+                if (contentType == null || contentType.StartsWith("text/") || contentType.StartsWith("application/"))
+                {
+                    logPayload = responseContent;
+                }
+                else
+                {
+                    logPayload = "<binary>";
+                }
+                MobileCenterLog.Verbose(MobileCenterLog.LogTag, $"HTTP response status={(int)response.StatusCode} ({response.StatusCode}) payload={logPayload}");
                 if (response.StatusCode != HttpStatusCode.OK)
                 {
                     throw new HttpIngestionException($"Operation returned an invalid status code '{response.StatusCode}'")
@@ -68,12 +83,12 @@ namespace Microsoft.Azure.Mobile.Ingestion.Http
             }
         }
 
-        internal HttpRequestMessage CreateRequest(string uri, IDictionary<string, string> headers, string jsonContent)
+        internal HttpRequestMessage CreateRequest(string uri, HttpMethod method, IDictionary<string, string> headers, string jsonContent)
         {
             // Create HTTP transport objects.
             var request = new HttpRequestMessage
             {
-                Method = HttpMethod.Post,
+                Method = method,
                 RequestUri = new Uri(uri),
             };
 
@@ -110,7 +125,7 @@ namespace Microsoft.Azure.Mobile.Ingestion.Http
             {
                 // If the HResult indicates a network outage, throw a NetworkIngestionException so
                 // it can be dealt with properly
-                if (Array.Exists(NetworkUnavailableCodes, code => code == (uint) e.HResult))
+                if (Array.Exists(NetworkUnavailableCodes, code => code == (uint)e.HResult))
                 {
                     throw new NetworkIngestionException();
                 }
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IHttpNetworkAdapter.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IHttpNetworkAdapter.cs
index 8abbd1f7c..8d9536607 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IHttpNetworkAdapter.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IHttpNetworkAdapter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -7,6 +8,6 @@ namespace Microsoft.Azure.Mobile.Ingestion.Http
 {
     public interface IHttpNetworkAdapter : IDisposable
     {
-        Task<string> SendAsync(string uri, IDictionary<string, string> headers, string jsonContent, CancellationToken cancellationToken);
+        Task<string> SendAsync(string uri, HttpMethod method, IDictionary<string, string> headers, string jsonContent, CancellationToken cancellationToken);
     }
 }
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IngestionHttp.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IngestionHttp.cs
index b52089c7b..9fc18f5dc 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IngestionHttp.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Ingestion/Http/IngestionHttp.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Azure.Mobile.Ingestion.Models;
 using Microsoft.Azure.Mobile.Ingestion.Models.Serialization;
+using System.Net.Http;
 
 namespace Microsoft.Azure.Mobile.Ingestion.Http
 {
@@ -44,7 +45,7 @@ namespace Microsoft.Azure.Mobile.Ingestion.Http
             MobileCenterLog.Verbose(MobileCenterLog.LogTag, requestContent);
             
             // Send request.
-            await _httpNetwork.SendAsync(baseUrl + ApiVersion, requestHeaders, requestContent, call.CancellationToken).ConfigureAwait(false);
+            await _httpNetwork.SendAsync(baseUrl + ApiVersion, HttpMethod.Post, requestHeaders, requestContent, call.CancellationToken).ConfigureAwait(false);
         }
 
         public void Close()
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/MobileCenter.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/MobileCenter.cs
index 0bd409406..c496a45e0 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/MobileCenter.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/MobileCenter.cs
@@ -354,9 +354,9 @@ namespace Microsoft.Azure.Mobile
                         startServiceLog.Services.Add(serviceInstance.ServiceName);
                     }
                 }
-                catch (MobileCenterException)
+                catch (MobileCenterException e)
                 {
-                    MobileCenterLog.Warn(MobileCenterLog.LogTag, $"Failed to start service '{serviceType.Name}'; skipping it.");
+                    MobileCenterLog.Error(MobileCenterLog.LogTag, $"Failed to start service '{serviceType.Name}'; skipping it.", e);
                 }
             }
 
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Utils/AbstractDeviceInformationHelper.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Utils/AbstractDeviceInformationHelper.cs
index 100cacf86..bf2ac9b93 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Utils/AbstractDeviceInformationHelper.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.Windows.Shared/Utils/AbstractDeviceInformationHelper.cs
@@ -77,10 +77,11 @@ namespace Microsoft.Azure.Mobile.Utils
            return GetType().GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
         }
 
-    private string GetLocale()
+        private string GetLocale()
         {
             return System.Globalization.CultureInfo.CurrentCulture.Name;
         }
+
         private int GetTimeZoneOffset()
         {
             return (int)TimeZoneInfo.Local.BaseUtcOffset.TotalMinutes;
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Ingestion/Http/NetworkStateAdapter.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Ingestion/Http/NetworkStateAdapter.cs
new file mode 100644
index 000000000..935eec198
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Ingestion/Http/NetworkStateAdapter.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Net.NetworkInformation;
+
+namespace Microsoft.Azure.Mobile.Ingestion.Http
+{
+    public class NetworkStateAdapter : INetworkStateAdapter
+    {
+        public NetworkStateAdapter()
+        {
+            NetworkChange.NetworkAddressChanged += (sender, args) => NetworkStatusChanged?.Invoke(sender, args);
+        }
+        public bool IsConnected => NetworkInterface.GetIsNetworkAvailable();
+        public event EventHandler NetworkStatusChanged;
+    }
+}
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Microsoft.Azure.Mobile.WindowsDesktop.csproj b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Microsoft.Azure.Mobile.WindowsDesktop.csproj
new file mode 100644
index 000000000..4efe7dc53
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Microsoft.Azure.Mobile.WindowsDesktop.csproj
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 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>{1E9EC0AA-3E32-4551-80C4-E4F3E53D7590}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Azure.Mobile</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\sqlite-net-pcl.1.3.1\lib\netstandard1.1\SQLite-net.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_green, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SQLitePCLRaw.bundle_green.1.1.2\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Ingestion\Http\NetworkStateAdapter.cs" />
+    <Compile Include="MobileCenterPart.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Utils\ApplicationLifecycleHelper.cs" />
+    <Compile Include="Utils\DefaultApplicationSettings.cs" />
+    <Compile Include="Utils\DeviceInformationHelper.cs" />
+    <Compile Include="Utils\WpfHelper.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="..\Microsoft.Azure.Mobile.Shared\Microsoft.Azure.Mobile.Shared.projitems" Label="Shared" />
+  <Import Project="..\Microsoft.Azure.Mobile.Windows.Shared\Microsoft.Azure.Mobile.Windows.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
+  </Target>
+  <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
+  <Import Project="..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.2\build\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/MobileCenterPart.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/MobileCenterPart.cs
new file mode 100644
index 000000000..bf4921077
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/MobileCenterPart.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Azure.Mobile
+{
+    public partial class MobileCenter
+    {
+        private const string PlatformIdentifier = "windowsdesktop";
+    }
+}
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Properties/AssemblyInfo.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..71abe3c86
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("Microsoft.Azure.Mobile")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyProduct("Microsoft.Azure.Mobile")]
+[assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
+[assembly: InternalsVisibleTo("Microsoft.Azure.Mobile.Test.WindowsDesktop")]
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/ApplicationLifecycleHelper.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/ApplicationLifecycleHelper.cs
new file mode 100644
index 000000000..e47ed32b8
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/ApplicationLifecycleHelper.cs
@@ -0,0 +1,198 @@
+using System;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using System.Reflection;
+
+namespace Microsoft.Azure.Mobile.Utils
+{
+    public class ApplicationLifecycleHelper : IApplicationLifecycleHelper
+    {
+        // Singleton instance of ApplicationLifecycleHelper
+        private static ApplicationLifecycleHelper _instance;
+        public static ApplicationLifecycleHelper Instance
+        {
+            get { return _instance ?? (_instance = new ApplicationLifecycleHelper()); }
+
+            // Setter for testing
+            internal set { _instance = value; }
+        }
+
+        #region WinEventHook
+
+        private delegate void WinEventDelegate(IntPtr winEventHookHandle, uint eventType, IntPtr windowHandle, int objectId, int childId, uint eventThreadId, uint eventTimeInMilliseconds);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetWinEventHook(uint eventMin, uint eventMax, IntPtr eventHookAssemblyHandle, WinEventDelegate eventHookHandle, uint processId, uint threadId, uint dwFlags);
+        [DllImport("user32.dll")]
+        private static extern bool UnhookWinEvent(IntPtr hWinEventHook);
+
+        private const uint EVENT_OBJECT_LOCATIONCHANGE = 0x800B;
+        private const uint WINEVENT_OUTOFCONTEXT = 0;
+
+        // Need to ensure delegate is not collected while we're using it,
+        // storing it in a class field is simplest way to do this.
+        private static WinEventDelegate hookDelegate = new WinEventDelegate(WinEventHook);
+        private static bool suspended = false;
+        private static bool started = false;
+        private static Action Minimize;
+        private static Action Restore;
+        private static Action Start;
+        private static readonly dynamic WpfApplication;
+        private static readonly int WpfMinimizedState;
+        private static void WinEventHook(IntPtr winEventHookHandle, uint eventType, IntPtr windowHandle, int objectId, int childId, uint eventThreadId, uint eventTimeInMilliseconds)
+        {
+            // Filter out non-HWND
+            if (objectId != 0 || childId != 0)
+            {
+                return;
+            }
+
+            var anyNotMinimized = IsAnyWindowNotMinimized();
+
+            if (!started && anyNotMinimized)
+            {
+                started = true;
+                Start?.Invoke();
+            }
+            if (suspended && anyNotMinimized)
+            {
+                suspended = false;
+                Restore?.Invoke();
+            }
+            else if (!suspended && !anyNotMinimized)
+            {
+                suspended = true;
+                Minimize?.Invoke();
+            }
+        }
+
+        static ApplicationLifecycleHelper()
+        {
+            // Retrieve the WPF APIs through reflection, if they are available
+            if (WpfHelper.IsRunningOnWpf)
+            {
+                // Store the WPF Application singleton
+                // This is equivalent to `WpfApplication = System.Windows.Application.Current;`
+                var appType = WpfHelper.PresentationFramework.GetType("System.Windows.Application");
+                WpfApplication = appType.GetRuntimeProperty("Current")?.GetValue(appType);
+
+                // Store the int corresponding to the "Minimized" state for WPF Windows
+                // This is equivalent to `WpfMinimizedState = (int)System.Windows.WindowState.Minimized;`
+                WpfMinimizedState = (int)WpfHelper.PresentationFramework.GetType("System.Windows.WindowState")
+                    .GetField("Minimized")
+                    .GetRawConstantValue();
+            }
+
+            
+#pragma warning disable CS0618 // Type or member is obsolete
+            // We need Windows thread ID, not managed
+            var threadId = AppDomain.GetCurrentThreadId();
+#pragma warning restore CS0618 // Type or member is obsolete
+            var hook = SetWinEventHook(EVENT_OBJECT_LOCATIONCHANGE, EVENT_OBJECT_LOCATIONCHANGE, IntPtr.Zero, hookDelegate, 0, (uint)threadId, WINEVENT_OUTOFCONTEXT);
+            Application.ApplicationExit += delegate { UnhookWinEvent(hook); };
+        }
+
+        private static bool IsAnyWindowNotMinimized()
+        {
+            // If not in WPF, query the available forms
+            if (WpfApplication == null)
+            {
+                return Application.OpenForms.Cast<Form>().Any(form => form.WindowState != FormWindowState.Minimized);
+            }
+
+            // If in WPF, query the available windows
+            foreach (var window in WpfApplication.Windows)
+            {
+                // Not minimized is true if WindowState is not "Minimized" and the window is on screen
+                if ((int)window.WindowState != WpfMinimizedState && WindowIntersectsWithAnyScreen(window))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        #endregion
+
+        public ApplicationLifecycleHelper()
+        {
+            Enabled = true;
+            AppDomain.CurrentDomain.UnhandledException += (sender, eventArgs) =>
+            {
+                UnhandledExceptionOccurred?.Invoke(sender, new UnhandledExceptionOccurredEventArgs((Exception)eventArgs.ExceptionObject));
+            };
+        }
+
+        private void InvokeResuming()
+        {
+            ApplicationResuming?.Invoke(null, EventArgs.Empty);
+        }
+
+        private void InvokeStarted()
+        {
+            ApplicationStarted?.Invoke(null, EventArgs.Empty);
+        }
+
+        private void InvokeSuspended()
+        {
+            ApplicationSuspended?.Invoke(null, EventArgs.Empty);
+        }
+
+        private bool enabled;
+        public bool Enabled
+        {
+            get
+            {
+                return enabled;
+            }
+            set
+            {
+                if (value == enabled)
+                {
+                    return;
+                }
+                if (value)
+                {
+                    Start = InvokeStarted;
+                    Restore = InvokeResuming;
+                    Minimize = InvokeSuspended;
+                }
+                else
+                {
+                    Start = null;
+                    Restore = null;
+                    Minimize = null;
+                }
+                enabled = value;
+            }
+        }
+
+        private static Rectangle WindowsRectToRectangle(dynamic windowsRect)
+        {
+            return new Rectangle
+            {
+                X = (int)windowsRect.X,
+                Y = (int)windowsRect.Y,
+                Width = (int)windowsRect.Width,
+                Height = (int)windowsRect.Height
+            };
+        }
+
+        private static bool WindowIntersectsWithAnyScreen(dynamic window)
+        {
+            var windowBounds = WindowsRectToRectangle(window.RestoreBounds);
+            return Screen.AllScreens.Any(screen => screen.Bounds.IntersectsWith(windowBounds));
+        }
+
+        public bool HasShownWindow => started;
+
+        public bool IsSuspended => suspended;
+
+        public event EventHandler ApplicationSuspended;
+        public event EventHandler ApplicationResuming;
+        public event EventHandler ApplicationStarted;
+        public event EventHandler<UnhandledExceptionOccurredEventArgs> UnhandledExceptionOccurred;
+    }
+}
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/DefaultApplicationSettings.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/DefaultApplicationSettings.cs
new file mode 100644
index 000000000..07b9e1402
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/DefaultApplicationSettings.cs
@@ -0,0 +1,94 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.Azure.Mobile.Utils
+{
+    public class DefaultApplicationSettings : IApplicationSettings
+    {
+        private readonly object configLock = new object();
+        private IDictionary<string, string> current;
+
+        public DefaultApplicationSettings()
+        {
+            current = ReadAll();
+        }
+        
+        public T GetValue<T>(string key, T defaultValue = default(T))
+        {
+            lock (configLock)
+            {
+                if (current.ContainsKey(key))
+                {
+                    return (T)TypeDescriptor.GetConverter(typeof(T)).ConvertFromInvariantString(current[key]);
+                }
+            }
+            SetValue(key, defaultValue);
+            return defaultValue;
+        }
+
+        public void SetValue(string key, object value)
+        {
+            var invariant = value != null ? TypeDescriptor.GetConverter(value.GetType()).ConvertToInvariantString(value) : null;
+            lock (configLock)
+            {
+                current[key] = invariant;
+                SaveValue(key, invariant);
+            }
+        }
+
+        public bool ContainsKey(string key)
+        {
+            lock (configLock)
+            {
+                return current.ContainsKey(key);
+            }
+        }
+
+        public void Remove(string key)
+        {
+            lock (configLock)
+            {
+                current.Remove(key);
+                var config = OpenConfiguration();
+                config.AppSettings.Settings.Remove(key);
+                config.Save();
+            }
+        }
+
+        private void SaveValue(string key, string value)
+        {
+            lock (configLock)
+            {
+                var config = OpenConfiguration();
+                var element = config.AppSettings.Settings[key];
+                if (element == null)
+                {
+                    config.AppSettings.Settings.Add(key, value);
+                }
+                else
+                {
+                    element.Value = value;
+                }
+                config.Save();
+            }
+        }
+
+        private static IDictionary<string, string> ReadAll()
+        {
+            var config = OpenConfiguration();
+            return config.AppSettings.Settings.Cast<KeyValueConfigurationElement>().ToDictionary(e => e.Key, e => e.Value);
+        }
+
+        private static Configuration OpenConfiguration()
+        {
+            var location = Assembly.GetExecutingAssembly().Location;
+            var path = Path.Combine(Path.GetDirectoryName(location), "MobileCenter.config");
+            var executionFileMap = new ExeConfigurationFileMap { ExeConfigFilename = path };
+            return ConfigurationManager.OpenMappedExeConfiguration(executionFileMap, ConfigurationUserLevel.None);
+        }
+    }
+}
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/DeviceInformationHelper.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/DeviceInformationHelper.cs
new file mode 100644
index 000000000..f3d8f2fde
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/DeviceInformationHelper.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Drawing;
+using System.Management;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace Microsoft.Azure.Mobile.Utils
+{
+    /// <summary>
+    /// Implements the abstract device information helper class
+    /// </summary>
+    public class DeviceInformationHelper : AbstractDeviceInformationHelper
+    {
+        public static event EventHandler InformationInvalidated;
+
+        protected override string GetSdkName()
+        {
+            return WpfHelper.IsRunningOnWpf ? "mobilecenter.wpf" : "mobilecenter.winforms";
+        }
+
+        protected override string GetDeviceModel()
+        {
+            var managementClass = new ManagementClass("Win32_ComputerSystem");
+            foreach (var managementObject in managementClass.GetInstances())
+            {
+                return (string)managementObject["Model"];
+            }
+            return string.Empty;
+        }
+
+        protected override string GetAppNamespace()
+        {
+             return Assembly.GetEntryAssembly()?.EntryPoint.DeclaringType?.Namespace;
+        }
+
+        protected override string GetDeviceOemName()
+        {
+            var managementClass = new ManagementClass("Win32_ComputerSystem");
+            foreach (var managementObject in managementClass.GetInstances())
+            {
+                return (string)managementObject["Manufacturer"];
+            }
+            return string.Empty;
+        }
+
+        protected override string GetOsName()
+        {
+            return "WINDOWS";
+        }
+
+        protected override string GetOsBuild()
+        {
+            using (var hklmKey = Microsoft.Win32.Registry.LocalMachine)
+            using (var subKey = hklmKey.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion"))
+            {
+                object majorVersion = subKey.GetValue("CurrentMajorVersionNumber");
+                object minorVersion = subKey.GetValue("CurrentMinorVersionNumber");
+                object buildNumber = subKey.GetValue("CurrentBuildNumber");
+                object revisionNumber = subKey.GetValue("UBR");
+                return $"{majorVersion}.{minorVersion}.{buildNumber}.{revisionNumber}";
+            }
+        }
+
+        protected override string GetOsVersion()
+        {
+            var managementClass = new ManagementClass("Win32_OperatingSystem");
+            foreach (var managementObject in managementClass.GetInstances())
+            {
+                return (string)managementObject["Version"];
+            }
+            return string.Empty;
+        }
+
+        protected override string GetAppVersion()
+        {
+            return Application.ProductVersion;
+        }
+
+        protected override string GetAppBuild()
+        {
+            return Application.ProductVersion;
+        }
+
+        protected override string GetScreenSize()
+        {          
+            const int DESKTOPVERTRES = 117;
+            const int DESKTOPHORZRES = 118;
+            using (var graphics = Graphics.FromHwnd(IntPtr.Zero))
+            {
+                var desktop = graphics.GetHdc();
+                var height = GetDeviceCaps(desktop, DESKTOPVERTRES);
+                var width = GetDeviceCaps(desktop, DESKTOPHORZRES);
+                return $"{width}x{height}";
+            }
+        }
+
+        /// <summary>
+        /// Import GetDeviceCaps function to retreive scale-independent screen size.
+        /// </summary>
+        [DllImport("gdi32.dll")]
+        private static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+    }
+}
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/WpfHelper.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/WpfHelper.cs
new file mode 100644
index 000000000..7ed52d57a
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/Utils/WpfHelper.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.Azure.Mobile.Utils
+{
+    public static class WpfHelper
+    {
+        static WpfHelper()
+        {
+            try
+            {
+                var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+                PresentationFramework =
+                    assemblies.FirstOrDefault(assembly => assembly.GetName().Name == "PresentationFramework");
+                IsRunningOnWpf = PresentationFramework != null;
+            }
+            catch (AppDomainUnloadedException)
+            {
+                MobileCenterLog.Warn(MobileCenterLog.LogTag, "Unabled to determine whether this application is WPF or Windows Forms; proceeding as though it is Windows Forms.");
+            }
+        }
+
+        public static bool IsRunningOnWpf { get; }
+        public static Assembly PresentationFramework { get; }
+    }
+}
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/packages.config b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/packages.config
new file mode 100644
index 000000000..f9a38191f
--- /dev/null
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/packages.config
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net452" />
+  <package id="NETStandard.Library" version="1.6.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net452" />
+  <package id="sqlite-net-pcl" version="1.3.1" targetFramework="net452" />
+  <package id="SQLitePCLRaw.bundle_green" version="1.1.2" targetFramework="net452" />
+  <package id="SQLitePCLRaw.core" version="1.1.2" targetFramework="net452" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.linux" version="1.1.2" targetFramework="net452" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.osx" version="1.1.2" targetFramework="net452" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3.v110_xp" version="1.1.2" targetFramework="net452" />
+  <package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.2" targetFramework="net452" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net452" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
+  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net452" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net452" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net452" />
+  <package id="System.IO" version="4.1.0" targetFramework="net452" />
+  <package id="System.IO.Compression" version="4.1.0" targetFramework="net452" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net452" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.1.0" targetFramework="net452" />
+  <package id="System.Net.Primitives" version="4.0.11" targetFramework="net452" />
+  <package id="System.ObjectModel" version="4.0.12" targetFramework="net452" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net452" />
+  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net452" />
+  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net452" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="net452" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net452" />
+  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net452" />
+  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net452" />
+  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net452" />
+  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net452" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net452" />
+  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net452" />
+  <package id="System.Threading.Timer" version="4.0.1" targetFramework="net452" />
+  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net452" />
+  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net452" />
+</packages>
\ No newline at end of file
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS.Bindings/Properties/AssemblyInfo.cs
index fd63c20cf..bfd6f2b22 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using Foundation;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/MobileCenter.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/MobileCenter.cs
index baca8c260..320d3382e 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/MobileCenter.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/MobileCenter.cs
@@ -167,7 +167,7 @@ namespace Microsoft.Azure.Mobile
 
         static Type GetBindingType(Type type)
         {
-            return (Type)type.GetProperty("BindingType").GetValue(null, null);
+            return (Type)type.GetProperty("BindingType")?.GetValue(null, null);
         }
 
         static void SetWrapperSdk()
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/Properties/AssemblyInfo.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/Properties/AssemblyInfo.cs
index 442b97d18..13ee04afc 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@ using System.Reflection;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenter/Microsoft.Azure.Mobile/Properties/AssemblyInfo.cs b/SDK/MobileCenter/Microsoft.Azure.Mobile/Properties/AssemblyInfo.cs
index f85a1ca42..927257c17 100644
--- a/SDK/MobileCenter/Microsoft.Azure.Mobile/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenter/Microsoft.Azure.Mobile/Properties/AssemblyInfo.cs
@@ -12,7 +12,6 @@ using System.Resources;
 [assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -25,5 +24,5 @@ using System.Resources;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android.Bindings/Properties/AssemblyInfo.cs
index 9803d5145..341102245 100644
--- a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android.Bindings/Properties/AssemblyInfo.cs
@@ -18,8 +18,8 @@ using System.Runtime.InteropServices;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android/Properties/AssemblyInfo.cs b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android/Properties/AssemblyInfo.cs
index beaacb4cc..a590147cb 100644
--- a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.UWP/Properties/AssemblyInfo.cs b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.UWP/Properties/AssemblyInfo.cs
index 9344b333a..913eb83f7 100644
--- a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.UWP/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
 [assembly: ComVisible(false)]
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj
new file mode 100644
index 000000000..863c2e816
--- /dev/null
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/Microsoft.Azure.Mobile.Analytics.WindowsDesktop.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 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>{1F6C139A-29BB-4E74-8DF2-F8CCAB399A67}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Azure.Mobile.Analytics</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile.Analytics</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj">
+      <Project>{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}</Project>
+      <Name>Microsoft.Azure.Mobile.WindowsDesktop</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\Microsoft.Azure.Mobile.Analytics.Windows.Shared\Microsoft.Azure.Mobile.Analytics.Windows.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/Properties/AssemblyInfo.cs b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..93611da89
--- /dev/null
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+
+// 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("Microsoft.Azure.Mobile.Analytics")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyProduct("Microsoft.Azure.Mobile.Analytics")]
+[assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/packages.config b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/packages.config
new file mode 100644
index 000000000..aa8e3da7c
--- /dev/null
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="6.0.1" targetFramework="net452" />
+</packages>
\ No newline at end of file
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs
index 311e2cd5f..0bb60cfc7 100644
--- a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using Foundation;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS/Properties/AssemblyInfo.cs b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS/Properties/AssemblyInfo.cs
index d01ea6d53..c0780b72e 100644
--- a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@ using System.Reflection;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics/Properties/AssemblyInfo.cs b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics/Properties/AssemblyInfo.cs
index e5b61e5ab..2aea3abbf 100644
--- a/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Resources;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android.Bindings/Properties/AssemblyInfo.cs
index 9e953a994..50b45ad99 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android.Bindings/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@ using System.Reflection;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/PlatformCrashes.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/PlatformCrashes.cs
index 2d452c13c..cc9093d55 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/PlatformCrashes.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/PlatformCrashes.cs
@@ -4,14 +4,12 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Android.Runtime;
+using Com.Microsoft.Azure.Mobile.Crashes;
 using Com.Microsoft.Azure.Mobile.Crashes.Model;
 using Java.Lang;
 
 namespace Microsoft.Azure.Mobile.Crashes
 {
-    using AndroidCrashes = Com.Microsoft.Azure.Mobile.Crashes.AndroidCrashes;
-    using AndroidExceptionDataManager = Com.Microsoft.Azure.Mobile.Crashes.WrapperSdkExceptionManager;
-    using AndroidICrashListener = Com.Microsoft.Azure.Mobile.Crashes.ICrashesListener;
     using ModelException = Com.Microsoft.Azure.Mobile.Crashes.Ingestion.Models.Exception;
     using ModelStackFrame = Com.Microsoft.Azure.Mobile.Crashes.Ingestion.Models.StackFrame;
     using Exception = System.Exception;
@@ -80,12 +78,12 @@ namespace Microsoft.Azure.Mobile.Crashes
             });
         }
 
-        //public override void TrackException(Exception exception)
-        //{
-        //    AndroidCrashes.Instance.TrackException(GenerateModelException(exception));
-        //}
+        public override void TrackException(Exception exception)
+        {
+            WrapperSdkExceptionManager.TrackException(GenerateModelException(exception, false));
+        }
 
-        private AndroidICrashListener _crashListener;
+        private ICrashesListener _crashListener;
 
         /// <summary>
         /// Empty model stack frame used for comparison to optimize JSON payload.
@@ -110,27 +108,23 @@ namespace Microsoft.Azure.Mobile.Crashes
             MobileCenterLog.Error(Crashes.LogTag, "Unhandled Exception:", exception);
             if (!(exception is Java.Lang.Exception))
             {
-                var modelException = GenerateModelException(exception);
+                var modelException = GenerateModelException(exception, true);
                 byte[] rawException = CrashesUtils.SerializeException(exception);
-                AndroidExceptionDataManager.SaveWrapperException(Thread.CurrentThread(), modelException, rawException);
+                WrapperSdkExceptionManager.SaveWrapperException(Thread.CurrentThread(), modelException, rawException);
             }
         }
 
 #pragma warning disable XS0001 // Find usages of mono todo items
 
-        /// <summary>
-        /// Generate structured data for a dotnet exception.
-        /// </summary>
-        /// <param name="exception">Exception.</param>
-        /// <returns>Structured data for the exception.</returns>
-        private static ModelException GenerateModelException(Exception exception)
+        // Generate structured data for a dotnet exception.
+        private static ModelException GenerateModelException(Exception exception, bool structuredFrames)
         {
             var modelException = new ModelException
             {
                 Type = exception.GetType().FullName,
                 Message = exception.Message,
                 StackTrace = exception.StackTrace,
-                Frames = GenerateModelStackFrames(new StackTrace(exception, true)),
+                Frames = structuredFrames ? GenerateModelStackFrames(new StackTrace(exception, true)) : null,
                 WrapperSdkName = WrapperSdk.Name
             };
             var aggregateException = exception as AggregateException;
@@ -139,12 +133,15 @@ namespace Microsoft.Azure.Mobile.Crashes
                 modelException.InnerExceptions = new List<ModelException>();
                 foreach (var innerException in aggregateException.InnerExceptions)
                 {
-                    modelException.InnerExceptions.Add(GenerateModelException(innerException));
+                    modelException.InnerExceptions.Add(GenerateModelException(innerException, structuredFrames));
                 }
             }
             else if (exception.InnerException != null)
             {
-                modelException.InnerExceptions = new List<ModelException> { GenerateModelException(exception.InnerException) };
+                modelException.InnerExceptions = new List<ModelException>
+                {
+                    GenerateModelException(exception.InnerException, structuredFrames)
+                };
             }
             return modelException;
         }
@@ -160,7 +157,7 @@ namespace Microsoft.Azure.Mobile.Crashes
                     ClassName = frame.GetMethod()?.DeclaringType?.FullName,
                     MethodName = frame.GetMethod()?.Name,
                     FileName = frame.GetFileName(),
-                    LineNumber = frame.GetFileLineNumber() != 0 ? new Java.Lang.Integer(frame.GetFileLineNumber()) : null
+                    LineNumber = frame.GetFileLineNumber() != 0 ? new Integer(frame.GetFileLineNumber()) : null
                 }).Where(modelFrame => !modelFrame.Equals(EmptyModelFrame)));
             }
             return modelFrames;
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/Properties/AssemblyInfo.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/Properties/AssemblyInfo.cs
index 73a3b0f74..352746628 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Android/Properties/AssemblyInfo.cs
@@ -26,5 +26,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/Crashes.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/Crashes.cs
index e18c5ee4d..1be269ff0 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/Crashes.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/Crashes.cs
@@ -49,7 +49,7 @@ namespace Microsoft.Azure.Mobile.Crashes
         // The APIs will still be visible if this is added as a project reference, but otherwise,
         // (so if it's added via nuget), they will be hidden. Unless the VS instance has resharper,
         // which is why we also use the Obsolete attribute.
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -59,7 +59,7 @@ namespace Microsoft.Azure.Mobile.Crashes
 #endif
         public static event SendingErrorReportEventHandler SendingErrorReport;
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -69,7 +69,7 @@ namespace Microsoft.Azure.Mobile.Crashes
 #endif
         public static event SentErrorReportEventHandler SentErrorReport;
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -79,7 +79,7 @@ namespace Microsoft.Azure.Mobile.Crashes
 #endif
         public static event FailedToSendErrorReportEventHandler FailedToSendErrorReport;
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -96,7 +96,7 @@ namespace Microsoft.Azure.Mobile.Crashes
             }
         }
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -127,7 +127,7 @@ namespace Microsoft.Azure.Mobile.Crashes
 
         private static readonly IPlatformCrashes PlatformCrashes = new PlatformCrashes();
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -141,7 +141,7 @@ namespace Microsoft.Azure.Mobile.Crashes
             PlatformCrashes.NotifyUserConfirmation(confirmation);
         }
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -195,7 +195,7 @@ namespace Microsoft.Azure.Mobile.Crashes
 #endif
         public static Task<bool> HasCrashedInLastSessionAsync() => PlatformCrashes.HasCrashedInLastSessionAsync();
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -209,7 +209,7 @@ namespace Microsoft.Azure.Mobile.Crashes
             return PlatformCrashes.GetLastSessionCrashReportAsync();
         }
 
-#if WINDOWS_UWP
+#if USES_WATSON
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("This does not exist in UWP and should not be used.")]
 #else
@@ -227,13 +227,12 @@ namespace Microsoft.Azure.Mobile.Crashes
         }
 
         ///// <summary>
-        ///// Track an exception.
+        ///// Track an exception. TODO make it public once backend supports it.
         ///// </summary>
         ///// <param name="exception">An exception.</param>
-        //public static void TrackException(Exception exception)
-        //{
-        //    PlatformCrashes.TrackException(exception);
-        //}
+        internal static void TrackException(Exception exception)
+        {
+            PlatformCrashes.TrackException(exception);
+        }
     }
 }
-
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/IPlatformCrashes.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/IPlatformCrashes.cs
index 2f297d9b6..9dcebb4da 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/IPlatformCrashes.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/IPlatformCrashes.cs
@@ -29,6 +29,6 @@ namespace Microsoft.Azure.Mobile.Crashes
         ShouldProcessErrorReportCallback ShouldProcessErrorReport { get; set; }
         ShouldAwaitUserConfirmationCallback ShouldAwaitUserConfirmation { get; set; }
         GetErrorAttachmentsCallback GetErrorAttachments { get; set; }
-        //void TrackException(Exception exception);
+        void TrackException(Exception exception);
     }
 }
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/PlatformCrashesBase.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/PlatformCrashesBase.cs
index 77260dbf1..280f08d39 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/PlatformCrashesBase.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Shared/PlatformCrashesBase.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Mobile.Crashes
 
         public void GenerateTestCrash()
         {
-#if WINDOWS_UWP
+#if USES_WATSON
 #else
             throw new TestCrashException();
 #endif
@@ -35,6 +35,6 @@ namespace Microsoft.Azure.Mobile.Crashes
         public abstract ShouldProcessErrorReportCallback ShouldProcessErrorReport { get; set; }
         public abstract ShouldAwaitUserConfirmationCallback ShouldAwaitUserConfirmation { get; set; }
         public abstract GetErrorAttachmentsCallback GetErrorAttachments { get; set; }
-        //public abstract void TrackException(Exception exception);
+        public abstract void TrackException(Exception exception);
     }
 }
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Microsoft.Azure.Mobile.Crashes.UWP.csproj b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Microsoft.Azure.Mobile.Crashes.UWP.csproj
index d61b368c7..2b45c8650 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Microsoft.Azure.Mobile.Crashes.UWP.csproj
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Microsoft.Azure.Mobile.Crashes.UWP.csproj
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -40,7 +40,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -62,7 +62,7 @@
     <PlatformTarget>ARM</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -72,7 +72,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <PlatformTarget>ARM</PlatformTarget>
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -84,7 +84,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -94,7 +94,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -107,9 +107,6 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Crashes.cs" />
-    <Compile Include="ErrorAttachmentLog.cs" />
-    <Compile Include="PlatformCrashes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Properties\Microsoft.Azure.Mobile.Crashes.UWP.rd.xml" />
   </ItemGroup>
@@ -125,12 +122,13 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems" Label="Shared" />
+  <Import Project="..\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Reference|AnyCPU'">
     <OutputPath>bin\Reference\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;REFERENCE</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP;REFERENCE</DefineConstants>
     <Optimize>true</Optimize>
     <NoStdLib>true</NoStdLib>
     <DebugType>pdbonly</DebugType>
@@ -141,7 +139,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Reference|x86'">
     <OutputPath>bin\x86\Reference\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <NoStdLib>true</NoStdLib>
@@ -153,7 +151,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Reference|ARM'">
     <OutputPath>bin\ARM\Reference\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <NoStdLib>true</NoStdLib>
@@ -165,7 +163,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Reference|x64'">
     <OutputPath>bin\x64\Reference\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;USES_WATSON;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <NoStdLib>true</NoStdLib>
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Properties/AssemblyInfo.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Properties/AssemblyInfo.cs
index 137869cb7..846d955d9 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Crashes.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Crashes.cs
similarity index 90%
rename from SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Crashes.cs
rename to SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Crashes.cs
index 39a36d7a6..b66279059 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/Crashes.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Crashes.cs
@@ -11,6 +11,9 @@ namespace Microsoft.Azure.Mobile.Crashes
     {
         public string ServiceName => "Crashes";
 
+        /// <summary>
+        /// This property does not return a meaningful value on Windows.
+        /// </summary>
         public bool InstanceEnabled { get; set; }
 
         private static Crashes _instanceField;
@@ -21,15 +24,11 @@ namespace Microsoft.Azure.Mobile.Crashes
             {
                 return _instanceField ?? (_instanceField = new Crashes());
             }
-            set
-            {
-                _instanceField = value; //for testing
-            }
         }
 
         public void OnChannelGroupReady(IChannelGroup channelGroup, string appSecret)
         {
-            MobileCenterLog.Warn(MobileCenterLog.LogTag, "Crashes service is not yet supported on UWP.");
+            MobileCenterLog.Warn(MobileCenterLog.LogTag, "Crashes service is not yet supported on this platform.");
             try
             {
 #if REFERENCE
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/ErrorAttachmentLog.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/ErrorAttachmentLog.cs
similarity index 100%
rename from SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/ErrorAttachmentLog.cs
rename to SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/ErrorAttachmentLog.cs
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems
new file mode 100644
index 000000000..36a098291
--- /dev/null
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>3f190edf-f524-4b8d-9031-cd7b045eb6a5</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.Azure.Mobile.Crashes.Windows.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Crashes.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ErrorAttachmentLog.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PlatformCrashes.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Microsoft.Azure.Mobile.Crashes.Windows.Shared.shproj b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Microsoft.Azure.Mobile.Crashes.Windows.Shared.shproj
new file mode 100644
index 000000000..2a2da8d9b
--- /dev/null
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/Microsoft.Azure.Mobile.Crashes.Windows.Shared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>3f190edf-f524-4b8d-9031-cd7b045eb6a5</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/PlatformCrashes.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/PlatformCrashes.cs
similarity index 92%
rename from SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/PlatformCrashes.cs
rename to SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/PlatformCrashes.cs
index e6944814a..67234278e 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/PlatformCrashes.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.Windows.Shared/PlatformCrashes.cs
@@ -5,8 +5,6 @@ namespace Microsoft.Azure.Mobile.Crashes
 {
     internal class PlatformCrashes : PlatformCrashesBase
     {
-        // Note: in PlatformCrashes we use only callbacks; not events (in Crashes, there are corresponding events)
-
         public override SendingErrorReportEventHandler SendingErrorReport { get; set; }
 
         public override SentErrorReportEventHandler SentErrorReport { get; set; }
@@ -45,5 +43,8 @@ namespace Microsoft.Azure.Mobile.Crashes
         {
         }
 
+        public override void TrackException(Exception exception)
+        {
+        }
     }
 }
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/Microsoft.Azure.Mobile.Crashes.WindowsDesktop.csproj b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/Microsoft.Azure.Mobile.Crashes.WindowsDesktop.csproj
new file mode 100644
index 000000000..8b81c673d
--- /dev/null
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/Microsoft.Azure.Mobile.Crashes.WindowsDesktop.csproj
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" 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>{DC55C086-714D-4E2F-B6CE-3C14BC3B6646}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Azure.Mobile.Crashes</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile.Crashes</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;USES_WATSON</DefineConstants>
+    <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;USES_WATSON</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="WatsonRegistrationManager.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj">
+      <Project>{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}</Project>
+      <Name>Microsoft.Azure.Mobile.WindowsDesktop</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\Microsoft.Azure.Mobile.Crashes.Windows.Shared\Microsoft.Azure.Mobile.Crashes.Windows.Shared.projitems" Label="Shared" />
+  <Import Project="..\Microsoft.Azure.Mobile.Crashes.Shared\Microsoft.Azure.Mobile.Crashes.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/Properties/AssemblyInfo.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..dd562ed86
--- /dev/null
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -0,0 +1,28 @@
+using System.Reflection;
+
+
+// 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("Microsoft.Azure.Mobile.Crashes")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyProduct("Microsoft.Azure.Mobile.Crashes")]
+[assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/WatsonRegistrationManager.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/WatsonRegistrationManager.cs
new file mode 100644
index 000000000..05e0687cc
--- /dev/null
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/WatsonRegistrationManager.cs
@@ -0,0 +1,23 @@
+using System.Runtime.InteropServices;
+
+namespace WatsonRegistrationUtility
+{
+    internal class WatsonRegistrationManager
+    {
+        private const string WatsonAppSecretKey = "VSMCAppSecret";
+        private const string WatsonCorrelationIdKey = "VSMCCorrelationId";
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        public static extern int WerRegisterCustomMetadata([MarshalAs(UnmanagedType.LPWStr)]string key, [MarshalAs(UnmanagedType.LPWStr)]string value);
+
+        public static void Start(string appSecret)
+        {
+            WerRegisterCustomMetadata(WatsonAppSecretKey, appSecret);
+        }
+
+        public static void SetCorrelationId(string correlationId)
+        {
+            WerRegisterCustomMetadata(WatsonCorrelationIdKey, correlationId);
+        }
+    }
+}
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/project.json b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/project.json
new file mode 100644
index 000000000..d6fffc81f
--- /dev/null
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/project.json
@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+  },
+  "frameworks": {
+    "net452": {}
+  },
+  "runtimes": {
+    "win": {}
+  }
+}
\ No newline at end of file
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/ApiDefinition.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/ApiDefinition.cs
index d3824a145..da2e7149d 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/ApiDefinition.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/ApiDefinition.cs
@@ -102,6 +102,11 @@ namespace Microsoft.Azure.Mobile.Crashes.iOS.Bindings
         [Static]
         [Export("disableMachExceptionHandler")]
         void DisableMachExceptionHandler();
+
+        //+(void)trackModelException:(MSException *)exception;
+        [Static]
+        [Export("trackModelException:")]
+        void TrackModelException(MSException exception);
     }
 
     // @protocol MSCrashesDelegate <NSObject>
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs
index cb8aa926f..19b53f580 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Reflection;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/PlatformCrashes.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/PlatformCrashes.cs
index 2c06281e7..f89ed087f 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/PlatformCrashes.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/PlatformCrashes.cs
@@ -69,10 +69,10 @@ namespace Microsoft.Azure.Mobile.Crashes
             MSCrashes.NotifyWithUserConfirmation(iosUserConfirmation);
         }
 
-        //public override void TrackException(Exception exception)
-        //{
-        //	throw new NotImplementedException();
-        //}
+        public override void TrackException(Exception exception)
+        {
+            MSCrashes.TrackModelException(GenerateiOSException(exception, false));
+        }
 
         static PlatformCrashes()
         {
@@ -99,7 +99,7 @@ namespace Microsoft.Azure.Mobile.Crashes
         private static void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             Exception systemException = e.ExceptionObject as Exception;
-            MSException exception = GenerateiOSException(systemException);
+            MSException exception = GenerateiOSException(systemException, true);
             byte[] exceptionBytes = CrashesUtils.SerializeException(systemException);
             NSData wrapperExceptionData = NSData.FromArray(exceptionBytes);
 
@@ -112,13 +112,13 @@ namespace Microsoft.Azure.Mobile.Crashes
             MSWrapperExceptionManager.SaveWrapperException(wrapperException);
         }
 
-        private static MSException GenerateiOSException(Exception exception)
+        private static MSException GenerateiOSException(Exception exception, bool structuredFrames)
         {
             var msException = new MSException();
             msException.Type = exception.GetType().FullName;
             msException.Message = exception.Message;
             msException.StackTrace = exception.StackTrace;
-            msException.Frames = GenerateStackFrames(exception);
+            msException.Frames = structuredFrames ? GenerateStackFrames(exception) : null;
             msException.WrapperSdkName = WrapperSdk.Name;
 
             var aggregateException = exception as AggregateException;
@@ -128,12 +128,12 @@ namespace Microsoft.Azure.Mobile.Crashes
             {
                 foreach (Exception innerException in aggregateException.InnerExceptions)
                 {
-                    innerExceptions.Add(GenerateiOSException(innerException));
+                    innerExceptions.Add(GenerateiOSException(innerException, structuredFrames));
                 }
             }
             else if (exception.InnerException != null)
             {
-                innerExceptions.Add(GenerateiOSException(exception.InnerException));
+                innerExceptions.Add(GenerateiOSException(exception.InnerException, structuredFrames));
             }
 
             msException.InnerExceptions = innerExceptions.Count > 0 ? innerExceptions.ToArray() : null;
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/Properties/AssemblyInfo.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/Properties/AssemblyInfo.cs
index f11bd6716..7612eddc2 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.iOS/Properties/AssemblyInfo.cs
@@ -23,5 +23,5 @@ using System.Reflection;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/PlatformCrashes.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/PlatformCrashes.cs
index 9943c08cf..dbcfec937 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/PlatformCrashes.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/PlatformCrashes.cs
@@ -44,6 +44,8 @@ namespace Microsoft.Azure.Mobile.Crashes
         {
         }
 
-        //public override void TrackException(Exception exception) { }
+        public override void TrackException(Exception exception)
+        { 
+        }
     }
 }
\ No newline at end of file
diff --git a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/Properties/AssemblyInfo.cs b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/Properties/AssemblyInfo.cs
index 7d0e49380..1201d2b32 100644
--- a/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Reflection;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterCrashes/WatsonRegistrationUtility/WatsonRegistrationUtility.vcxproj b/SDK/MobileCenterCrashes/WatsonRegistrationUtility/WatsonRegistrationUtility.vcxproj
index 4a5f36d48..194892af9 100644
--- a/SDK/MobileCenterCrashes/WatsonRegistrationUtility/WatsonRegistrationUtility.vcxproj
+++ b/SDK/MobileCenterCrashes/WatsonRegistrationUtility/WatsonRegistrationUtility.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
diff --git a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android.Bindings/Properties/AssemblyInfo.cs
index c4f300235..bfd6b8171 100644
--- a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android.Bindings/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@ using System.Reflection;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android/Properties/AssemblyInfo.cs b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android/Properties/AssemblyInfo.cs
index 4a3b6dcb9..106df6c57 100644
--- a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs
index c5a3de4fc..ca3d7553f 100644
--- a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Foundation;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS/Properties/AssemblyInfo.cs b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS/Properties/AssemblyInfo.cs
index 3bc51d818..358b64ed2 100644
--- a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.iOS/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@ using System.Runtime.CompilerServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute/Properties/AssemblyInfo.cs b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute/Properties/AssemblyInfo.cs
index 255c2f4a3..7ca6d3f55 100644
--- a/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute/Properties/AssemblyInfo.cs
@@ -25,5 +25,5 @@ using System.Reflection;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android.Bindings/Properties/AssemblyInfo.cs
index b06d500b4..b2d893f52 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android.Bindings/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android/Properties/AssemblyInfo.cs b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android/Properties/AssemblyInfo.cs
index f41de81b4..98597b292 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@ using System.Runtime.CompilerServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Microsoft.Azure.Mobile.Push.UWP.csproj b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Microsoft.Azure.Mobile.Push.UWP.csproj
index 7aeac437a..3ffb686d9 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Microsoft.Azure.Mobile.Push.UWP.csproj
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Microsoft.Azure.Mobile.Push.UWP.csproj
@@ -3,7 +3,7 @@
   <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>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProjectGuid>{8072449C-C6A8-4B36-87DC-173F295D161C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Properties/AssemblyInfo.cs b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Properties/AssemblyInfo.cs
index f1c26c598..a7b87ce44 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/Properties/AssemblyInfo.cs
@@ -28,6 +28,6 @@ using System.Runtime.InteropServices;
 [assembly: ReferenceAssembly]
 #endif
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
 [assembly: ComVisible(false)]
 [assembly: InternalsVisibleTo("Microsoft.Azure.Mobile.Test.UWP")]
\ No newline at end of file
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Windows.Shared/Microsoft.Azure.Mobile.Push.Windows.Shared.shproj b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Windows.Shared/Microsoft.Azure.Mobile.Push.Windows.Shared.shproj
index 63de3280d..c81da025f 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Windows.Shared/Microsoft.Azure.Mobile.Push.Windows.Shared.shproj
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Windows.Shared/Microsoft.Azure.Mobile.Push.Windows.Shared.shproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<Project  ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
     <ProjectGuid>ba25a66a-fcea-49c2-a85a-0f6f54463675</ProjectGuid>
   </PropertyGroup>
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS.Bindings/Properties/AssemblyInfo.cs
index dd561092e..0ec59c4c0 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS.Bindings/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS.Bindings/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using Foundation;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS/Properties/AssemblyInfo.cs b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS/Properties/AssemblyInfo.cs
index f867506b4..d007e9f6b 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.iOS/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@ using System.Runtime.CompilerServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push/Properties/AssemblyInfo.cs b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push/Properties/AssemblyInfo.cs
index 25f2a84b3..ffb270508 100644
--- a/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push/Properties/AssemblyInfo.cs
+++ b/SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@ using System.Runtime.CompilerServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Additions/AboutAdditions.txt b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Additions/AboutAdditions.txt
new file mode 100644
index 000000000..e7b77657a
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Additions/AboutAdditions.txt
@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+ {
+     // JNI bindings
+ }
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+     this (location.X, location.Y, size.Width, size.Height)
+ {
+ }
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+ public int Y { get; set; }
+}
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Jars/AboutJars.txt b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Jars/AboutJars.txt
new file mode 100644
index 000000000..e833d78bc
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Jars/AboutJars.txt
@@ -0,0 +1,36 @@
+This directory is for Android .jars.
+
+There are 4 types of jars that are supported:
+
+== Input Jar and Embedded Jar ==
+
+This is the jar that bindings should be generated for.
+
+For example, if you were binding the Google Maps library, this would
+be Google's "maps.jar".
+
+The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
+embedded in the resulting dll as EmbeddedResource, while InputJar is not.
+There are couple of reasons you wouldn't like to embed the target jar
+in your dll (the ones that could be internally loaded by <uses-library>
+feature e.g. maps.jar, or you cannot embed jars that are under some
+proprietary license).
+
+Set the build action for these jars in the properties page to "InputJar".
+
+
+== Reference Jar and Embedded Reference Jar ==
+
+These are jars that are referenced by the input jar.  C# bindings will
+not be created for these jars.  These jars will be used to resolve
+types used by the input jar.
+
+NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
+based on the Target Framework selected.
+
+Set the build action for these jars in the properties page to "ReferenceJar".
+
+"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
+embedded in your dll. But at application build time, they are not included
+in the final apk, like ReferenceJar files.
+
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Microsoft.Azure.Mobile.Rum.Android.Bindings.csproj b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Microsoft.Azure.Mobile.Rum.Android.Bindings.csproj
new file mode 100644
index 000000000..c3e72ece9
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Microsoft.Azure.Mobile.Rum.Android.Bindings.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7E130457-B427-4043-A5A2-9484CB5809BF}</ProjectGuid>
+    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.Azure.Mobile.Rum.Android.Bindings</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile.Rum.Android.Bindings</AssemblyName>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidClassParser>class-parse</AndroidClassParser>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Additions\AboutAdditions.txt" />
+    <None Include="Jars\AboutJars.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+    <TransformFile Include="Transforms\Metadata.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <LibraryProjectZip Include="Jars\mobile-center-rum-release.aar" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MobileCenter\Microsoft.Azure.Mobile.Android.Bindings\Microsoft.Azure.Mobile.Android.Bindings.csproj">
+      <Project>{C3B5BA33-DA39-400D-B5B3-85C68354FD74}</Project>
+      <Name>Microsoft.Azure.Mobile.Android.Bindings</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Properties/AssemblyInfo.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..1243d4dbd
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Properties/AssemblyInfo.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Android.App;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Microsoft.Azure.Mobile.Rum.Android.Bindings")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("${AuthorCopyright}")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.0")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/EnumFields.xml b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/EnumFields.xml
new file mode 100644
index 000000000..68cc7fd68
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/EnumFields.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-field-mappings>
+	<!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
+    <field clr-name="Id" jni-name="Fragment_id" value="1" />
+    <field clr-name="Name" jni-name="Fragment_name" value="0" />
+    <field clr-name="Tag" jni-name="Fragment_tag" value="2" />
+  </type>
+
+  Notes:
+  - An optional "bitfield" attribute marks the enum type with [Flags].
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  -->
+</enum-field-mappings>
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/EnumMethods.xml b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/EnumMethods.xml
new file mode 100644
index 000000000..bd77573ac
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/EnumMethods.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<enum-method-mappings>
+	<!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+
+  Notes:
+  - For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
+  - To change the type of the return value, use "return" as the parameter name.
+  - The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
+  -->
+</enum-method-mappings>
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/Metadata.xml b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/Metadata.xml
new file mode 100644
index 000000000..db8ce781d
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/Transforms/Metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+	<attr path="/api/package[@name='com.microsoft.azure.mobile.rum']/class[@name='RealUserMeasurements']" name="managedName">AndroidRealUserMeasurements</attr>
+</metadata>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Microsoft.Azure.Mobile.Rum.Android.csproj b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Microsoft.Azure.Mobile.Rum.Android.csproj
new file mode 100644
index 000000000..cb1a52af8
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Microsoft.Azure.Mobile.Rum.Android.csproj
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7F7FA7ED-1386-41B5-A11E-656B7F85A8F9}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.Azure.Mobile.Rum.Android</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile.Rum</AssemblyName>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\Microsoft.Azure.Mobile.Rum.Android.xml</DocumentationFile>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Resources\Resource.designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RealUserMeasurements.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\AboutResources.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\Strings.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Azure.Mobile.Rum.Android.Bindings\Microsoft.Azure.Mobile.Rum.Android.Bindings.csproj">
+      <Project>{7E130457-B427-4043-A5A2-9484CB5809BF}</Project>
+      <Name>Microsoft.Azure.Mobile.Rum.Android.Bindings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\MobileCenter\Microsoft.Azure.Mobile.Android.Bindings\Microsoft.Azure.Mobile.Android.Bindings.csproj">
+      <Project>{C3B5BA33-DA39-400D-B5B3-85C68354FD74}</Project>
+      <Name>Microsoft.Azure.Mobile.Android.Bindings</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems" Label="Shared" Condition="Exists('..\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems')" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Properties/AssemblyInfo.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..6cbcd7640
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Properties/AssemblyInfo.cs
@@ -0,0 +1,28 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Microsoft.Azure.Mobile.Rum.Android")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.15.1.0")]
+[assembly: AssemblyInformationalVersion("0.15.1-SNAPSHOT")]
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/RealUserMeasurements.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/RealUserMeasurements.cs
new file mode 100644
index 000000000..f8c7291fb
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/RealUserMeasurements.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Threading.Tasks;
+using Android.Runtime;
+using Com.Microsoft.Azure.Mobile.Rum;
+
+namespace Microsoft.Azure.Mobile.Rum
+{
+    public partial class RealUserMeasurements
+    {
+        /// <summary>
+        /// Internal SDK property not intended for public use.
+        /// </summary>
+        /// <value>
+        /// The Android SDK bindings type.
+        /// </value>
+        [Preserve]
+        public static Type BindingType => typeof(AndroidRealUserMeasurements);
+
+        static Task<bool> PlatformIsEnabledAsync()
+        {
+            var future = AndroidRealUserMeasurements.IsEnabled();
+            return Task.Run(() => (bool)future.Get());
+        }
+
+        static Task PlatformSetEnabledAsync(bool enabled)
+        {
+            var future = AndroidRealUserMeasurements.SetEnabled(enabled);
+            return Task.Run(() => future.Get());
+        }
+
+        static void PlatformSetRumKey(string rumKey)
+        {
+            AndroidRealUserMeasurements.SetRumKey(rumKey);
+        }
+    }
+}
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Resources/AboutResources.txt b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Resources/AboutResources.txt
new file mode 100644
index 000000000..10f52d460
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Resources/AboutResources.txt
@@ -0,0 +1,44 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included 
+in your application as resource files.  Various Android APIs are designed to 
+operate on the resource IDs instead of dealing with images, strings or binary blobs 
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.axml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+    drawable/
+        icon.png
+
+    layout/
+        main.axml
+
+    values/
+        strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
+instead operate on resource IDs.  When you compile an Android application that uses resources, 
+the build system will package the resources for distribution and generate a class called "R" 
+(this is an Android convention) that contains the tokens for each one of the resources 
+included. For example, for the above Resources layout, this is what the R class would expose:
+
+public class R {
+    public class drawable {
+        public const int icon = 0x123;
+    }
+
+    public class layout {
+        public const int main = 0x456;
+    }
+
+    public class strings {
+        public const int first_string = 0xabc;
+        public const int second_string = 0xbcd;
+    }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main 
+to reference the layout/main.axml file, or R.strings.first_string to reference the first 
+string in the dictionary file values/strings.xml.
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Resources/values/Strings.xml b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Resources/values/Strings.xml
new file mode 100644
index 000000000..8c076a1ef
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/Resources/values/Strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="library_name">Microsoft.Azure.Mobile.Rum.Android</string>
+</resources>
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/Microsoft.Azure.Mobile.Rum.Shared.projitems b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/Microsoft.Azure.Mobile.Rum.Shared.projitems
new file mode 100644
index 000000000..a7856a0b9
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/Microsoft.Azure.Mobile.Rum.Shared.projitems
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3}</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.Azure.Mobile.Rum.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)RealUserMeasurements.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/Microsoft.Azure.Mobile.Rum.Shared.shproj b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/Microsoft.Azure.Mobile.Rum.Shared.shproj
new file mode 100644
index 000000000..126f92cce
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/Microsoft.Azure.Mobile.Rum.Shared.shproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{8E7B80C4-D22A-4F80-A7AE-E3882E72FFB3}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <Import Project="Microsoft.Azure.Mobile.Rum.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/RealUserMeasurements.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/RealUserMeasurements.cs
new file mode 100644
index 000000000..3597f8637
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Shared/RealUserMeasurements.cs
@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Mobile.Rum
+{
+    /// <summary>
+    /// RealUserMeasurements feature.
+    /// </summary>
+    public partial class RealUserMeasurements
+    {
+        /// <summary>
+        /// Check whether the RealUserMeasurements service is enabled or not.
+        /// </summary>
+        /// <returns>A task with result being true if enabled, false if disabled.</returns>
+        public static Task<bool> IsEnabledAsync()
+        {
+            return PlatformIsEnabledAsync();
+        }
+
+        /// <summary>
+        /// Enable or disable the RealUserMeasurements service.
+        /// </summary>
+        /// <returns>A task to monitor the operation.</returns>
+        public static Task SetEnabledAsync(bool enabled)
+        {
+            return PlatformSetEnabledAsync(enabled);
+        }
+
+        /// <summary>
+        /// Configure key.
+        /// </summary>
+        public static void SetRumKey(string rumKey)
+        {
+            PlatformSetRumKey(rumKey);
+        }
+    }
+}
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Microsoft.Azure.Mobile.Rum.UWP.csproj b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Microsoft.Azure.Mobile.Rum.UWP.csproj
new file mode 100644
index 000000000..870adb182
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Microsoft.Azure.Mobile.Rum.UWP.csproj
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.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>{BCD888D1-A62F-458C-A72B-9DF731EE1A55}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Azure.Mobile.Rum</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile.Rum</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.14393.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </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;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Properties\Microsoft.Azure.Mobile.Rum.UWP.rd.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\MobileCenter\Microsoft.Azure.Mobile.UWP\Microsoft.Azure.Mobile.UWP.csproj">
+      <Project>{15e3fc9b-7714-4468-a296-81627a5b8f01}</Project>
+      <Name>Microsoft.Azure.Mobile.UWP</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems" Label="Shared" />
+  <Import Project="..\Microsoft.Azure.Mobile.Rum.Windows.Shared\Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems" Label="Shared" />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.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>
+  -->
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Properties/AssemblyInfo.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..5a80428e7
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Properties/AssemblyInfo.cs
@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("Microsoft.Azure.Mobile.Rum.UWP")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Microsoft.Azure.Mobile.Rum.UWP")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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")]
+[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Properties/Microsoft.Azure.Mobile.Rum.UWP.rd.xml b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Properties/Microsoft.Azure.Mobile.Rum.UWP.rd.xml
new file mode 100644
index 000000000..d477c3b7b
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/Properties/Microsoft.Azure.Mobile.Rum.UWP.rd.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file contains Runtime Directives, specifications about types your application accesses
+    through reflection and other dynamic code patterns. Runtime Directives are used to control the
+    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
+    library does not do any reflection, then you generally do not need to edit this file. However,
+    if your library reflects over types, especially types passed to it or derived from its types,
+    then you should write Runtime Directives.
+
+    The most common use of reflection in libraries is to discover information about types passed
+    to the library. Runtime Directives have three ways to express requirements on types passed to
+    your library.
+
+    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
+        Use these directives to reflect over types passed as a parameter.
+
+    2.  SubTypes
+        Use a SubTypes directive to reflect over types derived from another type.
+
+    3.  AttributeImplies
+        Use an AttributeImplies directive to indicate that your library needs to reflect over
+        types or methods decorated with an attribute.
+
+    For more information on writing Runtime Directives for libraries, please visit
+    https://go.microsoft.com/fwlink/?LinkID=391919
+-->
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Library Name="Microsoft.Azure.Mobile.Rum.UWP">
+
+  	<!-- add directives for your library here -->
+
+  </Library>
+</Directives>
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/project.json b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/project.json
new file mode 100644
index 000000000..f3b6f0ac4
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/project.json
@@ -0,0 +1,17 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
+    "Newtonsoft.Json": "6.0.1"
+  },
+  "frameworks": {
+    "uap10.0.10586": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems
new file mode 100644
index 000000000..0c32f8d74
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>7eea1e57-8244-42a4-aa3e-cfb995e86467</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.Azure.Mobile.Rum</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)RealUserMeasurements.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TestEndpoint.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RumConfiguration.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TestUrl.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/Microsoft.Azure.Mobile.Rum.Windows.Shared.shproj b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/Microsoft.Azure.Mobile.Rum.Windows.Shared.shproj
new file mode 100644
index 000000000..e25bb6af9
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/Microsoft.Azure.Mobile.Rum.Windows.Shared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>7eea1e57-8244-42a4-aa3e-cfb995e86467</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Microsoft.Azure.Mobile.Rum.Windows.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/RealUserMeasurements.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/RealUserMeasurements.cs
new file mode 100644
index 000000000..2274725ed
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/RealUserMeasurements.cs
@@ -0,0 +1,402 @@
+using Microsoft.Azure.Mobile.Channel;
+using Microsoft.Azure.Mobile.Ingestion.Http;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Mobile.Rum
+{
+    public partial class RealUserMeasurements : MobileCenterService
+    {
+        #region static
+
+        // Rum configuration endpoint.
+        private static readonly string[] ConfigurationEndpoints =
+        {
+            "http://www.atmrum.net/conf/v1/atm/fpconfig.min.json"
+        };
+
+        // Warm up image path.
+        private const string WarmUpImage = "trans.gif";
+
+        // TestUrl image path.
+        private const string SeventeenkImage = "17k.gif";
+
+        // Flag to support https.
+        private const int FlagHttps = 1;
+
+        // Flag to use the 17k image to test.
+        private const int FlagSeventeenk = 12;
+
+        // Empty headers to use for HTTP
+        private static readonly IDictionary<string, string> Headers = new Dictionary<string, string>();
+
+        private static readonly object RealUserMeasurementsLock = new object();
+
+        private static RealUserMeasurements _instanceField;
+
+        // ReSharper disable once MemberCanBePrivate.Global
+        // (Used by reflection from the core).
+        public static RealUserMeasurements Instance
+        {
+            get
+            {
+                lock (RealUserMeasurementsLock)
+                {
+                    return _instanceField ?? (_instanceField = new RealUserMeasurements());
+                }
+            }
+        }
+
+        private static Task<bool> PlatformIsEnabledAsync()
+        {
+            lock (RealUserMeasurementsLock)
+            {
+                return Task.FromResult(Instance.InstanceEnabled);
+            }
+        }
+
+        private static Task PlatformSetEnabledAsync(bool enabled)
+        {
+            lock (RealUserMeasurementsLock)
+            {
+                Instance.InstanceEnabled = enabled;
+                return Task.FromResult(default(object));
+            }
+        }
+
+        private static void PlatformSetRumKey(string rumKey)
+        {
+            lock (RealUserMeasurementsLock)
+            {
+                Instance.InstanceSetRumKey(rumKey);
+            }
+        }
+
+        // All unique identifiers in Rum have no dash.
+        private static string ProbeId()
+        {
+            return Guid.NewGuid().ToString().Replace("-", "");
+        }
+
+        #endregion
+
+        #region instance
+
+        private string _rumKey;
+
+        private CancellationTokenSource _cancellationTokenSource;
+
+        public override bool InstanceEnabled
+        {
+            get => base.InstanceEnabled;
+
+            set
+            {
+                lock (_serviceLock)
+                {
+                    var prevValue = InstanceEnabled;
+                    base.InstanceEnabled = value;
+                    if (value != prevValue)
+                    {
+                        ApplyEnabledState(value);
+                    }
+                }
+            }
+        }
+
+        private void InstanceSetRumKey(string rumKey)
+        {
+            lock (_serviceLock)
+            {
+                if (rumKey == null)
+                {
+                    MobileCenterLog.Error(LogTag, "Rum key is invalid.");
+                    return;
+                }
+                rumKey = rumKey.Trim();
+                if (rumKey.Length != 32)
+                {
+                    MobileCenterLog.Error(LogTag, "Rum key is invalid.");
+                    return;
+                }
+                _rumKey = rumKey;
+            }
+        }
+
+        public override string ServiceName => "RealUserMeasurements";
+
+        protected override string ChannelName => "rum";
+
+        public override void OnChannelGroupReady(IChannelGroup channelGroup, string appSecret)
+        {
+            lock (_serviceLock)
+            {
+                base.OnChannelGroupReady(channelGroup, appSecret);
+                ApplyEnabledState(InstanceEnabled);
+            }
+        }
+
+
+        private void ApplyEnabledState(bool enabled)
+        {
+            lock (_serviceLock)
+            {
+                if (enabled)
+                {
+                    // Snapshot RUM key for this run, updates will work only if disabling/enabling again.
+                    var rumKey = _rumKey;
+                    if (rumKey == null)
+                    {
+                        MobileCenterLog.Error(LogTag, "Rum key must be configured before start.");
+                        return;
+                    }
+
+                    // Create cancellation token and snapshot token for the task to avoid race conditions.
+                    _cancellationTokenSource = new CancellationTokenSource();
+                    var cancellationToken = _cancellationTokenSource.Token;
+                    Task.Run(async () =>
+                    {
+                        try
+                        {
+                            await RunMeasurementsAsync(rumKey, cancellationToken);
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            MobileCenterLog.Debug(LogTag, "Measurements were canceled.");
+                        }
+                        catch (MobileCenterException e)
+                        {
+                            MobileCenterLog.Error(LogTag, $"Could not run measurements: {e.Message}");
+                        }
+                        catch (Exception e)
+                        {
+                            MobileCenterLog.Error(LogTag, "Could not run measurements.", e);
+                        }
+                        finally
+                        {
+                            lock (_serviceLock)
+                            {
+                                if (cancellationToken == _cancellationTokenSource?.Token)
+                                {
+                                    DisposeCancellationSource();
+                                }
+                            }
+                        }
+                    }, cancellationToken);
+                }
+                else
+                {
+                    _cancellationTokenSource?.Cancel();
+                    DisposeCancellationSource();
+                }
+            }
+        }
+
+        private void DisposeCancellationSource()
+        {
+            _cancellationTokenSource?.Dispose();
+            _cancellationTokenSource = null;
+        }
+
+        private async Task RunMeasurementsAsync(string rumKey, CancellationToken cancellationToken)
+        {
+            // TODO handle network state, requires refactoring to reuse ingestion logic here
+            using (var httpNetworkAdapter = new HttpNetworkAdapter())
+            {
+                // Get remote configuration.
+                var jsonConfiguration = await GetRemoteConfigurationAsync(cancellationToken, httpNetworkAdapter);
+
+                // Parse configuration.
+                var configuration = JsonConvert.DeserializeObject<RumConfiguration>(jsonConfiguration);
+
+                // If configuration looks good so far.
+                if (configuration.TestEndpoints != null)
+                {
+                    // Generate test urls.
+                    var testUrls = GenerateTestUrls(configuration);
+
+                    // Run the tests.
+                    await RunTestUrlsAsync(cancellationToken, httpNetworkAdapter, testUrls);
+
+                    // Report the results.
+                    await ReportMeasurementsAsync(rumKey, cancellationToken, httpNetworkAdapter, configuration, testUrls);
+                }
+                else
+                {
+                    throw new MobileCenterException("Configuration does not contain test endpoints.");
+                }
+            }
+        }
+
+        private async Task<string> GetRemoteConfigurationAsync(CancellationToken cancellationToken, IHttpNetworkAdapter httpNetworkAdapter)
+        {
+            foreach (var url in ConfigurationEndpoints)
+            {
+                try
+                {
+                    MobileCenterLog.Verbose(LogTag, "Calling " + url);
+                    return await httpNetworkAdapter.SendAsync(url, HttpMethod.Get, Headers, "", cancellationToken);
+                }
+                catch (Exception e) when (!(e is OperationCanceledException))
+                {
+                    MobileCenterLog.Error(LogTag, "Could not get configuration file at " + url, e);
+                }
+            }
+            throw new MobileCenterException("Could not get configuration on any endpoint.");
+        }
+
+        private static List<TestUrl> GenerateTestUrls(RumConfiguration configuration)
+        {
+            // Prepare weighted random selection.
+            var totalWeight = 0;
+            var weightedEndpoints = new List<TestEndpoint>(configuration.TestEndpoints.Count);
+            foreach (var endpoint in configuration.TestEndpoints)
+            {
+                var weight = endpoint.Weight;
+                if (weight > 0)
+                {
+                    totalWeight += weight;
+                    endpoint.CumulatedWeight = totalWeight;
+                    weightedEndpoints.Add(endpoint);
+                }
+            }
+
+            // Select n endpoints randomly with respect to weight.
+            var testUrls = new List<TestUrl>();
+            var random = new Random();
+            var testCount = Math.Min(configuration.TestCount, weightedEndpoints.Count);
+            for (var n = 0; n < testCount; n++)
+            {
+                // Select random endpoint
+                var randomWeight = Math.Floor(random.NextDouble() * totalWeight);
+                TestEndpoint endpoint = null;
+                for (var i = 0; i < weightedEndpoints.Count; i++)
+                {
+                    var weightedEndpoint = weightedEndpoints[i];
+                    var cumulatedWeight = weightedEndpoint.CumulatedWeight;
+                    if (endpoint == null)
+                    {
+                        if (randomWeight <= cumulatedWeight)
+                        {
+                            endpoint = weightedEndpoint;
+                            weightedEndpoints.RemoveAt(i--);
+                        }
+                    }
+
+                    // Update subsequent endpoints cumulated weights since we removed an element.
+                    else
+                    {
+                        weightedEndpoint.CumulatedWeight -= endpoint.Weight;
+                    }
+                }
+
+                // Update total weight since we removed the picked endpoint.
+                if (endpoint == null)
+                {
+                    continue;
+                }
+                totalWeight -= endpoint.Weight;
+
+                // Use endpoint to generate test urls.
+                var protocolSuffix = "";
+                var measurementType = endpoint.MeasurementType;
+                if ((measurementType & FlagHttps) > 0)
+                {
+                    protocolSuffix = "s";
+                }
+                var requestId = endpoint.Url;
+
+                // Handle backward compatibility with FPv1.
+                var baseUrl = requestId;
+                if (!requestId.Contains("."))
+                {
+                    baseUrl += ".clo.footprintdns.com";
+                }
+
+                // Port this Javascript behavior regarding url and requestId.
+                else if (requestId.StartsWith("*") && requestId.Length > 2)
+                {
+                    var domain = requestId.Substring(2);
+                    var uuid = ProbeId();
+                    baseUrl = uuid + "." + domain;
+                    requestId = domain.Equals("clo.footprintdns.com", StringComparison.OrdinalIgnoreCase) ? uuid : domain;
+                }
+
+                // Generate test urls.
+                var probeId = ProbeId();
+                var testUrl = $"http{protocolSuffix}://{baseUrl}/apc/{WarmUpImage}?{probeId}";
+                testUrls.Add(new TestUrl { Url = testUrl, RequestId = requestId, Object = WarmUpImage, Conn = "cold" });
+                var testImage = (measurementType & FlagSeventeenk) > 0 ? SeventeenkImage : WarmUpImage;
+                probeId = ProbeId();
+                testUrl = $"http{protocolSuffix}://{baseUrl}/apc/{testImage}?{probeId}";
+                testUrls.Add(new TestUrl { Url = testUrl, RequestId = requestId, Object = testImage, Conn = "warm" });
+            }
+            return testUrls;
+        }
+
+        private async Task RunTestUrlsAsync(CancellationToken cancellationToken, IHttpNetworkAdapter httpNetworkAdapter, IList<TestUrl> testUrls)
+        {
+            var stopWatch = new Stopwatch();
+            for (var i = 0; i < testUrls.Count; i++)
+            {
+                var testUrl = testUrls[i];
+                MobileCenterLog.Verbose(LogTag, "Calling " + testUrl.Url);
+                try
+                {
+                    stopWatch.Restart();
+                    await httpNetworkAdapter.SendAsync(testUrl.Url, HttpMethod.Get, Headers, "", cancellationToken);
+                    testUrl.Result = stopWatch.ElapsedMilliseconds;
+                }
+                catch (Exception e) when (!(e is OperationCanceledException))
+                {
+                    testUrls.RemoveAt(i--);
+                    MobileCenterLog.Error(LogTag, testUrl.Url + " call failed", e);
+                }
+            }
+        }
+
+        private async Task ReportMeasurementsAsync(string rumKey, CancellationToken cancellationToken, IHttpNetworkAdapter httpNetworkAdapter, RumConfiguration configuration, IList<TestUrl> testUrls)
+        {
+            // Generate report.
+            var jsonReport = JsonConvert.SerializeObject(testUrls);
+            MobileCenterLog.Verbose(LogTag, $"Report payload={jsonReport}");
+
+            // Send it.
+            if (configuration.ReportEndpoints != null)
+            {
+                var reportId = ProbeId();
+                var reportQueryString = $"?MonitorID=atm-mc&rid={reportId}&w3c=false&prot=https&v=2017061301&tag={rumKey}&DATA={Uri.EscapeDataString(jsonReport)}";
+                foreach (var reportEndpoint in configuration.ReportEndpoints)
+                {
+                    var reportUrl = $"https://{reportEndpoint}{reportQueryString}";
+                    MobileCenterLog.Verbose(LogTag, "Calling " + reportUrl);
+                    try
+                    {
+                        await httpNetworkAdapter.SendAsync(reportUrl, HttpMethod.Get, Headers, "", cancellationToken);
+                        MobileCenterLog.Info(LogTag, "Measurements reported successfully.");
+
+                        // Stop when we encounter the first working report endpoint.
+                        return;
+                    }
+                    catch (Exception e) when (!(e is OperationCanceledException))
+                    {
+                        // Fall back on next report endpoint.
+                        MobileCenterLog.Error(LogTag, $"Failed to report measurements at {reportEndpoint}", e);
+                    }
+                }
+                MobileCenterLog.Error(LogTag, "Measurements report failed on all report endpoints.");
+            }
+            else
+            {
+                throw new MobileCenterException("Configuration does not contain report endpoints.");
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/RumConfiguration.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/RumConfiguration.cs
new file mode 100644
index 000000000..63a3be0b9
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/RumConfiguration.cs
@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Mobile.Rum
+{
+    internal class RumConfiguration
+    {
+        [JsonProperty("n")]
+        internal int TestCount { get; set; }
+
+        [JsonProperty("e")]
+        internal IList<TestEndpoint> TestEndpoints { get; set; }
+
+        [JsonProperty("r")]
+        internal IList<string> ReportEndpoints { get; set; }
+    }
+}
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/TestEndpoint.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/TestEndpoint.cs
new file mode 100644
index 000000000..410d0e6cf
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/TestEndpoint.cs
@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Mobile.Rum
+{
+    internal class TestEndpoint
+    {
+        [JsonProperty("e")]
+        internal string Url { get; set; }
+
+        [JsonProperty("m")]
+        internal int MeasurementType { get; set; }
+
+        [JsonProperty("w")]
+        internal int Weight { get; set; }
+
+        internal int CumulatedWeight { get; set; }
+    }
+}
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/TestUrl.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/TestUrl.cs
new file mode 100644
index 000000000..528895722
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Windows.Shared/TestUrl.cs
@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+
+namespace Microsoft.Azure.Mobile.Rum
+{
+    internal class TestUrl
+    {
+        internal string Url { get; set; }
+
+        [JsonProperty]
+        internal string RequestId { get; set; }
+
+        [JsonProperty]
+        internal string Object { get; set; }
+
+        [JsonProperty]
+        internal string Conn { get; set; }
+
+        [JsonProperty]
+        internal long Result { get; set; }
+    }
+}
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/Microsoft.Azure.Mobile.Rum.csproj b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/Microsoft.Azure.Mobile.Rum.csproj
new file mode 100644
index 000000000..676847e2b
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/Microsoft.Azure.Mobile.Rum.csproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{254D5434-9087-4F05-A43F-23A790E42024}</ProjectGuid>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.Azure.Mobile.Rum</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile.Rum</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="RealUserMeasurements.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="..\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems" Label="Shared" Condition="Exists('..\Microsoft.Azure.Mobile.Rum.Shared\Microsoft.Azure.Mobile.Rum.Shared.projitems')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/Properties/AssemblyInfo.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..e28a59e25
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/Properties/AssemblyInfo.cs
@@ -0,0 +1,28 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Microsoft.Azure.Mobile.Rum")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft Corporation")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 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("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.15.1.0")]
+[assembly: AssemblyInformationalVersion("0.15.1-SNAPSHOT")]
diff --git a/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/RealUserMeasurements.cs b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/RealUserMeasurements.cs
new file mode 100644
index 000000000..908618383
--- /dev/null
+++ b/SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/RealUserMeasurements.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Mobile.Rum
+{
+    public partial class RealUserMeasurements
+    {
+        static Task<bool> PlatformIsEnabledAsync()
+        {
+            return Task.FromResult(false);
+        }
+
+        static Task PlatformSetEnabledAsync(bool enabled)
+        {
+            return Task.FromResult(default(object));
+        }
+
+        static void PlatformSetRumKey(string rumKey)
+        {
+        }
+    }
+}
diff --git a/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs b/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs
index 63c32d90e..08c27874b 100644
--- a/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs
+++ b/Tests/Contoso.Forms.Test/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@ using System.Reflection;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Tests/Droid/Properties/AndroidManifest.xml b/Tests/Droid/Properties/AndroidManifest.xml
index ed23cc233..7dbb40fc9 100644
--- a/Tests/Droid/Properties/AndroidManifest.xml
+++ b/Tests/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="36" android:versionName="0.16.1-SNAPSHOT" package="com.contoso.contoso_forms_test">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="38" android:versionName="0.17.0-SNAPSHOT" package="com.contoso.contoso_forms_test">
     <uses-sdk android:minSdkVersion="15" />
     <application android:label="Contoso.Forms.Test">
     </application>
diff --git a/Tests/Droid/Properties/AssemblyInfo.cs b/Tests/Droid/Properties/AssemblyInfo.cs
index 6fa6a38f5..9c9def38a 100644
--- a/Tests/Droid/Properties/AssemblyInfo.cs
+++ b/Tests/Droid/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@ using System.Reflection;
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Tests/Microsoft.Azure.Mobile.Analytics.NET/Microsoft.Azure.Mobile.Analytics.NET.csproj b/Tests/Microsoft.Azure.Mobile.Analytics.NET/Microsoft.Azure.Mobile.Analytics.NET.csproj
index 36c558d78..add61a9a3 100644
--- a/Tests/Microsoft.Azure.Mobile.Analytics.NET/Microsoft.Azure.Mobile.Analytics.NET.csproj
+++ b/Tests/Microsoft.Azure.Mobile.Analytics.NET/Microsoft.Azure.Mobile.Analytics.NET.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" 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>
diff --git a/Tests/Microsoft.Azure.Mobile.Analytics.NET/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.Analytics.NET/Properties/AssemblyInfo.cs
index b8db4c3aa..72b2ac455 100644
--- a/Tests/Microsoft.Azure.Mobile.Analytics.NET/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.Azure.Mobile.Analytics.NET/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 [assembly: InternalsVisibleTo("Microsoft.Azure.Mobile.Analytics.Test.Windows")]
\ No newline at end of file
diff --git a/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Microsoft.Azure.Mobile.Analytics.Test.Windows.csproj b/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Microsoft.Azure.Mobile.Analytics.Test.Windows.csproj
index 56b557b8d..08bbfb68a 100644
--- a/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Microsoft.Azure.Mobile.Analytics.Test.Windows.csproj
+++ b/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Microsoft.Azure.Mobile.Analytics.Test.Windows.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Properties/AssemblyInfo.cs
index b1b1ad594..9e7592d3a 100644
--- a/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.Azure.Mobile.Analytics.Test.Windows/Properties/AssemblyInfo.cs
@@ -16,5 +16,5 @@ using System.Runtime.InteropServices;
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/Tests/Microsoft.Azure.Mobile.NET/Microsoft.Azure.Mobile.NET.csproj b/Tests/Microsoft.Azure.Mobile.NET/Microsoft.Azure.Mobile.NET.csproj
index b04101a2a..f5b810ba1 100644
--- a/Tests/Microsoft.Azure.Mobile.NET/Microsoft.Azure.Mobile.NET.csproj
+++ b/Tests/Microsoft.Azure.Mobile.NET/Microsoft.Azure.Mobile.NET.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" 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>
diff --git a/Tests/Microsoft.Azure.Mobile.NET/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.NET/Properties/AssemblyInfo.cs
index ea6b8be3e..a77722bea 100644
--- a/Tests/Microsoft.Azure.Mobile.NET/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.Azure.Mobile.NET/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
 
 [assembly: InternalsVisibleTo("Microsoft.Azure.Mobile.Test.Windows")]
 [assembly: InternalsVisibleTo("Microsoft.Azure.Mobile.Analytics.Test.Windows")]
diff --git a/Tests/Microsoft.Azure.Mobile.Push.NET/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.Push.NET/Properties/AssemblyInfo.cs
index 15ae3ef3c..6eb9c1e04 100644
--- a/Tests/Microsoft.Azure.Mobile.Push.NET/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.Azure.Mobile.Push.NET/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
diff --git a/Tests/Microsoft.Azure.Mobile.Push.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.Push.Test.Windows/Properties/AssemblyInfo.cs
index 57fec6759..be41ec3a9 100644
--- a/Tests/Microsoft.Azure.Mobile.Push.Test.Windows/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.Azure.Mobile.Push.Test.Windows/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
diff --git a/Tests/Microsoft.Azure.Mobile.Test.UWP/Microsoft.Azure.Mobile.Test.UWP.csproj b/Tests/Microsoft.Azure.Mobile.Test.UWP/Microsoft.Azure.Mobile.Test.UWP.csproj
index d831e6e79..cd9d05332 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.UWP/Microsoft.Azure.Mobile.Test.UWP.csproj
+++ b/Tests/Microsoft.Azure.Mobile.Test.UWP/Microsoft.Azure.Mobile.Test.UWP.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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>
diff --git a/Tests/Microsoft.Azure.Mobile.Test.UWP/Package.appxmanifest b/Tests/Microsoft.Azure.Mobile.Test.UWP/Package.appxmanifest
index 259bb9205..d7f71d88a 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.UWP/Package.appxmanifest
+++ b/Tests/Microsoft.Azure.Mobile.Test.UWP/Package.appxmanifest
@@ -7,7 +7,7 @@
 
   <Identity Name="da6d3d34-876e-488c-9342-7a7e4daa110b"
             Publisher="CN=Alexander Chocron"
-            Version="0.16.1.0" />
+            Version="0.17.0.0" />
 
   <mp:PhoneIdentity PhoneProductId="da6d3d34-876e-488c-9342-7a7e4daa110b" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/Tests/Microsoft.Azure.Mobile.Test.UWP/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.Test.UWP/Properties/AssemblyInfo.cs
index 2f9033c7f..c785d710a 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.UWP/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.Azure.Mobile.Test.UWP/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@ using System.Runtime.InteropServices;
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Tests/Microsoft.Azure.Mobile.Test.UWP/Utils/ApplicationSettingsTest.cs b/Tests/Microsoft.Azure.Mobile.Test.UWP/Utils/ApplicationSettingsTest.cs
index 902558f6e..93ae10019 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.UWP/Utils/ApplicationSettingsTest.cs
+++ b/Tests/Microsoft.Azure.Mobile.Test.UWP/Utils/ApplicationSettingsTest.cs
@@ -55,7 +55,6 @@ namespace Microsoft.Azure.Mobile.Test.UWP.Utils
             Assert.AreEqual(42, settings.GetValue<int>(key));
             settings.Remove(key);
             Assert.IsFalse(settings.ContainsKey(key));
-
         }
     }
 }
diff --git a/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpIngestionTest.cs b/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpIngestionTest.cs
index 92123e8c6..cba7273c1 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpIngestionTest.cs
+++ b/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpIngestionTest.cs
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.Mobile.Ingestion.Http;
 using Moq;
+using System.Net.Http;
 
 namespace Microsoft.Azure.Mobile.Test.Ingestion.Http
 {
@@ -17,7 +18,7 @@ namespace Microsoft.Azure.Mobile.Test.Ingestion.Http
         protected void SetupAdapterSendResponse(HttpStatusCode statusCode)
         {
             var setup = _adapter
-                .Setup(a => a.SendAsync(It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>(),
+                .Setup(a => a.SendAsync(It.IsAny<string>(), HttpMethod.Post, It.IsAny<IDictionary<string, string>>(), It.IsAny<string>(),
                     It.IsAny<CancellationToken>()));
             if (statusCode == HttpStatusCode.OK)
             {
@@ -38,7 +39,7 @@ namespace Microsoft.Azure.Mobile.Test.Ingestion.Http
         protected void VerifyAdapterSend(Times times)
         {
             _adapter
-                .Verify(a => a.SendAsync(It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<string>(),
+                .Verify(a => a.SendAsync(It.IsAny<string>(), HttpMethod.Post, It.IsAny<IDictionary<string, string>>(), It.IsAny<string>(),
                     It.IsAny<CancellationToken>()), times);
         }
     }
diff --git a/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpNetworkAdapterTest.cs b/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpNetworkAdapterTest.cs
index 06c37bd3f..cf145f7db 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpNetworkAdapterTest.cs
+++ b/Tests/Microsoft.Azure.Mobile.Test.Windows/Ingestion/Http/HttpNetworkAdapterTest.cs
@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Mobile.Test.Windows.Ingestion.Http
                 { IngestionHttp.InstallId, installId }
             };
             var jsonContent = "{}";
-            var request = _adapter.CreateRequest(uri, headers, jsonContent);
+            var request = _adapter.CreateRequest(uri, HttpMethod.Post, headers, jsonContent);
 
             Assert.AreEqual(request.Method, HttpMethod.Post);
             Assert.IsTrue(request.Headers.Contains(IngestionHttp.AppSecret));
diff --git a/Tests/Microsoft.Azure.Mobile.Test.Windows/Microsoft.Azure.Mobile.Test.Windows.csproj b/Tests/Microsoft.Azure.Mobile.Test.Windows/Microsoft.Azure.Mobile.Test.Windows.csproj
index 45ef68144..47d4dd3fc 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.Windows/Microsoft.Azure.Mobile.Test.Windows.csproj
+++ b/Tests/Microsoft.Azure.Mobile.Test.Windows/Microsoft.Azure.Mobile.Test.Windows.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/Tests/Microsoft.Azure.Mobile.Test.Windows/MobileCenterTest.cs b/Tests/Microsoft.Azure.Mobile.Test.Windows/MobileCenterTest.cs
index 62d6e781f..f0ae4b4d8 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.Windows/MobileCenterTest.cs
+++ b/Tests/Microsoft.Azure.Mobile.Test.Windows/MobileCenterTest.cs
@@ -197,10 +197,7 @@ namespace Microsoft.Azure.Mobile.Test
 
             _settingsMock.Verify(settings => settings.SetValue(MobileCenter.EnabledKey, false), Times.Once());
         }
-
-        /// <summary>
-        /// Verify that the "configured" property is accurate
-        /// </summary>
+        
         [TestMethod]
         public void GetConfigured()
         {
diff --git a/Tests/Microsoft.Azure.Mobile.Test.Windows/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.Test.Windows/Properties/AssemblyInfo.cs
index 1a8e643b5..516bfe406 100644
--- a/Tests/Microsoft.Azure.Mobile.Test.Windows/Properties/AssemblyInfo.cs
+++ b/Tests/Microsoft.Azure.Mobile.Test.Windows/Properties/AssemblyInfo.cs
@@ -16,5 +16,5 @@ using System.Runtime.InteropServices;
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.16.1.0")]
-[assembly: AssemblyInformationalVersion("0.16.1-SNAPSHOT")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
+[assembly: AssemblyInformationalVersion("0.17.0-SNAPSHOT")]
diff --git a/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Microsoft.Azure.Mobile.Test.WindowsDesktop.csproj b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Microsoft.Azure.Mobile.Test.WindowsDesktop.csproj
new file mode 100644
index 000000000..0704684fa
--- /dev/null
+++ b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Microsoft.Azure.Mobile.Test.WindowsDesktop.csproj
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C4674357-EFBA-43AA-9DB8-DE62A3309EB6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Azure.Mobile.Test.WindowsDesktop</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Mobile.Test.WindowsDesktop</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq, Version=4.7.1.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Moq.4.7.1\lib\net45\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MobileCenterTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Utils\ApplicationSettingsTest.cs" />
+    <Compile Include="Utils\DeviceInformationHelperTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.WindowsDesktop\Microsoft.Azure.Mobile.WindowsDesktop.csproj">
+      <Project>{1e9ec0aa-3e32-4551-80c4-e4f3e53d7590}</Project>
+      <Name>Microsoft.Azure.Mobile.WindowsDesktop</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
+</Project>
\ No newline at end of file
diff --git a/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/MobileCenterTest.cs b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/MobileCenterTest.cs
new file mode 100644
index 000000000..b0ad46817
--- /dev/null
+++ b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/MobileCenterTest.cs
@@ -0,0 +1,24 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.Azure.Mobile.Test.WindowsDesktop
+{
+    [TestClass]
+    public class MobileCenterTest
+    {
+        [TestInitialize]
+        public void InitializeMobileCenterTest()
+        {
+            MobileCenter.Instance = null;
+        }
+
+        /// <summary>
+        /// Verify configure with WindowsDesktop platform id
+        /// </summary>
+        [TestMethod]
+        public void VerifyPlatformId()
+        {
+            MobileCenter.Configure("windowsdesktop=appsecret");
+            Assert.IsTrue(MobileCenter.Configured);
+        }
+    }
+}
diff --git a/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Properties/AssemblyInfo.cs b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..c7ce873e9
--- /dev/null
+++ b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Microsoft.Azure.Mobile.Test.WindowsDesktop")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Microsoft.Azure.Mobile.Test.WindowsDesktop")]
+[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("c4674357-efba-43aa-9db8-de62a3309eb6")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
diff --git a/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Utils/ApplicationSettingsTest.cs b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Utils/ApplicationSettingsTest.cs
new file mode 100644
index 000000000..6df84e6a2
--- /dev/null
+++ b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Utils/ApplicationSettingsTest.cs
@@ -0,0 +1,64 @@
+using System.IO;
+using System.Reflection;
+using Microsoft.Azure.Mobile.Utils;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.Azure.Mobile.Test.WindowsDesktop.Utils
+{
+    [TestClass]
+    public class ApplicationSettingsTest
+    {
+        private IApplicationSettings settings;
+
+        [TestInitialize]
+        public void InitializeMobileCenterTest()
+        {
+            var location = Assembly.GetExecutingAssembly().Location;
+            var path = Path.Combine(Path.GetDirectoryName(location), "MobileCenter.config");
+            File.Delete(path);
+            settings = new DefaultApplicationSettings();
+        }
+
+        /// <summary>
+        /// Verify SetValue generic method behaviour
+        /// </summary>
+        [TestMethod]
+        public void VerifySetValue()
+        {
+            const string key = "test";
+            Assert.IsFalse(settings.ContainsKey(key));
+            settings.SetValue(key, 42);
+            Assert.IsTrue(settings.ContainsKey(key));
+            Assert.AreEqual(42, settings.GetValue<int>(key));
+        }
+
+        /// <summary>
+        /// Verify GetValue and SetValue generic method behaviour
+        /// </summary>
+        [TestMethod]
+        public void VerifyGetValue()
+        {
+            const string key = "test";
+            Assert.IsFalse(settings.ContainsKey(key));
+            Assert.AreEqual(42, settings.GetValue(key, 42));
+            Assert.IsTrue(settings.ContainsKey(key));
+            Assert.AreEqual(42, settings.GetValue<int>(key));
+            Assert.AreEqual(42, settings.GetValue(key, 0));
+        }
+
+        /// <summary>
+        /// Verify remove values from settings
+        /// </summary>
+        [TestMethod]
+        public void VerifyRemove()
+        {
+            const string key = "test";
+            Assert.IsFalse(settings.ContainsKey(key));
+            settings.SetValue(key, 42);
+            Assert.IsTrue(settings.ContainsKey(key));
+            Assert.AreEqual(42, settings.GetValue<int>(key));
+            settings.Remove(key);
+            Assert.IsFalse(settings.ContainsKey(key));
+        }
+    }
+}
diff --git a/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Utils/DeviceInformationHelperTest.cs b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Utils/DeviceInformationHelperTest.cs
new file mode 100644
index 000000000..d6ffda792
--- /dev/null
+++ b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/Utils/DeviceInformationHelperTest.cs
@@ -0,0 +1,20 @@
+using Microsoft.Azure.Mobile.Utils;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Mobile.Test.WindowsDesktop.Utils
+{
+    [TestClass]
+    public class DeviceInformationHelperTest
+    {
+        /// <summary>
+        /// Verify sdk name in device information
+        /// </summary>
+        [TestMethod]
+        public void VerifySdkName()
+        {
+            var device = Task.Run(() => new DeviceInformationHelper().GetDeviceInformationAsync()).Result;
+            Assert.AreEqual(device.SdkName, "mobilecenter.winforms");
+        }
+    }
+}
diff --git a/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/packages.config b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/packages.config
new file mode 100644
index 000000000..2da24f693
--- /dev/null
+++ b/Tests/Microsoft.Azure.Mobile.Test.WindowsDesktop/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Castle.Core" version="4.0.0" targetFramework="net452" />
+  <package id="Moq" version="4.7.1" targetFramework="net452" />
+  <package id="MSTest.TestAdapter" version="1.1.18" targetFramework="net452" />
+  <package id="MSTest.TestFramework" version="1.1.18" targetFramework="net452" />
+</packages>
\ No newline at end of file
diff --git a/Tests/iOS/Info.plist b/Tests/iOS/Info.plist
index 927c0bf7b..fe2c626cf 100644
--- a/Tests/iOS/Info.plist
+++ b/Tests/iOS/Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.contoso.contoso-forms-test</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.16.1</string>
+	<string>0.17.0</string>
 	<key>CFBundleVersion</key>
-	<string>0.16.1</string>
+	<string>0.17.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
diff --git a/build.cake b/build.cake
index f031e1869..69a5ddbb5 100644
--- a/build.cake
+++ b/build.cake
@@ -47,13 +47,14 @@ var MAC_ASSEMBLIES_ZIP = TEMPORARY_PREFIX + "MacAssemblies.zip";
 var WINDOWS_ASSEMBLIES_ZIP = TEMPORARY_PREFIX + "WindowsAssemblies.zip";
 
 // Assembly folders
+var WINDOWS_CLASSIC_ASSEMBLIES_FOLDER = TEMPORARY_PREFIX + "WindowsDesktopAssemblies";
 var UWP_ASSEMBLIES_FOLDER = TEMPORARY_PREFIX + "UWPAssemblies";
 var IOS_ASSEMBLIES_FOLDER = TEMPORARY_PREFIX + "iOSAssemblies";
 var ANDROID_ASSEMBLIES_FOLDER = TEMPORARY_PREFIX + "AndroidAssemblies";
 var PCL_ASSEMBLIES_FOLDER = TEMPORARY_PREFIX + "PCLAssemblies";
 
 // Native SDK versions
-var ANDROID_SDK_VERSION = "0.12.0";
+var ANDROID_SDK_VERSION = "0.13.0";
 var IOS_SDK_VERSION = "0.13.0";
 
 var PLATFORM_PATHS = new PlatformPaths();
@@ -79,7 +80,8 @@ var MOBILECENTER_MODULES = new [] {
     new MobileCenterModule("mobile-center-analytics-release.aar", "MobileCenterAnalytics.framework.zip", "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics", "MobileCenterAnalytics.nuspec"),
     new MobileCenterModule("mobile-center-crashes-release.aar", "MobileCenterCrashes.framework.zip", "SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes", "MobileCenterCrashes.nuspec"),
     new MobileCenterModule("mobile-center-distribute-release.aar", "MobileCenterDistribute.framework.zip", "SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute", "MobileCenterDistribute.nuspec"),
-    new MobileCenterModule("mobile-center-push-release.aar", "MobileCenterPush.framework.zip", "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push", "MobileCenterPush.nuspec")	
+    new MobileCenterModule("mobile-center-push-release.aar", "MobileCenterPush.framework.zip", "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push", "MobileCenterPush.nuspec"),
+    new MobileCenterModule("mobile-center-rum-release.aar", null, "SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum", "MobileCenterRum.nuspec")
 };
 
 // Task TARGET for build
@@ -127,7 +129,7 @@ Setup(context =>
     {
         var iosAssemblyGroup = new AssemblyGroup {
             AssemblyFolder = IOS_ASSEMBLIES_FOLDER,
-            AssemblyPaths = new string[] {	"SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/bin/Release/Microsoft.Azure.Mobile.dll",
+            AssemblyPaths = new string[] {  "SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/bin/Release/Microsoft.Azure.Mobile.dll",
                             "SDK/MobileCenter/Microsoft.Azure.Mobile.iOS/bin/Release/Microsoft.Azure.Mobile.iOS.Bindings.dll",
                             "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS/bin/Release/Microsoft.Azure.Mobile.Analytics.dll",
                             "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.iOS/bin/Release/Microsoft.Azure.Mobile.Analytics.iOS.Bindings.dll",
@@ -140,7 +142,7 @@ Setup(context =>
         };
         var androidAssemblyGroup = new AssemblyGroup {
             AssemblyFolder = ANDROID_ASSEMBLIES_FOLDER,
-            AssemblyPaths = new string[] {	"SDK/MobileCenter/Microsoft.Azure.Mobile.Android/bin/Release/Microsoft.Azure.Mobile.dll",
+            AssemblyPaths = new string[] {  "SDK/MobileCenter/Microsoft.Azure.Mobile.Android/bin/Release/Microsoft.Azure.Mobile.dll",
                             "SDK/MobileCenter/Microsoft.Azure.Mobile.Android/bin/Release/Microsoft.Azure.Mobile.Android.Bindings.dll",
                             "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android/bin/Release/Microsoft.Azure.Mobile.Analytics.dll",
                             "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.Android/bin/Release/Microsoft.Azure.Mobile.Analytics.Android.Bindings.dll",
@@ -149,19 +151,23 @@ Setup(context =>
                             "SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android/bin/Release/Microsoft.Azure.Mobile.Distribute.dll",
                             "SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute.Android/bin/Release/Microsoft.Azure.Mobile.Distribute.Android.Bindings.dll",
                             "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android/bin/Release/Microsoft.Azure.Mobile.Push.dll",
-                               "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android.Bindings/bin/Release/Microsoft.Azure.Mobile.Push.Android.Bindings.dll" }
+                            "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.Android.Bindings/bin/Release/Microsoft.Azure.Mobile.Push.Android.Bindings.dll",
+                            "SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android/bin/Release/Microsoft.Azure.Mobile.Rum.dll",
+                            "SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.Android.Bindings/bin/Release/Microsoft.Azure.Mobile.Rum.Android.Bindings.dll" }
         };
         var pclAssemblyGroup = new AssemblyGroup {
             AssemblyFolder = PCL_ASSEMBLIES_FOLDER,
-            AssemblyPaths = new string[] {	"SDK/MobileCenter/Microsoft.Azure.Mobile/bin/Release/Microsoft.Azure.Mobile.dll",
+            AssemblyPaths = new string[] {  "SDK/MobileCenter/Microsoft.Azure.Mobile/bin/Release/Microsoft.Azure.Mobile.dll",
                             "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics/bin/Release/Microsoft.Azure.Mobile.Analytics.dll",
                             "SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes/bin/Release/Microsoft.Azure.Mobile.Crashes.dll",
                             "SDK/MobileCenterDistribute/Microsoft.Azure.Mobile.Distribute/bin/Release/Microsoft.Azure.Mobile.Distribute.dll",
-                            "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push/bin/Release/Microsoft.Azure.Mobile.Push.dll" }
+                            "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push/bin/Release/Microsoft.Azure.Mobile.Push.dll",
+                            "SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum/bin/Release/Microsoft.Azure.Mobile.Rum.dll" }
         };
         PLATFORM_PATHS.UploadAssemblyGroups.Add(iosAssemblyGroup);
         PLATFORM_PATHS.UploadAssemblyGroups.Add(androidAssemblyGroup);
         PLATFORM_PATHS.UploadAssemblyGroups.Add(pclAssemblyGroup);
+        PLATFORM_PATHS.DownloadAssemblyFolders.Add(WINDOWS_CLASSIC_ASSEMBLIES_FOLDER);
         PLATFORM_PATHS.DownloadAssemblyFolders.Add(UWP_ASSEMBLIES_FOLDER);
         PLATFORM_PATHS.DownloadAssemblyFolders.Add(UWP_ASSEMBLIES_FOLDER + "/x86");
         PLATFORM_PATHS.DownloadAssemblyFolders.Add(UWP_ASSEMBLIES_FOLDER + "/x64");
@@ -172,13 +178,21 @@ Setup(context =>
     }
     else
     {
+        var windowsClassicAssemblyGroup = new AssemblyGroup {
+            AssemblyFolder = WINDOWS_CLASSIC_ASSEMBLIES_FOLDER,
+            AssemblyPaths = new string[] {
+                "SDK/MobileCenter/Microsoft.Azure.Mobile.WindowsDesktop/bin/Release/Microsoft.Azure.Mobile.dll",
+                "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.WindowsDesktop/bin/Release/Microsoft.Azure.Mobile.Analytics.dll",
+                "SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.WindowsDesktop/bin/Release/Microsoft.Azure.Mobile.Crashes.dll" }
+            };
         var uwpAnyCpuAssemblyGroup = new AssemblyGroup {
             AssemblyFolder = UWP_ASSEMBLIES_FOLDER,
             AssemblyPaths = new string[] { "nuget/Microsoft.Azure.Mobile.Crashes.targets",
                                 "SDK/MobileCenter/Microsoft.Azure.Mobile.UWP/bin/Release/Microsoft.Azure.Mobile.dll",
                                 "SDK/MobileCenterAnalytics/Microsoft.Azure.Mobile.Analytics.UWP/bin/Release/Microsoft.Azure.Mobile.Analytics.dll",
                                 "SDK/MobileCenterCrashes/Microsoft.Azure.Mobile.Crashes.UWP/bin/Reference/Microsoft.Azure.Mobile.Crashes.dll",
-                                "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/bin/Release/Microsoft.Azure.Mobile.Push.dll" }
+                                "SDK/MobileCenterPush/Microsoft.Azure.Mobile.Push.UWP/bin/Release/Microsoft.Azure.Mobile.Push.dll",
+                                "SDK/MobileCenterRum/Microsoft.Azure.Mobile.Rum.UWP/bin/Release/Microsoft.Azure.Mobile.Rum.dll" }
         };
         var uwpX86AssemblyGroup = new AssemblyGroup {
             AssemblyFolder = UWP_ASSEMBLIES_FOLDER + "/x86",
@@ -202,6 +216,7 @@ Setup(context =>
         PLATFORM_PATHS.UploadAssemblyGroups.Add(uwpX86AssemblyGroup);
         PLATFORM_PATHS.UploadAssemblyGroups.Add(uwpX64AssemblyGroup);
         PLATFORM_PATHS.UploadAssemblyGroups.Add(uwpArmAssemblyGroup);
+        PLATFORM_PATHS.UploadAssemblyGroups.Add(windowsClassicAssemblyGroup);
         PLATFORM_PATHS.DownloadAssemblyFolders.Add(IOS_ASSEMBLIES_FOLDER);
         PLATFORM_PATHS.DownloadAssemblyFolders.Add(ANDROID_ASSEMBLIES_FOLDER);
         PLATFORM_PATHS.DownloadAssemblyFolders.Add(PCL_ASSEMBLIES_FOLDER);
@@ -362,7 +377,8 @@ Task("NuGet")
         CopyFile("nuget/" + nuspecFilename, specCopyName);
         ReplaceTextInFiles(specCopyName, "$pcl_dir$", PCL_ASSEMBLIES_FOLDER);
         ReplaceTextInFiles(specCopyName, "$ios_dir$", IOS_ASSEMBLIES_FOLDER);
-        ReplaceTextInFiles(specCopyName, "$windows_dir$", UWP_ASSEMBLIES_FOLDER);
+        ReplaceTextInFiles(specCopyName, "$windows_desktop_dir$", WINDOWS_CLASSIC_ASSEMBLIES_FOLDER);
+        ReplaceTextInFiles(specCopyName, "$uwp_dir$", UWP_ASSEMBLIES_FOLDER);
         ReplaceTextInFiles(specCopyName, "$android_dir$", ANDROID_ASSEMBLIES_FOLDER);
 
         var spec = GetFiles(specCopyName);
@@ -453,8 +469,9 @@ Task("MergeAssemblies")
         CopyFile("nuget/" + module.MainNuspecFilename, specCopyName);
         ReplaceTextInFiles(specCopyName, "$pcl_dir$", PCL_ASSEMBLIES_FOLDER);
         ReplaceTextInFiles(specCopyName, "$ios_dir$", IOS_ASSEMBLIES_FOLDER);
-        ReplaceTextInFiles(specCopyName, "$windows_dir$", UWP_ASSEMBLIES_FOLDER);
         ReplaceTextInFiles(specCopyName, "$android_dir$", ANDROID_ASSEMBLIES_FOLDER);
+        ReplaceTextInFiles(specCopyName, "$uwp_dir$", UWP_ASSEMBLIES_FOLDER);
+        ReplaceTextInFiles(specCopyName, "$windows_desktop_dir$", WINDOWS_CLASSIC_ASSEMBLIES_FOLDER);
 
         var spec = GetFiles(specCopyName);
 
@@ -554,19 +571,20 @@ Task("clean")
 
 Task("PrepareAssemblyPathsVSTS").Does(()=>
 {
-        var iosAssemblies = EnvironmentVariable("IOS_ASSEMBLY_PATH_NUSPEC");
-        var androidAssemblies = EnvironmentVariable("ANDROID_ASSEMBLY_PATH_NUSPEC");
-        var pclAssemblies = EnvironmentVariable("PCL_ASSEMBLY_PATH_NUSPEC");
-        var uwpAssemblies = EnvironmentVariable("UWP_ASSEMBLY_PATH_NUSPEC");
-        var nuspecPathPrefix = EnvironmentVariable("NUSPEC_PATH");
-        
-        foreach (var module in MOBILECENTER_MODULES)
-        {
-            ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$pcl_dir$", pclAssemblies);
-            ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$ios_dir$", iosAssemblies);
-            ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$windows_dir$", uwpAssemblies);
-            ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$android_dir$", androidAssemblies);
-        }
+    var iosAssemblies = EnvironmentVariable("IOS_ASSEMBLY_PATH_NUSPEC");
+    var androidAssemblies = EnvironmentVariable("ANDROID_ASSEMBLY_PATH_NUSPEC");
+    var pclAssemblies = EnvironmentVariable("PCL_ASSEMBLY_PATH_NUSPEC");
+    var windowsClassicAssemblies = EnvironmentVariable("WINDOWS_CLASSIC_ASSEMBLY_PATH_NUSPEC");
+    var uwpAssemblies = EnvironmentVariable("UWP_ASSEMBLY_PATH_NUSPEC");
+    var nuspecPathPrefix = EnvironmentVariable("NUSPEC_PATH");
+    foreach (var module in MOBILECENTER_MODULES)
+    {
+        ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$pcl_dir$", pclAssemblies);
+        ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$ios_dir$", iosAssemblies);
+        ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$android_dir$", androidAssemblies);
+        ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$uwp_dir$", uwpAssemblies);
+        ReplaceTextInFiles(nuspecPathPrefix + module.MainNuspecFilename, "$windows_desktop_dir$", windowsClassicAssemblies);
+    }
 }).OnError(HandleError);
 
 Task("NugetPackVSTS").Does(()=>
@@ -575,7 +593,8 @@ Task("NugetPackVSTS").Does(()=>
     foreach (var module in MOBILECENTER_MODULES)
     {
         var spec = GetFiles(nuspecPathPrefix + module.MainNuspecFilename);
-        // Create the NuGet packages
+
+        // Create the NuGet packages.
         Information("Building a NuGet package for " + module.MainNuspecFilename);
         NuGetPack(spec, new NuGetPackSettings {
             Verbosity = NuGetVerbosity.Detailed,
diff --git a/nuget/MacMobileCenterRum.nuspec b/nuget/MacMobileCenterRum.nuspec
new file mode 100644
index 000000000..025e2fa38
--- /dev/null
+++ b/nuget/MacMobileCenterRum.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Microsoft.Azure.Mobile.Rum</id>
+    <title>Mobile Center Real User Measurements</title>
+    <authors>Microsoft Corporation</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <summary>TODO</summary>
+    <description>TODO</description>
+    <copyright>Copyright (c) Microsoft Corporation. All Rights Reserved.</copyright>
+    <tags>mobilecenter</tags>
+    <projectUrl>https://aka.ms/telgml</projectUrl>
+    <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
+    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <dependencies>
+      <dependency id="Microsoft.Azure.Mobile" version="$version$" />
+    </dependencies>
+  </metadata>
+  <files>
+
+    <!-- Portable -->
+    <file src="$pcl_dir$/Microsoft.Azure.Mobile.Rum.dll" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+
+    <!-- Android -->
+    <file src="$android_dir$/Microsoft.Azure.Mobile.Rum.dll" target="lib/MonoAndroid403" />
+    <file src="$android_dir$/Microsoft.Azure.Mobile.Rum.Android.Bindings.dll" target="lib/MonoAndroid403" />
+
+  </files>
+</package>
diff --git a/nuget/MobileCenter.nuspec b/nuget/MobileCenter.nuspec
index 960e72809..21486f82c 100644
--- a/nuget/MobileCenter.nuspec
+++ b/nuget/MobileCenter.nuspec
@@ -20,6 +20,10 @@
         <dependency id="Newtonsoft.Json" version="6.0.1"/>
         <dependency id="sqlite-net-pcl" version="1.3.1"/>
       </group>
+      <group targetFramework="net452">
+        <dependency id="Newtonsoft.Json" version="6.0.1"/>
+        <dependency id="sqlite-net-pcl" version="1.3.1"/>
+      </group>
       <!-- Use empty dependency groups for iOS and Android so that additional dependencies aren't added to them -->
       <group targetFramework="MonoAndroid403">
       </group>
@@ -43,6 +47,11 @@
     <file src="$ios_dir$/Microsoft.Azure.AppCenter.iOS.Bindings.dll" target="lib/Xamarin.iOS10" />
 
     <!-- UWP -->
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.dll" target="lib/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.AppCenter.dll" target="lib/uap10.0" />
+
+    <!-- Windows Classic Desktop (WPF and WinForms) -->
+    <!-- TODO: Uncomment when it's time to release these. -->
+    <!--file src="$windows_desktop_dir$/Microsoft.Azure.AppCenter.dll" target="lib/net452" /-->
+
   </files>
 </package>
diff --git a/nuget/MobileCenterAnalytics.nuspec b/nuget/MobileCenterAnalytics.nuspec
index 1d67f9062..7a96f9607 100644
--- a/nuget/MobileCenterAnalytics.nuspec
+++ b/nuget/MobileCenterAnalytics.nuspec
@@ -33,7 +33,11 @@
     <file src="$ios_dir$/Microsoft.Azure.AppCenter.Analytics.iOS.Bindings.dll" target="lib/Xamarin.iOS10" />
 
     <!-- UWP -->
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Analytics.dll" target="lib/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Analytics.dll" target="lib/uap10.0" />
+
+    <!-- Windows Classic (WPF and WinForms) -->
+    <!-- TODO: Uncomment when it's time to release these. -->
+    <!-- file src="$windows_desktop_dir$/Microsoft.Azure.Mobile.Analytics.dll" target="lib/net452" / -->
 
   </files>
 </package>
diff --git a/nuget/MobileCenterCrashes.nuspec b/nuget/MobileCenterCrashes.nuspec
index 52c620405..402614003 100644
--- a/nuget/MobileCenterCrashes.nuspec
+++ b/nuget/MobileCenterCrashes.nuspec
@@ -32,25 +32,29 @@
     <file src="$ios_dir$/Microsoft.Azure.AppCenter.Crashes.dll" target="lib/Xamarin.iOS10" />
     <file src="$ios_dir$/Microsoft.Azure.AppCenter.Crashes.iOS.Bindings.dll" target="lib/Xamarin.iOS10" />
 
+    <!-- WindowsDesktop (WPF and WinForms) -->
+    <!-- TODO: Uncomment when it's time to release these. -->
+    <!-- file src="$windows_desktop_dir$/Microsoft.Azure.Mobile.Crashes.dll" target="lib/net452" /-->
+
     <!-- UWP -->
     <!-- targets files add correct references to proper platforms -->
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Crashes.targets" target="build/uap10.0"/>
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Crashes.dll" target="ref/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Crashes.targets" target="build/uap10.0"/>
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Crashes.dll" target="ref/uap10.0" />
     
     <!--x86 -->
-    <file src="$windows_dir$/x86/Microsoft.Azure.AppCenter.Crashes.dll" target="runtimes/win10-x86/lib/uap10.0" />
-    <file src="$windows_dir$/x86/WatsonRegistrationUtility.dll"  target="runtimes/win10-x86/native"/>
-    <file src="$windows_dir$/x86/WatsonRegistrationUtility.winmd" target="runtimes/win10-x86/lib/uap10.0" />
+    <file src="$uwp_dir$/x86/Microsoft.Azure.Mobile.Crashes.dll" target="runtimes/win10-x86/lib/uap10.0" />
+    <file src="$uwp_dir$/x86/WatsonRegistrationUtility.dll"  target="runtimes/win10-x86/native"/>
+    <file src="$uwp_dir$/x86/WatsonRegistrationUtility.winmd" target="runtimes/win10-x86/lib/uap10.0" />
 
     <!-- x64 -->
-    <file src="$windows_dir$/x64/Microsoft.Azure.AppCenter.Crashes.dll" target="runtimes/win10-x64/lib/uap10.0" />
-    <file src="$windows_dir$/x64/WatsonRegistrationUtility.dll"  target="runtimes/win10-x64/native"/>
-    <file src="$windows_dir$/x64/WatsonRegistrationUtility.winmd" target="runtimes/win10-x64/lib/uap10.0" />
+    <file src="$uwp_dir$/x64/Microsoft.Azure.Mobile.Crashes.dll" target="runtimes/win10-x64/lib/uap10.0" />
+    <file src="$uwp_dir$/x64/WatsonRegistrationUtility.dll"  target="runtimes/win10-x64/native"/>
+    <file src="$uwp_dir$/x64/WatsonRegistrationUtility.winmd" target="runtimes/win10-x64/lib/uap10.0" />
 
     <!-- ARM -->
-    <file src="$windows_dir$/ARM/Microsoft.Azure.AppCenter.Crashes.dll" target="runtimes/win10-arm/lib/uap10.0" />
-    <file src="$windows_dir$/ARM/WatsonRegistrationUtility.dll"  target="runtimes/win10-arm/native"/>
-    <file src="$windows_dir$/ARM/WatsonRegistrationUtility.winmd" target="runtimes/win10-arm/lib/uap10.0" />
+    <file src="$uwp_dir$/ARM/Microsoft.Azure.Mobile.Crashes.dll" target="runtimes/win10-arm/lib/uap10.0" />
+    <file src="$uwp_dir$/ARM/WatsonRegistrationUtility.dll"  target="runtimes/win10-arm/native"/>
+    <file src="$uwp_dir$/ARM/WatsonRegistrationUtility.winmd" target="runtimes/win10-arm/lib/uap10.0" />
 
   </files>
 </package>
diff --git a/nuget/MobileCenterPush.nuspec b/nuget/MobileCenterPush.nuspec
index ed60cb3a6..4d270aa55 100644
--- a/nuget/MobileCenterPush.nuspec
+++ b/nuget/MobileCenterPush.nuspec
@@ -40,7 +40,7 @@
     <file src="$ios_dir$/Microsoft.Azure.AppCenter.Push.iOS.Bindings.dll" target="lib/Xamarin.iOS10" />
 
     <!-- UWP -->
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Push.dll" target="lib/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Push.dll" target="lib/uap10.0" />
 
   </files>
 </package>
diff --git a/nuget/MobileCenterRum.nuspec b/nuget/MobileCenterRum.nuspec
new file mode 100644
index 000000000..95bc767c9
--- /dev/null
+++ b/nuget/MobileCenterRum.nuspec
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Microsoft.Azure.Mobile.Rum</id>
+    <title>Mobile Center Real User Measurements</title>
+    <authors>Microsoft Corporation</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <summary>TODO</summary>
+    <description>TODO</description>
+    <copyright>Copyright (c) Microsoft Corporation. All Rights Reserved.</copyright>
+    <tags>mobilecenter</tags>
+    <projectUrl>https://aka.ms/telgml</projectUrl>
+    <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
+    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <dependencies>
+      <dependency id="Microsoft.Azure.Mobile" version="$version$" />
+    </dependencies>
+    <version>$version$</version>
+  </metadata>
+  <files>
+
+    <!-- Portable -->
+    <file src="$pcl_dir$/Microsoft.Azure.Mobile.Rum.dll" target="lib/portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
+
+    <!-- Android -->
+    <file src="$android_dir$/Microsoft.Azure.Mobile.Rum.dll" target="lib/MonoAndroid403" />
+    <file src="$android_dir$/Microsoft.Azure.Mobile.Rum.Android.Bindings.dll" target="lib/MonoAndroid403" />
+
+    <!-- UWP -->
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Rum.dll" target="lib/uap10.0" />
+
+  </files>
+</package>
diff --git a/nuget/WindowsMobileCenter.nuspec b/nuget/WindowsMobileCenter.nuspec
index 0a220b3fd..2bee36af4 100644
--- a/nuget/WindowsMobileCenter.nuspec
+++ b/nuget/WindowsMobileCenter.nuspec
@@ -20,9 +20,16 @@
         <dependency id="Newtonsoft.Json" version="6.0.1"/>
         <dependency id="sqlite-net-pcl" version="1.3.1"/>
       </group>
+      <group targetFramework="net452">
+        <dependency id="Newtonsoft.Json" version="6.0.1"/>
+        <dependency id="sqlite-net-pcl" version="1.3.1"/>
+      </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.dll" target="lib/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.dll" target="lib/uap10.0" />
+      
+    <!-- TODO: Uncomment when it's time to release these. -->
+    <!-- file src="$windows_desktop_dir$/Microsoft.Azure.Mobile.dll" target="lib/net452" /-->
   </files>
 </package>
diff --git a/nuget/WindowsMobileCenterAnalytics.nuspec b/nuget/WindowsMobileCenterAnalytics.nuspec
index 95887d519..8d88d862d 100644
--- a/nuget/WindowsMobileCenterAnalytics.nuspec
+++ b/nuget/WindowsMobileCenterAnalytics.nuspec
@@ -19,6 +19,9 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Analytics.dll" target="lib/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Analytics.dll" target="lib/uap10.0" />
+
+    <!-- TODO: Uncomment when it's time to release these. -->
+    <!--file src="$windows_desktop_dir$/Microsoft.Azure.Mobile.Analytics.dll" target="lib/net452" /-->
   </files>
 </package>
diff --git a/nuget/WindowsMobileCenterCrashes.nuspec b/nuget/WindowsMobileCenterCrashes.nuspec
index 9307a147c..db5ecd150 100644
--- a/nuget/WindowsMobileCenterCrashes.nuspec
+++ b/nuget/WindowsMobileCenterCrashes.nuspec
@@ -20,25 +20,29 @@
   </metadata>
   <files>
 
+    <!-- WinForms -->
+    <!-- TODO: Uncomment when it's time to release these. -->
+    <!--file src="$windows_desktop_dir$/Microsoft.Azure.Mobile.Crashes.dll" target="lib/net452" /-->
+
     <!-- UWP -->
     <!-- targets files add correct references to proper platforms -->
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Crashes.targets" target="build/uap10.0" />
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Crashes.dll" target="ref/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Crashes.targets" target="build/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Crashes.dll" target="ref/uap10.0" />
     
     <!--x86 -->
-    <file src="$windows_dir$/x86/Microsoft.Azure.AppCenter.Crashes.dll" target="runtimes/win10-x86/lib/uap10.0" />
-    <file src="$windows_dir$/x86/WatsonRegistrationUtility.dll" target="runtimes/win10-x86/native"/>
-    <file src="$windows_dir$/x86/WatsonRegistrationUtility.winmd" target="runtimes/win10-x86/lib/uap10.0" />
+    <file src="$uwp_dir$/x86/Microsoft.Azure.Mobile.Crashes.dll" target="runtimes/win10-x86/lib/uap10.0" />
+    <file src="$uwp_dir$/x86/WatsonRegistrationUtility.dll" target="runtimes/win10-x86/native"/>
+    <file src="$uwp_dir$/x86/WatsonRegistrationUtility.winmd" target="runtimes/win10-x86/lib/uap10.0" />
 
     <!-- x64 -->
-    <file src="$windows_dir$/x64/Microsoft.Azure.AppCenter.Crashes.dll" target="runtimes/win10-x64/lib/uap10.0" />
-    <file src="$windows_dir$/x64/WatsonRegistrationUtility.dll" target="runtimes/win10-x64/native"/>
-    <file src="$windows_dir$/x64/WatsonRegistrationUtility.winmd" target="runtimes/win10-x64/lib/uap10.0" />
+    <file src="$uwp_dir$/x64/Microsoft.Azure.Mobile.Crashes.dll" target="runtimes/win10-x64/lib/uap10.0" />
+    <file src="$uwp_dir$/x64/WatsonRegistrationUtility.dll" target="runtimes/win10-x64/native"/>
+    <file src="$uwp_dir$/x64/WatsonRegistrationUtility.winmd" target="runtimes/win10-x64/lib/uap10.0" />
 
     <!-- ARM -->
-    <file src="$windows_dir$/ARM/Microsoft.Azure.AppCenter.Crashes.dll" target="runtimes/win10-arm/lib/uap10.0" />
-    <file src="$windows_dir$/ARM/WatsonRegistrationUtility.dll" target="runtimes/win10-arm/native"/>
-    <file src="$windows_dir$/ARM/WatsonRegistrationUtility.winmd" target="runtimes/win10-arm/lib/uap10.0" />
+    <file src="$uwp_dir$/ARM/Microsoft.Azure.Mobile.Crashes.dll" target="runtimes/win10-arm/lib/uap10.0" />
+    <file src="$uwp_dir$/ARM/WatsonRegistrationUtility.dll" target="runtimes/win10-arm/native"/>
+    <file src="$uwp_dir$/ARM/WatsonRegistrationUtility.winmd" target="runtimes/win10-arm/lib/uap10.0" />
 
   </files>
 </package>
diff --git a/nuget/WindowsMobileCenterPush.nuspec b/nuget/WindowsMobileCenterPush.nuspec
index e1181ab0b..b4c065bad 100644
--- a/nuget/WindowsMobileCenterPush.nuspec
+++ b/nuget/WindowsMobileCenterPush.nuspec
@@ -19,6 +19,6 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="$windows_dir$/Microsoft.Azure.AppCenter.Push.dll" target="lib/uap10.0" />
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Push.dll" target="lib/uap10.0" />
   </files>
 </package>
diff --git a/nuget/WindowsMobileCenterRum.nuspec b/nuget/WindowsMobileCenterRum.nuspec
new file mode 100644
index 000000000..ec67b26a8
--- /dev/null
+++ b/nuget/WindowsMobileCenterRum.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<package>
+  <metadata>
+    <id>Microsoft.Azure.Mobile.Rum</id>
+    <title>Mobile Center Real User Measurements</title>
+    <authors>Microsoft Corporation</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <summary>TODO</summary>
+    <description>TODO</description>
+    <copyright>Copyright (c) Microsoft Corporation. All Rights Reserved.</copyright>
+    <tags>mobilecenter</tags>
+    <projectUrl>https://aka.ms/telgml</projectUrl>
+    <licenseUrl>https://aka.ms/vbgfx2</licenseUrl>
+    <iconUrl>https://aka.ms/xhh7sr</iconUrl>
+    <dependencies>
+      <dependency id="Microsoft.Azure.Mobile" version="$version$" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="$uwp_dir$/Microsoft.Azure.Mobile.Rum.dll" target="lib/uap10.0" />
+  </files>
+</package>